From ac2db49e51f82f5a1cf52ec854b047e007ffbdd7 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Mon, 12 Mar 2012 13:39:58 -0700 Subject: Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb Signed-off-by: Armen Kesablyan --- js/ninja.reel/ninja.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'js/ninja.reel/ninja.js') diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 88361fd9..5af9bcdf 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js @@ -12,6 +12,18 @@ var matrix = require("js/lib/math/matrix"); exports.Ninja = Montage.create(Component, { + disabled: { + value: true + }, + + handleCloseDocument: { + value: function(){ + if(!this.application.ninja.documentController.activeDocument) { + this.disabled = true; + } + } + }, + ninjaVersion: { value: null }, @@ -57,6 +69,7 @@ exports.Ninja = Montage.create(Component, { this.eventManager.addEventListener( "selectTool", this, false); this.eventManager.addEventListener( "selectSubTool", this, false); this.eventManager.addEventListener( "onOpenDocument", this, false); + this.eventManager.addEventListener( "closeDocument", this, false); this.addEventListener("change@appModel.livePreview", this.executeLivePreview, false); this.addEventListener("change@appModel.chromePreview", this.executeChromePreview, false); @@ -143,7 +156,7 @@ exports.Ninja = Montage.create(Component, { this.currentDocument = event.detail; this.appModel.show3dGrid = this.currentDocument.draw3DGrid; - + this.disabled = false; NJevent("openDocument"); } }, -- cgit v1.2.3 From c24f58c10231c30d3a8a4c9fb9a4f395dd746180 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Mon, 12 Mar 2012 16:25:47 -0700 Subject: Merge dhg637 DisabledState into master. Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb Signed-off-by: Valerio Virgillito --- js/ninja.reel/ninja.js | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'js/ninja.reel/ninja.js') diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 5af9bcdf..2a6e49f7 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js @@ -12,18 +12,6 @@ var matrix = require("js/lib/math/matrix"); exports.Ninja = Montage.create(Component, { - disabled: { - value: true - }, - - handleCloseDocument: { - value: function(){ - if(!this.application.ninja.documentController.activeDocument) { - this.disabled = true; - } - } - }, - ninjaVersion: { value: null }, @@ -69,7 +57,6 @@ exports.Ninja = Montage.create(Component, { this.eventManager.addEventListener( "selectTool", this, false); this.eventManager.addEventListener( "selectSubTool", this, false); this.eventManager.addEventListener( "onOpenDocument", this, false); - this.eventManager.addEventListener( "closeDocument", this, false); this.addEventListener("change@appModel.livePreview", this.executeLivePreview, false); this.addEventListener("change@appModel.chromePreview", this.executeChromePreview, false); @@ -156,7 +143,6 @@ exports.Ninja = Montage.create(Component, { this.currentDocument = event.detail; this.appModel.show3dGrid = this.currentDocument.draw3DGrid; - this.disabled = false; NJevent("openDocument"); } }, -- cgit v1.2.3