From b9afa81d391f51ea199fc12278b89bdda883dd97 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 17 Jul 2012 23:34:57 -0700 Subject: removed left over comments. Signed-off-by: Valerio Virgillito --- js/ninja.reel/ninja.html | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'js/ninja.reel/ninja.html') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 17726712..4f40a3f8 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -52,10 +52,7 @@ POSSIBILITY OF SUCH DAMAGE. }, "appModel": { - "prototype": "js/models/app-model", - "bindings": { - "currentDocument": {"<-": "@documentList.selectedObjects.0"} - } + "prototype": "js/models/app-model" }, "materialsModel": { @@ -63,7 +60,7 @@ POSSIBILITY OF SUCH DAMAGE. }, "menu": { - "prototype": "js/components/menu/menu.reel", + "prototype": "js/ui/menu/menu.reel", "properties": { "element": {"#": "mainMenuBar"} }, @@ -183,17 +180,7 @@ POSSIBILITY OF SUCH DAMAGE. "currentDocument": {"<-": "@documentList.selectedObjects.0"} } }, - - "stageMode": { - "prototype": "js/components/layout/stage-mode.reel", - "properties": { - "element": {"#": "stageMode"} - }, - "bindings" : { - "chromePreview": {"<->": "@appModel.chromePreview"} - } - }, - + "toolsList": { "prototype": "js/components/layout/tools-list.reel", "properties": { -- cgit v1.2.3 From 6403ec6d21048c93138ddcbcc59fc4677121ed5e Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 19 Jul 2012 15:53:54 -0700 Subject: Timeline: updated livePreview to timeline play. Hide canvas and draw red outline - Changed the play button to a toggle button - livePreview code in stage activated via bindings - Draw a red outline of the canvas when in play Signed-off-by: Valerio Virgillito --- js/ninja.reel/ninja.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/ninja.reel/ninja.html') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 4f40a3f8..fbbfd066 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -268,7 +268,8 @@ POSSIBILITY OF SUCH DAMAGE. "timeline": { "prototype": "js/panels/Timeline/TimelinePanel.reel", "properties": { - "element": {"#": "timelinePanelComponent"} + "element": {"#": "timelinePanelComponent"}, + "stage": {"@": "stage"} }, "bindings": { "currentDocument": {"<-": "@documentList.selectedObjects.0"} -- cgit v1.2.3