Browse Source

Fixes #3508 - new _plugin dir introduces auth:login events which will never get triggered.

Rolf Schmidt 3 years ago
parent
commit
1c4524de81

+ 1 - 3
app/assets/javascripts/app/controllers/_application_controller/wizard_modal_full_screen.coffee

@@ -5,6 +5,4 @@ class App.ControllerWizardFullScreen extends App.ControllerWizardModal
   # login check / get session user
   redirectToLogin: =>
     App.Auth.loginCheck()
-    @el.remove()
-    App.Plugin.init()
-    @navigate '#', { removeEl: true }
+    @navigate('#', { removeEl: true })

+ 2 - 0
app/assets/javascripts/app/controllers/_dashboard/activity_stream.coffee

@@ -59,6 +59,8 @@ class App.DashboardActivityStream extends App.CollectionController
     @el.closest('.sidebar').find('.activity-description').addClass('hidden')
 
   onRenderItemEnd: (item, el) ->
+    return if App.Session.get() is undefined
+
     new App.WidgetAvatar(
       el:        el.find('.js-avatar')
       object_id: item.created_by_id

+ 1 - 2
app/assets/javascripts/app/controllers/_plugin/default_locale.coffee

@@ -16,8 +16,7 @@ class DefaultLocale extends App.Controller
         processData: true
       )
 
-    @controllerBind('auth:login', (session) =>
+    if App.Session.get() isnt undefined
       @delay(check, 3500, 'default_locale')
-    )
 
 App.Config.set('default_locale', DefaultLocale, 'Plugins')

+ 1 - 2
app/assets/javascripts/app/controllers/_plugin/default_timezone.coffee

@@ -26,9 +26,8 @@ class DefaultTimezone extends App.Controller
       #  processData: true
       #)
 
-    @controllerBind('auth:login', (session) =>
+    if App.Session.get() isnt undefined
       @delay(check, 8500, 'default_timezone')
-    )
 
   updateSetting: (timezone) ->
     App.Setting.set('timezone_default', timezone)

+ 3 - 5
app/assets/javascripts/app/controllers/_plugin/notify.coffee

@@ -51,11 +51,9 @@ class App.Notify extends App.Controller
     )
 
     # request desktop notification after login
-    @controllerBind('auth', (data) ->
-      if !_.isEmpty(data)
-        return if !window.Notification
-        window.Notification.requestPermission()
-    )
+    if App.Session.get() isnt undefined && window.Notification
+      window.Notification.requestPermission()
+
     $(window).focus(
       =>
         for counter, notification of @desktopNotify

+ 6 - 4
app/assets/javascripts/app/controllers/_plugin/session_timeout.coffee

@@ -5,14 +5,16 @@ class SessionTimeout extends App.Controller
     super
 
     lastEvent = new Date().getTime()
-    check_timeout = =>
+    checkTimeout = =>
       return if new Date().getTime() - 1000 < lastEvent
       lastEvent = new Date().getTime()
       @checkLogout()
 
-    $(document).off('keyup.session_timeout').on('keyup.session_timeout', check_timeout)
-    $(document).off('mousemove.session_timeout').on('mousemove.session_timeout', check_timeout)
-    @controllerBind('config_update', check_timeout)
+    # reset timeout on mouse move
+    $(document).off('keyup.session_timeout').on('keyup.session_timeout', checkTimeout)
+    $(document).off('mousemove.session_timeout').on('mousemove.session_timeout', checkTimeout)
+
+    @controllerBind('config_update', checkTimeout)
     @controllerBind('session_timeout', @quitApp)
     @interval(@checkLogout, 5000, 'session_timeout')
 

+ 0 - 6
app/assets/javascripts/app/controllers/_plugin/switch_back_to_user.coffee

@@ -14,12 +14,6 @@ class SwitchBackToUser extends App.Controller
       @render()
     )
 
-    # remove widget
-    @controllerBind('auth:logout', =>
-      App.Config.set('switch_back_to_possible', false)
-      @render()
-    )
-
   render: (user) ->
 
     # if no switch to user is active

+ 1 - 2
app/assets/javascripts/app/controllers/_plugin/translation_support.coffee

@@ -27,9 +27,8 @@ class TranslationSupport extends App.Controller
     @controllerBind('i18n:language:change', =>
       @delay(check, 2500, 'translation_support')
     )
-    @controllerBind('auth:login', =>
+    if App.Session.get() isnt undefined
       @delay(check, 2500, 'translation_support')
-    )
 
 App.Config.set( 'translaton_support', TranslationSupport, 'Plugins' )
 

+ 0 - 4
app/assets/javascripts/app/controllers/_plugin/user_signup_check.coffee

@@ -7,10 +7,6 @@ class UserSignupCheck extends App.Controller
       new Modal(user: user)
     )
 
-    @controllerBind('auth:login', (user) =>
-      return if !user
-      @verifyLater(user.id)
-    )
     user = App.User.current()
     @verifyLater(user.id) if user?
 

+ 0 - 1
app/assets/javascripts/app/controllers/login.coffee

@@ -76,7 +76,6 @@ class Login extends App.ControllerFullPage
     )
 
   success: (data, status, xhr) =>
-    App.Plugin.init()
 
     # redirect to #
     @log 'notice', 'REDIRECT to -#/-'

Some files were not shown because too many files changed in this diff