diff options
author | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
commit | 63307c9abf120985d979a40a53a0598d3f0d5c5a (patch) | |
tree | 57d9cffd7aa0959ea31fe0fa2d89a9080198bcb3 /js/panels/presets/content.reel/content.js | |
parent | e1a65d0c2a13e12ee53be98c731616e35aa07a41 (diff) | |
parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
download | ninja-63307c9abf120985d979a40a53a0598d3f0d5c5a.tar.gz |
Merge branch 'master' into pentool
Conflicts:
manifest.json
Diffstat (limited to 'js/panels/presets/content.reel/content.js')
-rw-r--r-- | js/panels/presets/content.reel/content.js | 4 |
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 | ||