aboutsummaryrefslogtreecommitdiff
path: root/js/stage/objects-tray.reel/objects-tray.html
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-20 13:07:31 -0700
committerArmen Kesablyan2012-06-20 13:07:31 -0700
commit409e4821d34886199a2106ea854fca6aab6d39c3 (patch)
treeca2967965c54269492176b1c3c93acbca6131c1f /js/stage/objects-tray.reel/objects-tray.html
parent5c770b772179cc2c3a0455f67025978b44e4b547 (diff)
parent8ac2ce1566995c91fe4721df2b121ed6437b9e1c (diff)
downloadninja-409e4821d34886199a2106ea854fca6aab6d39c3.tar.gz
Merge branch 'refs/heads/binding_eric' into binding
Diffstat (limited to 'js/stage/objects-tray.reel/objects-tray.html')
-rw-r--r--js/stage/objects-tray.reel/objects-tray.html12
1 files changed, 10 insertions, 2 deletions
diff --git a/js/stage/objects-tray.reel/objects-tray.html b/js/stage/objects-tray.reel/objects-tray.html
index 0fece3fe..901f3e58 100644
--- a/js/stage/objects-tray.reel/objects-tray.html
+++ b/js/stage/objects-tray.reel/objects-tray.html
@@ -14,7 +14,9 @@
14 "owner": { 14 "owner": {
15 "prototype": "js/stage/objects-tray.reel", 15 "prototype": "js/stage/objects-tray.reel",
16 "properties": { 16 "properties": {
17 "element": {"#": "objects-tray"} 17 "element": {"#": "objects-tray"},
18 "iconsRepetition": {"@": "repetition" },
19 "offStageObjectsController": {"@": "arrayController"}
18 } 20 }
19 }, 21 },
20 "repetition" : { 22 "repetition" : {
@@ -38,7 +40,13 @@
38 "bindings": { 40 "bindings": {
39 "sourceObject" : {"<-": "@repetition.objectAtCurrentIteration"}, 41 "sourceObject" : {"<-": "@repetition.objectAtCurrentIteration"},
40 "identifier" : {"<-": "@repetition.objectAtCurrentIteration.identifier"} 42 "identifier" : {"<-": "@repetition.objectAtCurrentIteration.identifier"}
41 } 43 },
44 "listeners": [
45 {
46 "type": "click",
47 "listener": {"@": "owner"}
48 }
49 ]
42 } 50 }
43 51
44 } 52 }