48 files changed, 1554 insertions, 552 deletions

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..7556952c 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -14,7 +14,15 @@
                 "properties": {
                     "element": {"#": "resizeBar"},
                     "panel": {"#": "panel"},
-                    "isVertical": true
+                    "isVertical": true,
+                    "willSave": false
+                },
+                "bindings": {
+                    "ownerId": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "panelBase.panelName",
+                        "oneway": true
+                    }
                 }
             },
 
@@ -55,7 +63,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..473de596 100755
--- a/js/panels/PanelBase.js
+++ b/js/panels/PanelBase.js
@@ -32,62 +32,72 @@ 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;
          },
          set: function(value) {
-            if (this.minHeight > value) value = this._minHeight;
-            if (this.maxHeight != null) if(this.maxHeight < value) value = this.maxHeight;
+             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) {
+                // Old settings
+                /*
                 if(this.application.Ninja.SettingsManager.getSetting(this.panelName, "isPanelForceCollapsed")) {
                     this._forcedCollapse = this.application.Ninja.SettingsManager.getSetting(this.panelName, "isPanelForceCollapsed");
-                } else {
-                    this._forcedCollapse = false;
-                }
+                } */
+                this._forcedCollapse = false;
             }
             return this._forcedCollapse;
         },
         set: function(value) {
             this._forcedCollapse = value;
-            this.application.Ninja.SettingsManager.setSetting(this.panelName, "isPanelForceCollapsed", value);
+
+            // this.application.Ninja.SettingsManager.setSetting(this.panelName, "isPanelForceCollapsed", value);
         }
     },
     collapsed: {
         get: function() {
             if(this._collapsed == null) {
+                // Old settings
+                /*