From c80e7df1702dff09b5cc8447ab0619747fed2024 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Fri, 11 May 2012 15:03:10 -0700 Subject: created the initial environment requirements for workspace to be manipulated. Signed-off-by: Armen Kesablyan --- js/ninja.reel/ninja.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index edc1efa4..7ab8e52c 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js @@ -18,6 +18,24 @@ exports.Ninja = Montage.create(Component, { value: null }, + _workspaceMode: { + value: null + }, + + workspaceMode: { + get: function() { + return this.workspaceMode; + }, + set: function(val) { + if( this._workspaceMode === val ) { + if(this._workspaceMode !== null) { + document.body.classList.remove("ws-" + val); + } + document.body.classList.add("ws-" + val); + } + } + }, + toolsData: { value: null }, appData: { value: AppData }, -- cgit v1.2.3 From c3452da7c18f73f45e4e6a58918f6459e7915b62 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Tue, 15 May 2012 15:02:40 -0700 Subject: Finished skeleton structure for binding. Signed-off-by: Armen Kesablyan --- js/ninja.reel/ninja.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 7ab8e52c..75b2203e 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js @@ -27,11 +27,12 @@ exports.Ninja = Montage.create(Component, { return this.workspaceMode; }, set: function(val) { - if( this._workspaceMode === val ) { + if(this._workspaceMode !== val ) { if(this._workspaceMode !== null) { - document.body.classList.remove("ws-" + val); + document.body.classList.remove("ws-" + this._workspaceMode); } document.body.classList.add("ws-" + val); + this._workspaceMode = val; } } }, @@ -166,6 +167,7 @@ exports.Ninja = Montage.create(Component, { prepareForDraw: { value: function() { + this.workspaceMode = "default"; console.log("Loading Ninja --> ", this.ninjaVersion); this.application.ninja = this; -- cgit v1.2.3 From 7e94d5786df400b599df3233b3086bfe9eff2bde Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Wed, 16 May 2012 22:58:24 -0700 Subject: Objects Panel - Add Objects controller and montage/application hack to expose template --- js/ninja.reel/ninja.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 52a6daa2..7c3bc2c4 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -321,6 +321,10 @@ "prototype": "js/controllers/code-editor-controller" }, + "objectsController" : { + "prototype": "js/controllers/objects-controller" + }, + "owner": { "prototype": "js/ninja.reel", "properties": { @@ -350,6 +354,7 @@ "timeline": {"@": "timeline"}, "mainMenuController": {"@": "mainMenuController"}, "codeEditorController": {"@": "codeEditorController"}, + "objectsController": {"@": "objectsController"}, "rightPanelContainer": {"#": "rightPanelContainer" }, "panelSplitter": {"@": "splitter3"}, "timelineSplitter": {"@": "splitter4"}, -- cgit v1.2.3 From 95bef3bbd77c6c3bd01b5222986f2dd35a7218b4 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Sat, 19 May 2012 14:48:35 -0700 Subject: Changes to binding view Signed-off-by: Armen Kesablyan --- js/ninja.reel/ninja.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 12dbf660..1f0582b1 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -324,7 +324,10 @@ }, "objectsController" : { - "prototype": "js/controllers/objects-controller" + "prototype": "js/controllers/objects-controller", + "bindings": { + "activeDocument": {"<-": "@owner.currentDocument"} + } }, "owner": { -- cgit v1.2.3 From e09efe3212e86ac794de3fc8ecfc6cdef7b15181 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Wed, 30 May 2012 15:02:23 -0700 Subject: Objects Controller - Add bindable controller properties, and bindings getter --- js/ninja.reel/ninja.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/ninja.reel') 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 @@ "objectsController" : { "prototype": "js/controllers/objects-controller", "bindings": { - "activeDocument": {"<-": "@owner.currentDocument"} + "currentDocument": {"<-": "@owner.currentDocument"} } }, -- cgit v1.2.3 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 From 592bbb7e47d14528c1c9b034877a38f90db5649b Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Fri, 15 Jun 2012 16:25:21 -0700 Subject: Objects Tray - Add hiding based on workspace mode. --- js/ninja.reel/ninja.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index fe20447a..4127e59a 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js @@ -47,7 +47,7 @@ exports.Ninja = Montage.create(Component, { workspaceMode: { get: function() { - return this.workspaceMode; + return this._workspaceMode; }, set: function(val) { if(this._workspaceMode !== val ) { -- cgit v1.2.3 From 96e1bb2a8d842dc37e4982a273a5bde48f6944c3 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Mon, 25 Jun 2012 16:37:06 -0700 Subject: Fix for IKNINJA-1615: Enable mouse up event on top of the user document scrollbar Chrome has a bug where mouse up does not fire when the mouse is released on top of a scrollbar. To work around this issue, I temporary increase the canvas to cover the scrollbar when drawing and then shrink it back on mouse up. Signed-off-by: Valerio Virgillito --- js/ninja.reel/ninja.html | 4 ---- 1 file changed, 4 deletions(-) (limited to 'js/ninja.reel') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index beae59d9..1bd002ae 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -261,10 +261,6 @@ } }, - "mouseMediator": { - "prototype": "js/mediators/mouse-mediator" - }, - "keyboardMediator": { "prototype": "js/mediators/keyboard-mediator", "properties":{ -- cgit v1.2.3