aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets
diff options
context:
space:
mode:
authorEric Guzman2012-02-29 16:13:19 -0800
committerEric Guzman2012-02-29 16:13:19 -0800
commit53bdb1e7773069c4cca59e88d6da91cd0f58c94a (patch)
tree44a2147fcbb43ea483f78a1e2e082919f9c81970 /js/panels/presets
parentb2c60efb9c6f5dfa7b0fc5c2b9feebebc805ed97 (diff)
parentb09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff)
downloadninja-53bdb1e7773069c4cca59e88d6da91cd0f58c94a.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/panels/presets')
-rw-r--r--js/panels/presets/content.reel/content.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/presets/content.reel/content.js b/js/panels/presets/content.reel/content.js
index c43c593c..1ede7246 100644
--- a/js/panels/presets/content.reel/content.js
+++ b/js/panels/presets/content.reel/content.js
@@ -16,7 +16,7 @@ exports.content = Montage.create(Component, {
16 }, 16 },
17 templateDidLoad : { 17 templateDidLoad : {
18 value: function() { 18 value: function() {
19 var storedTabIndex = window.localStorage.presetsTabIndex; 19 var storedTabIndex = this.application.localStorage.getItem("presetsTabIndex");
20 if(storedTabIndex) { 20 if(storedTabIndex) {
21 this.activeTabIndex = storedTabIndex; 21 this.activeTabIndex = storedTabIndex;
22 } 22 }
@@ -50,7 +50,7 @@ exports.content = Montage.create(Component, {
50 }, 50 },
51 set: function(tabObject) { 51 set: function(tabObject) {
52 this.contentPanel = tabObject.key; 52 this.contentPanel = tabObject.key;
53 window.localStorage.presetsTabIndex = this.tabs.indexOf(tabObject); 53 this.application.localStorage.setItem("presetsTabIndex", this.tabs.indexOf(tabObject));
54 this._tabToDeactivate = this._activeTab; 54 this._tabToDeactivate = this._activeTab;
55 this._activeTab = tabObject; 55 this._activeTab = tabObject;
56 56