Merge branch 'binding' of github.com:dhg637/ninja-internal into binding

Conflicts:
	js/stage/binding-view.reel/binding-view.js

52 files changed, 1077 insertions, 447 deletions

diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
index 2176c6d5..c600fd0d 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
@@ -68,7 +68,8 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
     },
 
     _materialInfo: {
-        enumerable:true
+        enumerable:true,
+        serializable: true
     },
     
     _showMaterialPopup: {
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index a4f758cf..0a32447e 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -12,6 +12,21 @@ var Montage = require("montage/core/core").Montage,
 //Exporting as MaterialsPopup
 exports.MaterialsPopup = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
+    okButton: {
+        value: null,
+        serializable: true
+    },
+
+    cancelButton: {
+        value: null,
+        serializable: true
+    },
+
+    materialTitle: {
+        value: null,
+        serializable: true
+    },
+
         // Material Properties
     _materialName: {
         enumerable: true,
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index f0fb1044..5937b58f 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -75,7 +75,6 @@
                 "prototype": "montage/ui/button.reel",
                 "properties": {
                     "element": {"#": "btnClose"},
-                    "pressedClass": "hide",
                     "identifier": "btnClose"
                 },
                 "listeners": [
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index 3783459e..16643813 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -13,10 +13,15 @@ exports.Panel = Montage.create(Component, {
         value: "Panel"
     },
 
-    groups: {
+        groups: {
         value: []
     },
 
+    panelContent: {
+        value: null,
+        serializable: true
+    },
+
     _collapsed: {
         value: false
     },
@@ -50,7 +55,8 @@ exports.Panel = Montage.create(Component, {
     },
 
     resizer: {
-        value: null
+        value: null,
+        serializable: true
     },
 
     modulePath: {
@@ -120,8 +126,8 @@ exports.Panel = Montage.create(Component, {
 
             this._currentDocument = value;
 
-            if(typeof this.panelContent.content[0].controller._currentDocument !== "undefined") {
-                this.panelContent.content[0].controller.currentDocument = this._currentDocument;
+            if(typeof this.panelContent.content._element.controller._currentDocument !== "undefined") {
+                this.panelContent.content._element.controller.currentDocument = this._currentDocument;
             }
 
             if(!value) {
diff --git a/js/panels/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer.reel/PanelContainer.js
index 82069146..e0e547f9 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer.reel/PanelContainer.js
@@ -12,8 +12,54 @@ var Montage         = require("montage/core/core").Montage,
  
 exports.PanelContainer = Montage.create(Component, {
 
+    panelSplitter: {
+        value: null,
+        serializable: true
+    },
+
+    appModel: {
+        value: null,
+        serializable: true
+    },
+
     panelData: {
-        value: null
+        value: null,
+        serializable: true
+    },
+
+    panel_0: {
+        value: null,
+        serializable: true
+    },
+
+    panel_1: {
+        value: null,
+        serializable: true
+    },