Merge branch 'refs/heads/NinjaInternal' into Color

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 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
 .presetsPanel {
     display: -webkit-box;
     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, {
     },
     templateDidLoad : {
         value: function() {
-            var storedTabIndex = window.localStorage.presetsTabIndex;
+            var storedTabIndex = this.application.localStorage.getItem("presetsTabIndex");
             if(storedTabIndex) {
                 this.activeTabIndex = storedTabIndex;
             }
@@ -50,7 +50,7 @@ exports.content = Montage.create(Component, {
         },
         set: function(tabObject) {
             this.contentPanel = tabObject.key;
-            window.localStorage.presetsTabIndex = this.tabs.indexOf(tabObject);
+            this.application.localStorage.setItem("presetsTabIndex", this.tabs.indexOf(tabObject));
             this._tabToDeactivate = this._activeTab;
             this._activeTab = tabObject;
 
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 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </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 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
\ No newline at end of file