Merge branch 'refs/heads/integration-candidate' into Timeline

2 files changed, 13 insertions, 3 deletions

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;
 
         }
     }