From c144c6921d42fe96c18045b1c2a9822a467b1253 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Fri, 15 Jun 2012 18:34:22 -0700
Subject: Objects Tray - Moved to stage object from binding view

---
 js/stage/binding-view.reel/binding-view.css  | 11 -----------
 js/stage/binding-view.reel/binding-view.html | 10 +---------
 2 files changed, 1 insertion(+), 20 deletions(-)

(limited to 'js/stage/binding-view.reel')

diff --git a/js/stage/binding-view.reel/binding-view.css b/js/stage/binding-view.reel/binding-view.css
index a08def8a..37bc8318 100755
--- a/js/stage/binding-view.reel/binding-view.css
+++ b/js/stage/binding-view.reel/binding-view.css
@@ -5,7 +5,6 @@
  </copyright> */
 
 .bindingView {
-    height: 100%;
     position: absolute;
     width:100%;
     z-index: 12;
@@ -24,13 +23,3 @@
     z-index: 1;
 }
 
-.objects-tray-container {
-    bottom: 11px;
-    position: absolute;
-    width: 100%;
-    display: -webkit-box;
-    -webkit-box-orient: horizontal;
-    -webkit-box-pack: center;
-    -webkit-box-align: center;
-    z-index: 2;
-}
\ No newline at end of file
diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html
index 9a127618..e0c42194 100755
--- a/js/stage/binding-view.reel/binding-view.html
+++ b/js/stage/binding-view.reel/binding-view.html
@@ -41,12 +41,6 @@
                         "listener": {"@": "owner"}
                     }
                 ]
-            },
-            "objectsTray" : {
-                "prototype": "js/stage/objects-tray.reel",
-                "properties": {
-                    "element": {"#": "objects-tray" }
-                }
             }
         }
     </script>
@@ -56,15 +50,13 @@
 
 
     <section data-montage-id="bindingView" class="bindingView">
+
         <div data-montage-id="hudRepeater" class="hudRepeater">
             <div data-montage-id="hud">
 
             </div>
         </div>
 
-        <div class="objects-tray-container">
-            <div data-montage-id="objects-tray" ></div>
-        </div>
     </section>
 
 </body>
-- 
cgit v1.2.3


From e04903ed2d2e6754119550cb071e03878bb1b14b Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Mon, 18 Jun 2012 19:08:05 -0700
Subject: Objects Tray - Move back to binding view

---
 js/stage/binding-view.reel/binding-view.css  | 11 +++++++++++
 js/stage/binding-view.reel/binding-view.html | 10 ++++++++++
 2 files changed, 21 insertions(+)

(limited to 'js/stage/binding-view.reel')

diff --git a/js/stage/binding-view.reel/binding-view.css b/js/stage/binding-view.reel/binding-view.css
index 37bc8318..543577d1 100755
--- a/js/stage/binding-view.reel/binding-view.css
+++ b/js/stage/binding-view.reel/binding-view.css
@@ -5,6 +5,7 @@
  </copyright> */
 
 .bindingView {
+    height: 100%;
     position: absolute;
     width:100%;
     z-index: 12;
@@ -23,3 +24,13 @@
     z-index: 1;
 }
 
+.objects-tray-container {
+    bottom: 10px;
+    position: absolute;
+    width: 100%;
+    display: -webkit-box;
+    -webkit-box-orient: horizontal;
+    -webkit-box-pack: center;
+    -webkit-box-align: center;
+    z-index: 2;
+}
\ No newline at end of file
diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html
index e0c42194..91c9e397 100755
--- a/js/stage/binding-view.reel/binding-view.html
+++ b/js/stage/binding-view.reel/binding-view.html
@@ -27,6 +27,12 @@
                     "objects": {"<-": "@owner.bindables"}
                 }
             },
+            "objectsTray" : {
+                "prototype": "js/stage/objects-tray.reel",
+                "properties": {
+                    "element": {"#": "objects-tray" }
+                }
+            },
             "hud": {
                 "prototype": "js/stage/binding-view.reel/binding-hud.reel",
                 "properties": {
@@ -57,6 +63,10 @@
             </div>
         </div>
 
+        <div class="objects-tray-container">
+            <div data-montage-id="objects-tray" ></div>
+        </div>
+
     </section>
 
 </body>
-- 
cgit v1.2.3