diff options
author | Valerio Virgillito | 2012-03-13 18:11:48 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-13 18:11:48 -0700 |
commit | ca985ed7031af3f4e76d26fd5b99846620fc5733 (patch) | |
tree | f6f5001e7e889115ada0c540b2f9db07a8f773db /js | |
parent | 9ece39b6402f244387ec9d0e5a9da5c461089223 (diff) | |
download | ninja-ca985ed7031af3f4e76d26fd5b99846620fc5733.tar.gz |
Some code cleanup - removing unused assignments.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.js | 3 | ||||
-rwxr-xr-x | js/controllers/selection-controller.js | 8 | ||||
-rwxr-xr-x | js/lib/drawing/world.js | 8 |
3 files changed, 6 insertions, 13 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js index ab390fc6..f35972b6 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js | |||
@@ -71,8 +71,7 @@ exports.Breadcrumb = Montage.create(Component, { | |||
71 | // This is always the top container which is now hardcoded to body | 71 | // This is always the top container which is now hardcoded to body |
72 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"}); | 72 | this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"}); |
73 | 73 | ||
74 | // This is for the timeline -- Disable it since the timeline should not know about this object | 74 | |
75 | // NJevent('layerBinding',{selected:false ,element:this.container}) | ||
76 | 75 | ||
77 | } | 76 | } |
78 | }, | 77 | }, |
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index c713b6e5..154fb7f8 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
@@ -90,15 +90,11 @@ exports.SelectionController = Montage.create(Component, { | |||
90 | } | 90 | } |
91 | }, | 91 | }, |
92 | 92 | ||
93 | handleSwitchDocument: { | 93 | handleSwitchDocument: { |
94 | value: function() { | 94 | value: function() { |
95 | if(this.application.ninja.documentController.activeDocument.currentView === "design"){ | 95 | if(this.application.ninja.documentController.activeDocument.currentView === "design"){ |
96 | this._selectedItems = this.application.ninja.selectedElements.slice(0); | 96 | this._selectedItems = this.application.ninja.selectedElements.slice(0); |
97 | if(this._selectedItems.length === 0 ){ | 97 | this._isDocument = this._selectedItems.length === 0; |
98 | this._isDocument = true; | ||
99 | }else{ | ||
100 | this._isDocument = false; | ||
101 | } | ||
102 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); | 98 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); |
103 | } | 99 | } |
104 | } | 100 | } |
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js index df24f556..049145ce 100755 --- a/js/lib/drawing/world.js +++ b/js/lib/drawing/world.js | |||
@@ -351,20 +351,18 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) { | |||
351 | return false; | 351 | return false; |
352 | }; | 352 | }; |
353 | 353 | ||
354 | this.generateUniqueNodeID = function() | 354 | this.generateUniqueNodeID = function() { |
355 | { | ||
356 | var str = "" + this._nodeCounter; | 355 | var str = "" + this._nodeCounter; |
357 | this._nodeCounter++; | 356 | this._nodeCounter++; |
358 | return str; | 357 | return str; |
359 | } | 358 | }; |
360 | 359 | ||
361 | 360 | ||
362 | // start RDGE passing your runtime object, and false to indicate we don't need a an initialization state | 361 | // start RDGE passing your runtime object, and false to indicate we don't need a an initialization state |
363 | // in the case of a procedurally built scene an init state is not needed for loading data | 362 | // in the case of a procedurally built scene an init state is not needed for loading data |
364 | if (this._useWebGL) { | 363 | if (this._useWebGL) { |
365 | rdgeStarted = true; | 364 | rdgeStarted = true; |
366 | var id = this._canvas.getAttribute( "data-RDGE-id" ); | 365 | this._canvas.rdgeid = this._canvas.getAttribute( "data-RDGE-id" ); |
367 | this._canvas.rdgeid = id; | ||
368 | g_Engine.registerCanvas(this._canvas, this); | 366 | g_Engine.registerCanvas(this._canvas, this); |
369 | RDGEStart( this._canvas ); | 367 | RDGEStart( this._canvas ); |
370 | this._canvas.task.stop() | 368 | this._canvas.task.stop() |