aboutsummaryrefslogtreecommitdiff
path: root/js/tools/InkBottleTool.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /js/tools/InkBottleTool.js
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'js/tools/InkBottleTool.js')
-rwxr-xr-x[-rw-r--r--]js/tools/InkBottleTool.js35
1 files changed, 24 insertions, 11 deletions
diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js
index cc20d94c..2be74ada 100644..100755
--- a/js/tools/InkBottleTool.js
+++ b/js/tools/InkBottleTool.js
@@ -48,20 +48,33 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, {
48 value: function(event) { 48 value: function(event) {
49 this.isDrawing = true; 49 this.isDrawing = true;
50 50
51 if(this._canColor) 51 if(this._canColor && this.application.ninja.selectedElements.length)
52 { 52 {
53// var color = this.application.ninja.colorController.colorToolbar.stroke; 53 var color = this.application.ninja.colorController.colorToolbar.stroke,
54// ElementsMediator.setColor(this.application.ninja.selectedElements, color, false, "Change", "inkBottleTool"); 54 colorInfo;
55 if(color && color.color)
56 {
57 colorInfo = { mode:color.colorMode,
58 color:color.color
59 };
60 }
61 else
62 {
63 colorInfo = { mode:"nocolor",
64 color:color.color
65 };
66 }
67
68 colorInfo.borderInfo = { borderStyle:this.options._borderStyle.value,
69 borderWidth:this.options._borderWidth.value,
70 borderUnits:this.options._borderWidth.units
71 };
55 72
56 var strokeInfo = { borderStyle:this.options._borderStyle.value, 73 colorInfo.strokeInfo = { strokeSize:this.options._strokeSize.value,
57 borderWidth:this.options._borderWidth.value, 74 strokeUnits:this.options._strokeSize.units
58 borderUnits:this.options._borderWidth.units, 75 };
59 strokeSize:this.options._strokeSize.value,
60 strokeUnits:this.options._strokeSize.units,
61 color:this.application.ninja.colorController.colorToolbar.stroke
62 };
63 76
64 ElementsMediator.setStroke(this.application.ninja.selectedElements, strokeInfo, "Change", "inkBottleTool"); 77 ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, false, "Change", "inkBottleTool");
65 } 78 }
66 } 79 }
67 } 80 }