aboutsummaryrefslogtreecommitdiff
path: root/js/stage/binding-view.reel/binding-view.html
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-29 11:50:17 -0700
committerNivesh Rajbhandari2012-06-29 11:50:17 -0700
commit81d75ac08ff24dc3078d79a9133e54f592c23026 (patch)
tree4f4136503c87a72f7af67a54dad69c14469ee01e /js/stage/binding-view.reel/binding-view.html
parent01783536d2245b474eb1f89df673bfabb006cbdd (diff)
parentecd9e3b3b09695e3e7115c04e75add5a20c5c6fe (diff)
downloadninja-81d75ac08ff24dc3078d79a9133e54f592c23026.tar.gz
Merge branch 'refs/heads/ninja-internal' into ColorGradientFix
Diffstat (limited to 'js/stage/binding-view.reel/binding-view.html')
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.html8
1 files changed, 6 insertions, 2 deletions
diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html
index 9eb338d8..c8da1e7e 100755
--- a/js/stage/binding-view.reel/binding-view.html
+++ b/js/stage/binding-view.reel/binding-view.html
@@ -37,10 +37,11 @@
37 "hud": { 37 "hud": {
38 "prototype": "js/stage/binding-view.reel/binding-hud.reel", 38 "prototype": "js/stage/binding-view.reel/binding-hud.reel",
39 "properties": { 39 "properties": {
40 "element": {"#" : "hud"} 40 "element": {"#" : "hud"},
41 "panelData": {"@": "panelData"}
41 }, 42 },
42 "bindings": { 43 "bindings": {
43 "userComponent": {"<-": "@hudRepeater.objectAtCurrentIteration"} 44 "userElement": {"<-": "@hudRepeater.objectAtCurrentIteration"}
44 }, 45 },
45 "listeners": [ 46 "listeners": [
46 { 47 {
@@ -48,6 +49,9 @@
48 "listener": {"@": "owner"} 49 "listener": {"@": "owner"}
49 } 50 }
50 ] 51 ]
52 },
53 "panelData": {
54 "object": "js/data/pi/pi-data[PiData]"
51 } 55 }
52 } 56 }
53 </script> 57 </script>