aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-28 13:33:31 -0800
committerJose Antonio Marquez2012-02-28 13:33:31 -0800
commit3a25881b3a463e4f695be2f663f141710ba1d1c1 (patch)
tree657d55ad394de168dd627cf89b875906d10584e2 /js/panels/presets
parentd764428023d87446fbbb153d8e04a23b900d71d5 (diff)
parent7c9291a5bab4abd849547f8878f6fb962fc88250 (diff)
downloadninja-3a25881b3a463e4f695be2f663f141710ba1d1c1.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/panels/presets')
-rw-r--r--js/panels/presets/content.reel/content.css6
-rw-r--r--js/panels/presets/content.reel/content.js4
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.css5
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.css5
4 files changed, 18 insertions, 2 deletions
diff --git a/js/panels/presets/content.reel/content.css b/js/panels/presets/content.reel/content.css
index 08e1d53b..c0ccbad4 100644
--- a/js/panels/presets/content.reel/content.css
+++ b/js/panels/presets/content.reel/content.css
@@ -1,3 +1,9 @@
1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */
6
1.presetsPanel { 7.presetsPanel {
2 display: -webkit-box; 8 display: -webkit-box;
3 text-shadow: 1px 1px 1px #000; 9 text-shadow: 1px 1px 1px #000;
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
diff --git a/js/panels/presets/style-presets.reel/style-presets.css b/js/panels/presets/style-presets.reel/style-presets.css
index e69de29b..0441c1cf 100644
--- a/js/panels/presets/style-presets.reel/style-presets.css
+++ b/js/panels/presets/style-presets.reel/style-presets.css
@@ -0,0 +1,5 @@
1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */ \ No newline at end of file
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.css b/js/panels/presets/transitions-presets.reel/transitions-presets.css
index e69de29b..0441c1cf 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.css
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.css
@@ -0,0 +1,5 @@
1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */ \ No newline at end of file