From 62b46e0052617e8127ef029f313a5cd8c0add164 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sat, 22 Jun 2013 17:53:42 +0200 Subject: [PATCH] Improved namespace for App.Log, only provide @log in controllers. --- .../app/controllers/_application_controller.js.coffee | 2 +- app/assets/javascripts/app/lib/app_init/log.js.coffee | 6 +++--- app/assets/javascripts/app/lib/app_init/session.js.coffee | 2 +- .../javascripts/app/lib/app_post/collection.js.coffee | 2 +- app/assets/javascripts/app/lib/app_post/delay.js.coffee | 2 +- app/assets/javascripts/app/lib/app_post/event.js.coffee | 2 +- app/assets/javascripts/app/lib/app_post/i18n.js.coffee | 2 +- app/assets/javascripts/app/lib/app_post/interval.js.coffee | 2 +- .../javascripts/app/lib/app_post/task_manager.js.coffee | 2 +- app/assets/javascripts/app/lib/app_post/websocket.js.coffee | 4 ++-- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee index b813eea23..495437400 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee @@ -1,5 +1,5 @@ class App.Controller extends Spine.Controller - @include App.Log + @include App.LogInclude constructor: (params) -> diff --git a/app/assets/javascripts/app/lib/app_init/log.js.coffee b/app/assets/javascripts/app/lib/app_init/log.js.coffee index 41c7b2c6d..65009b734 100644 --- a/app/assets/javascripts/app/lib/app_init/log.js.coffee +++ b/app/assets/javascripts/app/lib/app_init/log.js.coffee @@ -1,12 +1,12 @@ -class App.Log - _instance = undefined - +_instance = undefined +class App.LogInclude @log: ( level, args... ) -> if _instance == undefined _instance ?= new _Singleton module = @constructor.name _instance.log( module, level, args ) +class App.Log @debug: ( module, args... ) -> if _instance == undefined _instance ?= new _Singleton diff --git a/app/assets/javascripts/app/lib/app_init/session.js.coffee b/app/assets/javascripts/app/lib/app_init/session.js.coffee index bbaacfa98..f81776c4a 100644 --- a/app/assets/javascripts/app/lib/app_init/session.js.coffee +++ b/app/assets/javascripts/app/lib/app_init/session.js.coffee @@ -21,7 +21,7 @@ class App.Session _instance.all() class _sessionSingleton extends Spine.Module - @include App.Log + @include App.LogInclude constructor: -> @clear() diff --git a/app/assets/javascripts/app/lib/app_post/collection.js.coffee b/app/assets/javascripts/app/lib/app_post/collection.js.coffee index 0908a271b..569a95470 100644 --- a/app/assets/javascripts/app/lib/app_post/collection.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/collection.js.coffee @@ -65,7 +65,7 @@ class App.Collection _instance._observeStats() class _collectionSingleton extends Spine.Module - @include App.Log + @include App.LogInclude constructor: (@args) -> diff --git a/app/assets/javascripts/app/lib/app_post/delay.js.coffee b/app/assets/javascripts/app/lib/app_post/delay.js.coffee index c27ba9e3e..9768c8eb8 100644 --- a/app/assets/javascripts/app/lib/app_post/delay.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/delay.js.coffee @@ -27,7 +27,7 @@ class App.Delay _instance._all() class _delaySingleton extends Spine.Module - @include App.Log + @include App.LogInclude constructor: -> @levelStack = {} diff --git a/app/assets/javascripts/app/lib/app_post/event.js.coffee b/app/assets/javascripts/app/lib/app_post/event.js.coffee index 8f28bdf74..98e9ed709 100644 --- a/app/assets/javascripts/app/lib/app_post/event.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/event.js.coffee @@ -30,7 +30,7 @@ class App.Event _instance._allBindings() class _eventSingleton extends Spine.Module - @include App.Log + @include App.LogInclude constructor: -> @eventCurrent = {} diff --git a/app/assets/javascripts/app/lib/app_post/i18n.js.coffee b/app/assets/javascripts/app/lib/app_post/i18n.js.coffee index 1e9987f9a..27ddbad71 100644 --- a/app/assets/javascripts/app/lib/app_post/i18n.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/i18n.js.coffee @@ -40,7 +40,7 @@ class App.i18n _instance.escape( args ) class _i18nSingleton extends Spine.Module - @include App.Log + @include App.LogInclude constructor: ( locale ) -> @map = {} diff --git a/app/assets/javascripts/app/lib/app_post/interval.js.coffee b/app/assets/javascripts/app/lib/app_post/interval.js.coffee index 7de2d9a49..8bc9a32a3 100644 --- a/app/assets/javascripts/app/lib/app_post/interval.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/interval.js.coffee @@ -27,7 +27,7 @@ class App.Interval _instance._all() class _intervalSingleton extends Spine.Module - @include App.Log + @include App.LogInclude constructor: -> @levelStack = {} diff --git a/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee b/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee index 20bbb16b7..6c6de196d 100644 --- a/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee @@ -60,7 +60,7 @@ class App.TaskManager _instance.TaskbarId() class _taskManagerSingleton extends App.Controller - @include App.Log + @include App.LogInclude constructor: -> super diff --git a/app/assets/javascripts/app/lib/app_post/websocket.js.coffee b/app/assets/javascripts/app/lib/app_post/websocket.js.coffee index 8b5be6570..e415d5e95 100644 --- a/app/assets/javascripts/app/lib/app_post/websocket.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/websocket.js.coffee @@ -32,7 +32,7 @@ class App.WebSocket # The actual Singleton class class _webSocketSingleton extends App.Controller - @include App.Log + @include App.LogInclude queue: [] supported: true @@ -179,7 +179,7 @@ class _webSocketSingleton extends App.Controller @connectionWasEstablished = true # close error message show up (because try so connect again) if exists - @clearDelay('websocket-no-connection-try-reconnect-message') + @clearDelay('websocket-no-connection-try-reconnect-message', 'ws') if @error @error.modalHide() @error = false