aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-01 13:13:21 -0700
committerArmen Kesablyan2012-06-01 13:13:21 -0700
commit10d97af27fca224752ad04551ca5c41982222d1f (patch)
tree27d2899cca3a9f28a0b6e222d39436d83009fafc /js/ninja.reel
parent9e187e40d9982654081e52be656e00b3ca4d36b5 (diff)
parent77677e5ffb08a5dec4bf0be279130d7b1a99d03f (diff)
downloadninja-10d97af27fca224752ad04551ca5c41982222d1f.tar.gz
Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 1f0582b1..53b8676f 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -326,7 +326,7 @@
326 "objectsController" : { 326 "objectsController" : {
327 "prototype": "js/controllers/objects-controller", 327 "prototype": "js/controllers/objects-controller",
328 "bindings": { 328 "bindings": {
329 "activeDocument": {"<-": "@owner.currentDocument"} 329 "currentDocument": {"<-": "@owner.currentDocument"}
330 } 330 }
331 }, 331 },
332 332