aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-27 09:59:01 -0700
committerJose Antonio Marquez2012-06-27 09:59:01 -0700
commitca1e79d4dc36a55c47b6f8cb92069eafc95383b5 (patch)
tree2bf23250a605ca42a33f7bc75698357e0258d624 /js/ninja.reel
parent245e70117f9605dc5603328c97685b2e5a10f220 (diff)
parent2ebf3e3ea24d0d580575dfa13d31588dac1de445 (diff)
downloadninja-ca1e79d4dc36a55c47b6f8cb92069eafc95383b5.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html13
-rwxr-xr-xjs/ninja.reel/ninja.js25
2 files changed, 34 insertions, 4 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index beae59d9..94db0cac 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -261,10 +261,6 @@
261 } 261 }
262 }, 262 },
263 263
264 "mouseMediator": {
265 "prototype": "js/mediators/mouse-mediator"
266 },
267
268 "keyboardMediator": { 264 "keyboardMediator": {
269 "prototype": "js/mediators/keyboard-mediator", 265 "prototype": "js/mediators/keyboard-mediator",
270 "properties":{ 266 "properties":{
@@ -358,6 +354,14 @@
358 } 354 }
359 }, 355 },
360 356
357 "objectsController" : {
358 "prototype": "js/controllers/objects-controller",
359 "bindings": {
360 "currentDocument": {"<-": "@documentList.selectedObjects.0"},
361 "objects": {"<-": "@documentList.selectedObjects.0.model.mObjects"}
362 }
363 },
364
361 "clipboardController": { 365 "clipboardController": {
362 "prototype": "js/controllers/clipboard-controller" 366 "prototype": "js/controllers/clipboard-controller"
363 }, 367 },
@@ -391,6 +395,7 @@
391 "timeline": {"@": "timeline"}, 395 "timeline": {"@": "timeline"},
392 "mainMenuController": {"@": "mainMenuController"}, 396 "mainMenuController": {"@": "mainMenuController"},
393 "codeEditorController": {"@": "codeEditorController"}, 397 "codeEditorController": {"@": "codeEditorController"},
398 "objectsController": {"@": "objectsController"},
394 "rightPanelContainer": {"#": "rightPanelContainer" }, 399 "rightPanelContainer": {"#": "rightPanelContainer" },
395 "panelSplitter": {"@": "splitter3"}, 400 "panelSplitter": {"@": "splitter3"},
396 "timelineSplitter": {"@": "splitter4"}, 401 "timelineSplitter": {"@": "splitter4"},
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 61cd2487..f1825b9a 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -191,9 +191,33 @@ exports.Ninja = Montage.create(Component, {
191 } 191 }
192 }, 192 },
193 193
194 _workspaceMode: {
195 value: null
196 },
197
198 workspaceMode: {
199 get: function() {
200 return this._workspaceMode;
201 },
202 set: function(val) {
203 if(this._workspaceMode !== val ) {
204 if(this._workspaceMode !== null) {
205 document.body.classList.remove("ws-" + this._workspaceMode);
206 }
207 document.body.classList.add("ws-" + val);
208 this._workspaceMode = val;
209 }
210 }
211 },
212
213 _isResizing: {
214 value: null
215 },
216
194 _resizedHeight : { 217 _resizedHeight : {
195 value: 0 218 value: 0
196 }, 219 },
220
197 _height: { 221 _height: {
198 value: null 222 value: null
199 }, 223 },
@@ -307,6 +331,7 @@ exports.Ninja = Montage.create(Component, {
307 331
308 prepareForDraw: { 332 prepareForDraw: {
309 value: function() { 333 value: function() {
334 this.workspaceMode = "default";
310 console.log("Loading Ninja --> ", this.ninjaVersion); 335 console.log("Loading Ninja --> ", this.ninjaVersion);
311 336
312 this.application.ninja = this; 337 this.application.ninja = this;