diff options
author | Nivesh Rajbhandari | 2012-06-28 17:54:15 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-28 17:54:15 -0700 |
commit | e3eb68c3a0b911acd873ee6211931b8f4e620030 (patch) | |
tree | a0b1fa11fb6bca1c232adff0f52a19d71404984a /js/tools/FillTool.js | |
parent | b4b54f6cc084b3f7483ebed1e15c1b4770949d58 (diff) | |
download | ninja-e3eb68c3a0b911acd873ee6211931b8f4e620030.tar.gz |
Fixed not being able to draw linear and radial gradients. Also fixed IKNINJA-1721 - File dirty marker does not show when modifying elements and IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects. Squashed commit of the following:
commit 7cad082c89911d34a99feeef8e91d22b89cae8f1
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jun 28 17:52:07 2012 -0700
Fix for not being able to draw linear and radial gradient materials.
I'm turning off pre-flight support of gradients for WebGL since it conflicts with the materials' color support.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit d0df8a2bff052d855bafb7885792b1dfff8eab7d
Merge: 2c67d26 b4b54f6
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jun 28 17:50:11 2012 -0700
Merge branch 'refs/heads/ninja-internal' into ToolFixes
commit 2c67d264851f0897fdca8ca887c1c82d0e434217
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jun 28 15:06:13 2012 -0700
IKNINJA-1721 - File dirty marker does not show when modifying elements.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit bb4b6a52eb75efb2f435cdb53f810ae3bc1f1fc3
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jun 28 11:15:34 2012 -0700
IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/tools/FillTool.js')
-rwxr-xr-x | js/tools/FillTool.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js index e08ec1da..72e03379 100755 --- a/js/tools/FillTool.js +++ b/js/tools/FillTool.js | |||
@@ -12,7 +12,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
12 | 12 | ||
13 | var Montage = require("montage/core/core").Montage, | 13 | var Montage = require("montage/core/core").Montage, |
14 | ModifierToolBase = require("js/tools/modifier-tool-base").ModifierToolBase, | 14 | ModifierToolBase = require("js/tools/modifier-tool-base").ModifierToolBase, |
15 | ElementsMediator = require("js/mediators/element-mediator").ElementMediator; | 15 | ElementsMediator = require("js/mediators/element-mediator").ElementMediator, |
16 | ShapesController = require("js/controllers/elements/shapes-controller").ShapesController; | ||
16 | 17 | ||
17 | exports.FillTool = Montage.create(ModifierToolBase, { | 18 | exports.FillTool = Montage.create(ModifierToolBase, { |
18 | _canSnap: { value: false }, | 19 | _canSnap: { value: false }, |
@@ -28,7 +29,7 @@ exports.FillTool = Montage.create(ModifierToolBase, { | |||
28 | if (obj) | 29 | if (obj) |
29 | { | 30 | { |
30 | var name = obj.nodeName; | 31 | var name = obj.nodeName; |
31 | if ((name !== 'CANVAS') && (name !== 'DIV')) | 32 | if ( ((name !== 'CANVAS') && (name !== 'DIV')) || (ShapesController.isElementAShape(obj) && !obj.elementModel.shapeModel.GLGeomObj.canFill)) |
32 | { | 33 | { |
33 | cursor = "url('images/cursors/nofill.png') 14 14, default"; | 34 | cursor = "url('images/cursors/nofill.png') 14 14, default"; |
34 | canColor = false; | 35 | canColor = false; |