aboutsummaryrefslogtreecommitdiff
path: root/js/stage/binding-view.reel
diff options
context:
space:
mode:
authorEric Guzman2012-06-15 15:00:06 -0700
committerEric Guzman2012-06-15 15:00:06 -0700
commitd6c427432bd0040b084b854407e9ed59a6707b54 (patch)
tree1f2b98cce5346b57018ce277d95db0f82df03fb9 /js/stage/binding-view.reel
parentfc0a4de30ab8556739acb10287da100f28bcad12 (diff)
downloadninja-d6c427432bd0040b084b854407e9ed59a6707b54.tar.gz
Objects Tray - Add objects tray to binding view
Diffstat (limited to 'js/stage/binding-view.reel')
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.css11
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.html25
2 files changed, 17 insertions, 19 deletions
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 @@
5 </copyright> */ 5 </copyright> */
6 6
7.bindingView { 7.bindingView {
8 height: 100%;
8 position: absolute; 9 position: absolute;
9 width:100%; 10 width:100%;
10 z-index: 12; 11 z-index: 12;
@@ -22,4 +23,14 @@
22 height:100%; 23 height:100%;
23 position:absolute; 24 position:absolute;
24 z-index: 1; 25 z-index: 1;
26}
27
28.objects-tray-container {
29 bottom: 11px;
30 position: absolute;
31 width: 100%;
32 display: -webkit-box;
33 -webkit-box-orient: horizontal;
34 -webkit-box-pack: center;
35 -webkit-box-align: center;
25} \ No newline at end of file 36} \ 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 @@
43 } 43 }
44 ] 44 ]
45 }, 45 },
46 "nonVisualRepeater": { 46 "objectsTray" : {
47 "prototype": "montage/ui/repetition.reel", 47 "prototype": "js/stage/objects-tray.reel",
48 "properties": {
49 "element": {"#": "nonVisualRepeater"}
50 },
51 "bindings": {
52 "objects": {"<-": "@owner.nonVisualComponents"}
53 }
54 },
55 "objectIcon": {
56 "prototype": "js/panels/objects/object.reel",
57 "properties": { 48 "properties": {
58 "element": {"#": "nonVisualComponent"} 49 "element": {"#": "objects-tray" }
59 },
60 "bindings": {
61 "sourceObject": {"<-": "@nonVisualRepeater.objectAtCurrentIteration"},
62 "identifier": {"<-": "@nonVisualRepeater.objectAtCurrentIteration.identifier"}
63 } 50 }
64 } 51 }
65 } 52 }
@@ -75,11 +62,11 @@
75 62
76 </div> 63 </div>
77 </div> 64 </div>
78 <div data-montage-id="nonVisualRepeater">
79 <div data-montage-id="nonVisualComponent">
80 65
81 </div> 66 <div class="objects-tray-container">
67 <div data-montage-id="objects-tray" ></div>
82 </div> 68 </div>
69
83 <canvas data-montage-id="bindingViewCanvas" class="bindingViewCanvas"></canvas> 70 <canvas data-montage-id="bindingViewCanvas" class="bindingViewCanvas"></canvas>
84 </section> 71 </section>
85 72