From c5e66f69b108e359b00c8fd897a4278812484c55 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 20 Apr 2012 12:09:54 -0700 Subject: Fixing translate handles to draw without zoom value. Also fixed some typos in zoom code. Signed-off-by: Nivesh Rajbhandari --- js/tools/ToolBase.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'js/tools') diff --git a/js/tools/ToolBase.js b/js/tools/ToolBase.js index 678d03ac..69ac5727 100755 --- a/js/tools/ToolBase.js +++ b/js/tools/ToolBase.js @@ -109,13 +109,13 @@ exports.toolBase = Montage.create(Component, { value:function(event){ var upperBoundary ,previousZoomValue; - previousZoomValue = this.application.Ninja._documentBarRef.zoomFactor ; + previousZoomValue = this.application.ninja.documentBar.zoomFactor; upperBoundary = previousZoomValue *1.2 ; if(upperBoundary > 2000) - this.application.Ninja._documentBarRef.zoomFactor = 2000; + this.application.ninja.documentBar.zoomFactor = 2000; else - this.application.Ninja._documentBarRef.zoomFactor*= 1.2; + this.application.ninja.documentBar.zoomFactor*= 1.2; } }, @@ -124,13 +124,13 @@ exports.toolBase = Montage.create(Component, { value:function(){ var lowerBoundary ,previousZoomValue; - previousZoomValue = this.application.Ninja._documentBarRef.zoomFactor ; + previousZoomValue = this.application.ninja.documentBar.zoomFactor ; lowerBoundary = previousZoomValue/1.2 ; if(lowerBoundary < 25) - this.application.Ninja._documentBarRef.zoomFactor = 25; + this.application.ninja.documentBar.zoomFactor = 25; else - this.application.Ninja._documentBarRef.zoomFactor/= 1.2; + this.application.ninja.documentBar.zoomFactor/= 1.2; } }, -- cgit v1.2.3 From a0daa3668883c8c35ce277b60509a3a3dcf303b2 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Tue, 24 Apr 2012 11:42:42 -0700 Subject: Allow users to toggle application of stroke and border settings when using the ink bottle tool. Signed-off-by: Nivesh Rajbhandari --- js/tools/InkBottleTool.js | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'js/tools') diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js index 95c2e71d..960c19fa 100755 --- a/js/tools/InkBottleTool.js +++ b/js/tools/InkBottleTool.js @@ -84,14 +84,22 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, { }; } - colorInfo.borderInfo = { borderStyle:this.options._borderStyle.value, - borderWidth:this.options._borderWidth.value, - borderUnits:this.options._borderWidth.units - }; + if(this.options.useBorderWidth.checked || this.options.useBorderStyle.checked) { + colorInfo.borderInfo = {}; + if(this.options.useBorderWidth.checked) { + colorInfo.borderInfo.borderWidth = this.options._borderWidth.value; + colorInfo.borderInfo.borderUnits = this.options._borderWidth.units; + } + if(this.options.useBorderStyle.checked) { + colorInfo.borderInfo.borderStyle = this.options._borderStyle.value; + } + } - colorInfo.strokeInfo = { strokeSize:this.options._strokeSize.value, - strokeUnits:this.options._strokeSize.units - }; + if(this.options.useStrokeSize.checked) { + colorInfo.strokeInfo = {}; + colorInfo.strokeInfo.strokeSize = this.options._strokeSize.value; + colorInfo.strokeInfo.strokeUnits = this.options._strokeSize.units; + } ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, false, "Change", "inkBottleTool"); } -- cgit v1.2.3