clearing the old local setting and using the new version/prefix local settings.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

10 files changed, 60 insertions, 52 deletions

diff --git a/js/controllers/local-storage-controller.js b/js/controllers/local-storage-controller.js
index ea763cff..1388f3e5 100755
--- a/js/controllers/local-storage-controller.js
+++ b/js/controllers/local-storage-controller.js
@@ -20,20 +20,25 @@ exports.LocalStorage = Montage.create( Component, {
 
             // Redefine setItem and getItem if local storage is not available.
             if(!this.canStore) {
-                this._getItem = function() {
+                this.getItem = function() {
                     console.log("Local Storage is not supported on your browser");
                     return "";
                 };
 
-                this._setItem = function() {
+                this.setItem = function() {
                     console.log("Local Storage is not supported on your browser");
                     return false;
                 }
             }
+
+            // Temporary clear the local storage if we find the version key
+            if(window.localStorage.version) {
+                window.localStorage.clear();
+            }
         }
     },
 
-    _getItem: {
+    getItem: {
         value: function(key) {
             var value = window.localStorage.getItem("ninja-" + key);
             if(value !== null) value = JSON.parse(value);
@@ -42,38 +47,11 @@ exports.LocalStorage = Montage.create( Component, {
         }
     },
 
-    _setItem: {
+    setItem: {
         value: function(key, value) {
             window.localStorage.setItem("ninja-" + key, JSON.stringify(value));
-        }
-    },
-
-    getItem: {
-        value: function(item) {
-            var item;
 
-            if (window.localStorage) {
-                item  = window.localStorage.getItem(item);
-                if(item !== null) return JSON.parse(item)
-                return null;
-            } else {
-                alert("Local Storage is not supported on your browser");
-                return null;
-            }
-
-        }
-    },
-
-    setItem: {
-        value: function(item, value) {
-            if (window.localStorage) {
-                window.localStorage.setItem(item, JSON.stringify(value));
-                return true;
-            } else {
-                alert("Local Storage is not supported on your browser");
-                return false;
-            }
+            return value;
         }
     }
-
 });
\ No newline at end of file
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 9cf27504..953e560c 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -374,7 +374,7 @@
                             </section>
                         </section>
 
-                        <section id="timelineResizer" class="timelineResizer resizeBar"></section>
+                        <section data-montage-id="timelineResizer" class="timelineResizer resizeBar"></section>
                             <section id="breadCrumbTrail">
                                 <div id="breadCrumbComponent"></div>
                             </section>
@@ -386,7 +386,7 @@
                     </section>
                 </section>
 
-                <section id="rightPanelResizer" class="rightPanelResizer resizeBar"></section>
+                <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section>
 
                 <section id="rightPanelContainer" class="panelContainer">
                     <section id="rightPanelContent">
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
index db630934..98b2b61d 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
@@ -53,7 +53,7 @@
                 <div  id="nj-css-stylesheet-toolbar" class="nj-css-toolbar">
                         <a href="#" id="nj-css-add-stylesheet" title="Add Stylesheet">Add Rule</a>
                 </div>
-        <div id="subPanelResizer" class="resizer"></div>
+        <div data-montage-id="subPanelResizer" class="resizer"></div>
                 <!-- Style Rule list subsection -->
                 <h2 id="nj-css-styles-header" class="nj-section-header">
                         <div id="nj-css-styles-arrow" class="panelDisclosureIcon"></div>
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index dc76d871..46c8fb91 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -15,6 +15,13 @@
                     "element": {"#": "resizeBar"},
                     "panel": {"#": "panel"},
                     "isVertical": true
+                },
+                "bindings": {
+                    "ownerId": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "panelBase.panelName",
+                        "oneway": true
+                    }
                 }
             },
 
@@ -55,7 +62,7 @@
             </div>
         </div>
     </div>
-    <div id="resizeBar" class="resizeBar"></div>
+    <div data-montage-id="resizeBar" class="resizeBar"></div>
 </article>
 
 </body>
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index efa287c5..c8dd0456 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -188,6 +188,8 @@ exports.Panel = Montage.create(Component, {
                 //Resized Event
                 if(typeof this.resizer.value == "number") this.panelBase.contentHeight = this.resizer.value;
                 this.resizer.element.addEventListener("mouseup",this.resized.bind(this),false);
+
+                this.panelContent.content = this.panelBase.content;
             }
         }
     },
@@ -226,7 +228,7 @@ exports.Panel = Montage.create(Component, {
             else pContentDiv.style.overflow = "hidden";
             this.element.getElementsByClassName("panelTitle")[0].innerHTML = this.panelBase.panelName;
             //pContentDiv.appendChild(this.panelBase.content);
-            this.panelContent.content = this.panelBase.content;
+            //this.panelContent.content = this.panelBase.content;
 
         }
     }
diff --git a/js/panels/PanelBase.js b/js/panels/PanelBase.js
index b7b6945c..03dcd0ee 100755
--- a/js/panels/PanelBase.js
+++ b/js/panels/PanelBase.js
@@ -32,11 +32,14 @@ exports.PanelBase = Montage.create(Component, {
     contentHeight: {
          get: function() {
             if(this._contentHeight == null) {
+                // Old settings
+                /*
                 if(this.application.ninja.settings.getSetting(this.panelName, "contentHeight")) {
                     this._contentHeight = this.application.ninja.settings.getSetting(this.panelName, "contentHeight");
                 } else {
                     this._contentHeight = this.defaultHeight;
-                }
+                }*/
+                this._contentHeight = this.defaultHeight;
             }
              return this._contentHeight;
          },
@@ -44,50 +47,60 @@ exports.PanelBase = Montage.create(Component, {
             if (this.minHeight > value) value = this._minHeight;
             if (this.maxHeight != null) if(this.maxHeight < value) value = this.maxHeight;
              this._contentHeight = value;
-            this.application.ninja.settings.setSetting(this.panelName, "contentHeight", value);
+//            this.application.ninja.settings.setSetting(this.panelName, "contentHeight", value);
          }
      },
     forcedCollapse: {
         get: function() {
             if(this._forcedCollapse == null) {