aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-11 13:25:13 -0700
committerArmen Kesablyan2012-06-11 13:25:13 -0700
commit337efc667372326ae2f9984d89a47bb151016774 (patch)
tree717f5a03f398cbab3b61f221458ed11f6b9db228 /js/ninja.reel
parent278769df00ced8620fd73371e38fe2e43f07ca3b (diff)
downloadninja-337efc667372326ae2f9984d89a47bb151016774.tar.gz
Changes Made to Object Listing of iFrame
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html3
-rwxr-xr-xjs/ninja.reel/ninja.js8
2 files changed, 10 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 221e492c..11f7c53e 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -363,7 +363,8 @@
363 "objectsController" : { 363 "objectsController" : {
364 "prototype": "js/controllers/objects-controller", 364 "prototype": "js/controllers/objects-controller",
365 "bindings": { 365 "bindings": {
366 "currentDocument": {"<-": "@owner.currentDocument"} 366 "currentDocument": {"<-": "@documentList.selectedObjects.0"},
367 "objects": {"<-": "@documentList.selectedObjects.0.model.mObjects"}
367 } 368 }
368 }, 369 },
369 370
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 5f753bd3..fe20447a 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -23,6 +23,9 @@ exports.Ninja = Montage.create(Component, {
23 value: null 23 value: null
24 }, 24 },
25 25
26 appData: {
27 value: AppData
28 },
26 29
27 documentList: { 30 documentList: {
28 value: null 31 value: null
@@ -57,9 +60,14 @@ exports.Ninja = Montage.create(Component, {
57 } 60 }
58 }, 61 },
59 62
63 _isResizing: {
64 value: null
65 },
66
60 _resizedHeight : { 67 _resizedHeight : {
61 value: 0 68 value: 0
62 }, 69 },
70
63 _height: { 71 _height: {
64 value: null 72 value: null
65 }, 73 },