From 336e0e0ef242f5c472757fe3bbcdd54c04a00f1f Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Mon, 14 May 2012 10:32:59 -0700
Subject: Workspace: has customized

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 css/ninja.css                                   |  4 ++--
 js/data/panels-data.js                          |  2 +-
 js/panels/PanelContainer.reel/PanelContainer.js | 15 ++++++-------
 js/panels/binding-panel.reel/binding-panel.css  |  0
 js/panels/binding-panel.reel/binding-panel.html | 28 +++++++++++++++++++++++++
 js/panels/binding-panel.reel/binding-panel.js   | 12 +++++++++++
 js/panels/binding.reel/binding.css              |  0
 js/panels/binding.reel/binding.html             | 27 ------------------------
 js/panels/binding.reel/binding.js               | 11 ----------
 js/panels/objects.reel/objects.html             |  1 +
 scss/imports/scss/_Workspace.scss               |  3 ++-
 11 files changed, 54 insertions(+), 49 deletions(-)
 create mode 100644 js/panels/binding-panel.reel/binding-panel.css
 create mode 100644 js/panels/binding-panel.reel/binding-panel.html
 create mode 100644 js/panels/binding-panel.reel/binding-panel.js
 delete mode 100644 js/panels/binding.reel/binding.css
 delete mode 100644 js/panels/binding.reel/binding.html
 delete mode 100644 js/panels/binding.reel/binding.js

diff --git a/css/ninja.css b/css/ninja.css
index ebf16395..ec589902 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -997,10 +997,10 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .montage-invisible { display: none; }
 
-body .panel.ws-binding { display: none; }
+body .panel.ws-binding { display: none; -webkit-box-flex-group: 2; }
 
 body.ws-binding .rightPanelContent .panel { display: none; }
 
-body.ws-binding .rightPanelContent .panel.ws-binding { display: block; }
+body.ws-binding .rightPanelContent .panel.ws-binding { display: -webkit-box; }
 
 /*77*/
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 7fa22995..23bfa1ed 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -116,7 +116,7 @@ exports.PanelsData = Montage.create(Montage, {
             collapsed: true,
             scrollable: true,
             open: true,
-            modulePath: "js/panels/binding.reel",
+            modulePath: "js/panels/binding-panel.reel",
             moduleName: "BindingPanel"
         },
         {
diff --git a/js/panels/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer.reel/PanelContainer.js
index 044fd598..b4f77317 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer.reel/PanelContainer.js
@@ -158,16 +158,17 @@ exports.PanelContainer = Montage.create(Component, {
  
     _setPanelsSizes: {
         value: function(panelActivated) {
-            this.panelsAvailable();
-            var len = this.panels.length, setLocked = true;
+            var availablePanels = this.panelsAvailable();
+            var len = availablePanels.length;
+            var setLocked = true;
 
             for(var i = 0; i < len; i++) {
-                if(this.panels[i] === panelActivated || panelActivated === null) {
+                if(availablePanels[i] === panelActivated || panelActivated === null) {
                     setLocked = false;
                 }
 
-                this.panels[i].locked = setLocked;
-                this.panels[i].needsDraw = true;
+                availablePanels[i].locked = setLocked;
+                availablePanels[i].needsDraw = true;
             }
         }
     },
@@ -176,7 +177,7 @@ exports.PanelContainer = Montage.create(Component, {
         value: function(panelActivated, unlockPanels) {
             var maxHeight = this.element.offsetHeight, setLocked = true;
             var availablePanels = this.panelsAvailable();
-            var len = this.panels.length;
+            var len = availablePanels.length;
 
             if(unlockPanels === true) {
                 setLocked = false;
@@ -190,7 +191,7 @@ exports.PanelContainer = Montage.create(Component, {
             }
 
             for(var i = 0; i < len; i++) {
-                var obj = this['panel_'+i];
+                var obj = availablePanels[i];
 
                 if(obj === panelActivated) {
                     setLocked = false;
diff --git a/js/panels/binding-panel.reel/binding-panel.css b/js/panels/binding-panel.reel/binding-panel.css
new file mode 100644
index 00000000..e69de29b
diff --git a/js/panels/binding-panel.reel/binding-panel.html b/js/panels/binding-panel.reel/binding-panel.html
new file mode 100644
index 00000000..0db7b95f
--- /dev/null
+++ b/js/panels/binding-panel.reel/binding-panel.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<!-- <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> -->
+<html lang="en">
+<head>
+    	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+		<link rel="stylesheet" href="binding-panel.css" type="text/css">
+        <script type="text/montage-serialization">
+        {
+            "owner": {
+                "prototype": "js/panels/binding-panel.reel",
+                "properties": {
+                    "element": {"#": "binding"}
+                }
+            }
+
+    	}
+		</script>
+	</head>
+<body>
+    <div data-montage-id="binding">
+        this is a test
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/js/panels/binding-panel.reel/binding-panel.js b/js/panels/binding-panel.reel/binding-panel.js
new file mode 100644
index 00000000..03fe5723
--- /dev/null
+++ b/js/panels/binding-panel.reel/binding-panel.js
@@ -0,0 +1,12 @@
+var Montage         = require("montage/core/core").Montage,
+    Component       = require("montage/ui/component").Component;
+
+
+exports.BindingPanel = Montage.create(Component, {
+
+    prepareForDraw: {
+        value: function() {
+            console.log("test- objects");
+        }
+    }
+});
\ No newline at end of file
diff --git a/js/panels/binding.reel/binding.css b/js/panels/binding.reel/binding.css
deleted file mode 100644
index e69de29b..00000000
diff --git a/js/panels/binding.reel/binding.html b/js/panels/binding.reel/binding.html
deleted file mode 100644
index 50e839ab..00000000
--- a/js/panels/binding.reel/binding.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<!-- <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> -->
-<html lang="en">
-<head>
-    	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<link rel="stylesheet" href="binding.css" type="text/css">
-        <script type="text/montage-serialization">
-        {
-            "owner": {
-                "prototype": "js/panels/binding.reel",
-                "properties": {
-                    "element": {"#": "binding"}
-                }
-            }
-
-    	}
-		</script>
-	</head>
-<body>
-    <div data-montage-id="binding">
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/js/panels/binding.reel/binding.js b/js/panels/binding.reel/binding.js
deleted file mode 100644
index e9676c4d..00000000
--- a/js/panels/binding.reel/binding.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var Montage =	require("montage/core/core").Montage,
-    PanelBase =	require("js/panels/panelbase").PanelBase;
-////////////////////////////////////////////////////////////////////////
-//Exporting as ColorPanel
-exports.BindingPanel = Montage.create(PanelBase, {
-    ////////////////////////////////////////////////////////////////////
-    //Panel Configuration
-    panelName: {
-        value: "Color"
-    }
-});
\ No newline at end of file
diff --git a/js/panels/objects.reel/objects.html b/js/panels/objects.reel/objects.html
index b21097e7..a21e611c 100644
--- a/js/panels/objects.reel/objects.html
+++ b/js/panels/objects.reel/objects.html
@@ -22,6 +22,7 @@
 	</head>
 <body>
     <div data-montage-id="objects">
+        objects:test
     </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/scss/imports/scss/_Workspace.scss b/scss/imports/scss/_Workspace.scss
index 7bac37ab..06f50a23 100755
--- a/scss/imports/scss/_Workspace.scss
+++ b/scss/imports/scss/_Workspace.scss
@@ -8,6 +8,7 @@
 
 body .panel.ws-binding {
     display:none;
+    -webkit-box-flex-group:2;
 }
 
 body.ws-binding .rightPanelContent .panel {
@@ -15,5 +16,5 @@ body.ws-binding .rightPanelContent .panel {
 }
 
 body.ws-binding .rightPanelContent .panel.ws-binding {
-    display:block;
+    display:-webkit-box;
 }
\ No newline at end of file
-- 
cgit v1.2.3