From 337efc667372326ae2f9984d89a47bb151016774 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Mon, 11 Jun 2012 13:25:13 -0700 Subject: Changes Made to Object Listing of iFrame Signed-off-by: Armen Kesablyan --- js/ninja.reel/ninja.html | 3 ++- js/ninja.reel/ninja.js | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'js/ninja.reel') 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 @@ "objectsController" : { "prototype": "js/controllers/objects-controller", "bindings": { - "currentDocument": {"<-": "@owner.currentDocument"} + "currentDocument": {"<-": "@documentList.selectedObjects.0"}, + "objects": {"<-": "@documentList.selectedObjects.0.model.mObjects"} } }, 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, { value: null }, + appData: { + value: AppData + }, documentList: { value: null @@ -57,9 +60,14 @@ exports.Ninja = Montage.create(Component, { } }, + _isResizing: { + value: null + }, + _resizedHeight : { value: 0 }, + _height: { value: null }, -- cgit v1.2.3