diff options
author | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
commit | e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch) | |
tree | 39846bf1570f9b5a4057b726c54905de9e9e1c02 /node_modules/montage/core/logger.js | |
parent | 7950424cf704bb221971f4645406b01e6979db18 (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz |
Merge branch 'master' into components
Conflicts:
node_modules/montage/ui/bluemoon/progress.reel/progress.html
node_modules/montage/ui/image2.reel/image2.html
node_modules/ninja-components/effect/desaturate-effect.js
node_modules/ninja-components/effect/effect.js
node_modules/ninja-components/effect/invert-effect.js
node_modules/ninja-components/effect/kaliedoscope-effect.js
node_modules/ninja-components/effect/multiply-effect.js
node_modules/ninja-components/effect/sepia-effect.js
node_modules/ninja-components/flow-controller.reel/flow-controller.html
node_modules/ninja-components/flow-controller.reel/flow-controller.js
node_modules/ninja-components/flow-offset.js
node_modules/ninja-components/hottext.reel/hottext.css
node_modules/ninja-components/hottext.reel/hottext.html
node_modules/ninja-components/hottext.reel/hottext.js
node_modules/ninja-components/hottextunit.reel/hottextunit.css
node_modules/ninja-components/hottextunit.reel/hottextunit.html
node_modules/ninja-components/hottextunit.reel/hottextunit.js
node_modules/ninja-components/image2.reel/image2.html
node_modules/ninja-components/image2.reel/image2.js
node_modules/ninja-components/image3d.reel/image3d.html
node_modules/ninja-components/image3d.reel/image3d.js
node_modules/ninja-components/photo-editor.reel/photo-editor.css
node_modules/ninja-components/photo-editor.reel/photo-editor.html
node_modules/ninja-components/photo-editor.reel/photo-editor.js
node_modules/ninja-components/slider-base.js
user-document-templates/montage-application-cloud/appdelegate.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/core/logger.js')
-rwxr-xr-x | node_modules/montage/core/logger.js | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/node_modules/montage/core/logger.js b/node_modules/montage/core/logger.js index 4b0e8233..6f90fab3 100755 --- a/node_modules/montage/core/logger.js +++ b/node_modules/montage/core/logger.js | |||
@@ -15,7 +15,8 @@ var Montage = require("montage").Montage, | |||
15 | emptyLoggerFunction, | 15 | emptyLoggerFunction, |
16 | getFunctionName, | 16 | getFunctionName, |
17 | toTimeString, | 17 | toTimeString, |
18 | LoggerUI; | 18 | LoggerUI, |
19 | localStorage; | ||
19 | 20 | ||
20 | loggers = exports.loggers = {}; | 21 | loggers = exports.loggers = {}; |
21 | 22 | ||
@@ -104,7 +105,7 @@ Logger = exports.Logger = Montage.create(Montage,/** @lends module:montage/core/ | |||
104 | value: function(name, dontStoreState) { | 105 | value: function(name, dontStoreState) { |
105 | this.name = name; | 106 | this.name = name; |
106 | this._storeState = !dontStoreState; | 107 | this._storeState = !dontStoreState; |
107 | if (this._storeState) { | 108 | if (this._storeState && localStorage) { |
108 | var storedState = localStorage.getItem("_montage_logger_" + name); | 109 | var storedState = localStorage.getItem("_montage_logger_" + name); |
109 | if (storedState) { | 110 | if (storedState) { |
110 | this.isDebug = storedState === "true"; | 111 | this.isDebug = storedState === "true"; |
@@ -335,7 +336,7 @@ LoggerUI = Montage.create(Montage, /** @lends module:montage/core/logger.LoggerU | |||
335 | name = event.target.value, | 336 | name = event.target.value, |
336 | logger = loggers[name]; | 337 | logger = loggers[name]; |
337 | logger.isDebug = value; | 338 | logger.isDebug = value; |
338 | if (logger._storeState) { | 339 | if (logger._storeState && localStorage) { |
339 | localStorage.setItem("_montage_logger_" + name, value); | 340 | localStorage.setItem("_montage_logger_" + name, value); |
340 | } | 341 | } |
341 | } | 342 | } |
@@ -394,7 +395,7 @@ LoggerUI = Montage.create(Montage, /** @lends module:montage/core/logger.LoggerU | |||
394 | input.type = "checkbox"; | 395 | input.type = "checkbox"; |
395 | input.checked = !!iLogger.isDebug; | 396 | input.checked = !!iLogger.isDebug; |
396 | storageKey = "_montage_logger_" + iLogger.name; | 397 | storageKey = "_montage_logger_" + iLogger.name; |
397 | if (iLogger._storeState) { | 398 | if (iLogger._storeState && localStorage) { |
398 | storedValue = localStorage.getItem(storageKey); | 399 | storedValue = localStorage.getItem(storageKey); |
399 | if (storedValue == null) { | 400 | if (storedValue == null) { |
400 | localStorage.setItem(storageKey, iLogger.isDebug); | 401 | localStorage.setItem(storageKey, iLogger.isDebug); |
@@ -485,9 +486,12 @@ var setupUI = function() { | |||
485 | @type {Statement} | 486 | @type {Statement} |
486 | @default window | 487 | @default window |
487 | */ | 488 | */ |
488 | if (window) { | 489 | if (typeof window !== "undefined") { |
490 | // assigning to a local allows us to feature-test without typeof | ||
491 | localStorage = window.localStorage; | ||
489 | window.loggers = loggers; | 492 | window.loggers = loggers; |
490 | if (window.localStorage) { | 493 | if (window.localStorage) { |
491 | setupUI(); | 494 | setupUI(); |
492 | } | 495 | } |
493 | } | 496 | } |
497 | |||