aboutsummaryrefslogtreecommitdiff
path: root/js/stage/binding-view.reel/binding-view.html
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-18 19:12:32 -0700
committerArmen Kesablyan2012-06-18 19:12:32 -0700
commit1b2e102b3519994c79b63be44fccb79cf5712fef (patch)
treef38534a7d8a3dc75909419a4bd823db73f771435 /js/stage/binding-view.reel/binding-view.html
parent2fcb74d0b204ce2999b70fa9a46fc58a558344d8 (diff)
parente04903ed2d2e6754119550cb071e03878bb1b14b (diff)
downloadninja-1b2e102b3519994c79b63be44fccb79cf5712fef.tar.gz
Merge pull request #16 from ericguzman/binding
Objects Tray - Moved to stage object from binding view
Diffstat (limited to 'js/stage/binding-view.reel/binding-view.html')
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.html14
1 files changed, 8 insertions, 6 deletions
diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html
index 9a127618..91c9e397 100755
--- a/js/stage/binding-view.reel/binding-view.html
+++ b/js/stage/binding-view.reel/binding-view.html
@@ -27,6 +27,12 @@
27 "objects": {"<-": "@owner.bindables"} 27 "objects": {"<-": "@owner.bindables"}
28 } 28 }
29 }, 29 },
30 "objectsTray" : {
31 "prototype": "js/stage/objects-tray.reel",
32 "properties": {
33 "element": {"#": "objects-tray" }
34 }
35 },
30 "hud": { 36 "hud": {
31 "prototype": "js/stage/binding-view.reel/binding-hud.reel", 37 "prototype": "js/stage/binding-view.reel/binding-hud.reel",
32 "properties": { 38 "properties": {
@@ -41,12 +47,6 @@
41 "listener": {"@": "owner"} 47 "listener": {"@": "owner"}
42 } 48 }
43 ] 49 ]
44 },
45 "objectsTray" : {
46 "prototype": "js/stage/objects-tray.reel",
47 "properties": {
48 "element": {"#": "objects-tray" }
49 }
50 } 50 }
51 } 51 }
52 </script> 52 </script>
@@ -56,6 +56,7 @@
56 56
57 57
58 <section data-montage-id="bindingView" class="bindingView"> 58 <section data-montage-id="bindingView" class="bindingView">
59
59 <div data-montage-id="hudRepeater" class="hudRepeater"> 60 <div data-montage-id="hudRepeater" class="hudRepeater">
60 <div data-montage-id="hud"> 61 <div data-montage-id="hud">
61 62
@@ -65,6 +66,7 @@
65 <div class="objects-tray-container"> 66 <div class="objects-tray-container">
66 <div data-montage-id="objects-tray" ></div> 67 <div data-montage-id="objects-tray" ></div>
67 </div> 68 </div>
69
68 </section> 70 </section>
69 71
70</body> 72</body>