From d6c427432bd0040b084b854407e9ed59a6707b54 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Fri, 15 Jun 2012 15:00:06 -0700 Subject: Objects Tray - Add objects tray to binding view --- js/stage/binding-view.reel/binding-view.css | 11 +++++++++++ js/stage/binding-view.reel/binding-view.html | 25 ++++++------------------- 2 files changed, 17 insertions(+), 19 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 7f5de0b8..7ec31edf 100755 --- a/js/stage/binding-view.reel/binding-view.css +++ b/js/stage/binding-view.reel/binding-view.css @@ -5,6 +5,7 @@ */ .bindingView { + height: 100%; position: absolute; width:100%; z-index: 12; @@ -22,4 +23,14 @@ height:100%; position:absolute; 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; } \ 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 c7520132..5fb7affd 100755 --- a/js/stage/binding-view.reel/binding-view.html +++ b/js/stage/binding-view.reel/binding-view.html @@ -43,23 +43,10 @@ } ] }, - "nonVisualRepeater": { - "prototype": "montage/ui/repetition.reel", - "properties": { - "element": {"#": "nonVisualRepeater"} - }, - "bindings": { - "objects": {"<-": "@owner.nonVisualComponents"} - } - }, - "objectIcon": { - "prototype": "js/panels/objects/object.reel", + "objectsTray" : { + "prototype": "js/stage/objects-tray.reel", "properties": { - "element": {"#": "nonVisualComponent"} - }, - "bindings": { - "sourceObject": {"<-": "@nonVisualRepeater.objectAtCurrentIteration"}, - "identifier": {"<-": "@nonVisualRepeater.objectAtCurrentIteration.identifier"} + "element": {"#": "objects-tray" } } } } @@ -75,11 +62,11 @@ -
-
-
+
+
+ -- cgit v1.2.3