From 0e1a276f19ea70009c5a649e9667861d7c346a7e Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 6 Jun 2012 00:25:27 -0700 Subject: first iteration of adding serializable to ninja plus other changes to run the latest montage Signed-off-by: Valerio Virgillito --- js/ninja.reel/ninja.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/ninja.reel/ninja.html') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index a98fca60..a63422fb 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -163,7 +163,7 @@ "element": {"#": "stageMode"} }, "bindings" : { - "livePreview": {"<<->": "@appModel.livePreview"} + "livePreview": {"<->": "@appModel.livePreview"} } }, @@ -310,7 +310,7 @@ "selectObjectsOnAddition": true }, "bindings": { - "content": {"<<->": "@documentController.documents"} + "content": {"<->": "@documentController.documents"} } }, -- cgit v1.2.3 From 806974142d44afdd23534bf2d18eff0a8e701e0c Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 8 Jun 2012 16:59:59 -0700 Subject: rewrite: currentSelectedContainer -> domContainer Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito --- js/ninja.reel/ninja.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'js/ninja.reel/ninja.html') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index a98fca60..38b956bd 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -246,7 +246,7 @@ "element":{"#" : "breadCrumbComponent"} }, "bindings" : { - "container": {"<-": "@owner.currentSelectedContainer"}, + "currentDocument": {"<-": "@documentList.selectedObjects.0"} } }, @@ -291,7 +291,6 @@ "selectionController": { "prototype": "js/controllers/selection-controller", "bindings" : { - "selectionContainer": {"<-": "@owner.currentSelectedContainer"}, "currentDocument": {"<-": "@documentList.selectedObjects.0"}, "selectedElements": {"<-": "@documentList.selectedObjects.0.model.selection"} } -- cgit v1.2.3 From a75947d69f571d723552f926f94d195514a01cbd Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 12 Jun 2012 23:04:07 -0700 Subject: fixed document switching issues Signed-off-by: Valerio Virgillito --- js/ninja.reel/ninja.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'js/ninja.reel/ninja.html') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 00740ea9..405f57da 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -291,8 +291,7 @@ "selectionController": { "prototype": "js/controllers/selection-controller", "bindings" : { - "currentDocument": {"<-": "@documentList.selectedObjects.0"}, - "selectedElements": {"<-": "@documentList.selectedObjects.0.model.selection"} + "currentDocument": {"<-": "@documentList.selectedObjects.0"} } }, -- cgit v1.2.3