diff options
Diffstat (limited to 'js/tools/BrushTool.js')
-rw-r--r-- | js/tools/BrushTool.js | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js index 8861d226..17a99697 100644 --- a/js/tools/BrushTool.js +++ b/js/tools/BrushTool.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 |
@@ -29,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
29 | </copyright> */ | 30 | </copyright> */ |
30 | 31 | ||
31 | var ShapeTool = require("js/tools/ShapeTool").ShapeTool; | 32 | var ShapeTool = require("js/tools/ShapeTool").ShapeTool; |
32 | var ShapesController = require("js/controllers/elements/shapes-controller").ShapesController; | 33 | var ShapesController = require("js/controllers/elements/shapes-controller").ShapesController; |
33 | var DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase; | 34 | var DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase; |
34 | var defaultEventManager = require("montage/core/event/event-manager").defaultEventManager; | 35 | var defaultEventManager = require("montage/core/event/event-manager").defaultEventManager; |
35 | var Montage = require("montage/core/core").Montage; | 36 | var Montage = require("montage/core/core").Montage; |
@@ -281,7 +282,7 @@ exports.BrushTool = Montage.create(ShapeTool, { | |||
281 | if (this.options.useCalligraphic){ | 282 | if (this.options.useCalligraphic){ |
282 | useCalligraphic = this.options.useCalligraphic; | 283 | useCalligraphic = this.options.useCalligraphic; |
283 | } | 284 | } |
284 | 285 | ||
285 | var ctx = this.application.ninja.stage.drawingContext;//stageManagerModule.stageManager.drawingContext; | 286 | var ctx = this.application.ninja.stage.drawingContext;//stageManagerModule.stageManager.drawingContext; |
286 | if (ctx === null) | 287 | if (ctx === null) |
287 | throw ("null drawing context in Brushtool::ShowCurrentBrushStrokeOnStage"); | 288 | throw ("null drawing context in Brushtool::ShowCurrentBrushStrokeOnStage"); |