diff options
Diffstat (limited to 'js/tools/FillTool.js')
-rwxr-xr-x | js/tools/FillTool.js | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js index d779c655..16a6f464 100755 --- a/js/tools/FillTool.js +++ b/js/tools/FillTool.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -28,25 +29,19 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
28 | POSSIBILITY OF SUCH DAMAGE. | 29 | POSSIBILITY OF SUCH DAMAGE. |
29 | </copyright> */ | 30 | </copyright> */ |
30 | 31 | ||
31 | /* <copyright> | ||
32 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
33 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
34 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
35 | </copyright> */ | ||
36 | |||
37 | var Montage = require("montage/core/core").Montage, | 32 | var Montage = require("montage/core/core").Montage, |
38 | ModifierToolBase = require("js/tools/modifier-tool-base").ModifierToolBase, | 33 | ModifierToolBase = require("js/tools/modifier-tool-base").ModifierToolBase, |
39 | ElementsMediator = require("js/mediators/element-mediator").ElementMediator, | 34 | ElementsMediator = require("js/mediators/element-mediator").ElementMediator, |
40 | ShapesController = require("js/controllers/elements/shapes-controller").ShapesController; | 35 | ShapesController = require("js/controllers/elements/shapes-controller").ShapesController; |
41 | 36 | ||
42 | exports.FillTool = Montage.create(ModifierToolBase, { | 37 | exports.FillTool = Montage.create(ModifierToolBase, { |
43 | _canSnap: { value: false }, | 38 | _canSnap: { value: false }, |
44 | _canColor: { value: true }, | 39 | _canColor: { value: true }, |
45 | _targetedElement: { value: null }, | 40 | _targetedElement: { value: null }, |
46 | 41 | ||
47 | HandleMouseMove: { | 42 | HandleMouseMove: { |
48 | value : function (event) | 43 | value : function (event) |
49 | { | 44 | { |
50 | var obj = this.application.ninja.stage.getElement(event, true); | 45 | var obj = this.application.ninja.stage.getElement(event, true); |
51 | var cursor = "url('images/cursors/fill.png') 14 14, default"; | 46 | var cursor = "url('images/cursors/fill.png') 14 14, default"; |
52 | var canColor = true; | 47 | var canColor = true; |
@@ -78,13 +73,13 @@ exports.FillTool = Montage.create(ModifierToolBase, { | |||
78 | } | 73 | } |
79 | this.application.ninja.stage.drawingCanvas.style.cursor = cursor; | 74 | this.application.ninja.stage.drawingCanvas.style.cursor = cursor; |
80 | this._canColor = canColor; | 75 | this._canColor = canColor; |
81 | } | 76 | } |
82 | }, | 77 | }, |
83 | 78 | ||
84 | HandleLeftButtonUp: { | 79 | HandleLeftButtonUp: { |
85 | value : function () { | 80 | value : function () { |
86 | //if(this._isDrawing) | 81 | //if(this._isDrawing) |
87 | { | 82 | { |
88 | this.application.ninja.stage.clearDrawingCanvas(); | 83 | this.application.ninja.stage.clearDrawingCanvas(); |
89 | this._hasDraw = false; | 84 | this._hasDraw = false; |
90 | this._isDrawing = false; | 85 | this._isDrawing = false; |