aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
authorEric Guzman2012-08-21 10:27:08 -0700
committerEric Guzman2012-08-21 10:27:08 -0700
commit2f4593e8a797898bb5c478eb8a14dac4660e8751 (patch)
tree741022dbc6a0e24cfc0ba65eb5c02f83092562c3 /js/tools
parentb3567811595f33f8fa8bcf36cd5aaf749120334d (diff)
parentebb22628692375ce3bfce21353aaf5b820723f40 (diff)
downloadninja-2f4593e8a797898bb5c478eb8a14dac4660e8751.tar.gz
Merge branch 'refs/heads/master' into minorFixes_7.1
Diffstat (limited to 'js/tools')
-rw-r--r--js/tools/BrushTool.js1
-rwxr-xr-xjs/tools/LineTool.js1
-rwxr-xr-xjs/tools/PenTool.js1
-rwxr-xr-xjs/tools/ShapeTool.js3
4 files changed, 1 insertions, 5 deletions
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 17a99697..f9706277 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -36,7 +36,6 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve
36var Montage = require("montage/core/core").Montage; 36var Montage = require("montage/core/core").Montage;
37var NJUtils = require("js/lib/NJUtils").NJUtils; 37var NJUtils = require("js/lib/NJUtils").NJUtils;
38var ElementMediator = require("js/mediators/element-mediator").ElementMediator; 38var ElementMediator = require("js/mediators/element-mediator").ElementMediator;
39var TagTool = require("js/tools/TagTool").TagTool;
40var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager; 39var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;
41var ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils; 40var ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
42var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke; 41var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke;
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 4ec327b5..26222bc7 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -33,7 +33,6 @@ var Montage = require("montage/core/core").Montage,
33 ShapeTool = require("js/tools/ShapeTool").ShapeTool, 33 ShapeTool = require("js/tools/ShapeTool").ShapeTool,
34 DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase, 34 DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase,
35 NJUtils = require("js/lib/NJUtils").NJUtils, 35 NJUtils = require("js/lib/NJUtils").NJUtils,
36 TagTool = require("js/tools/TagTool").TagTool,
37 ShapesController = require("js/controllers/elements/shapes-controller").ShapesController, 36 ShapesController = require("js/controllers/elements/shapes-controller").ShapesController,
38 ShapeModel = require("js/models/shape-model").ShapeModel; 37 ShapeModel = require("js/models/shape-model").ShapeModel;
39 38
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index a44438ac..1ebc7e83 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -36,7 +36,6 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve
36var Montage = require("montage/core/core").Montage; 36var Montage = require("montage/core/core").Montage;
37var NJUtils = require("js/lib/NJUtils").NJUtils; 37var NJUtils = require("js/lib/NJUtils").NJUtils;
38var ElementMediator = require("js/mediators/element-mediator").ElementMediator; 38var ElementMediator = require("js/mediators/element-mediator").ElementMediator;
39var TagTool = require("js/tools/TagTool").TagTool;
40var ElementController = require("js/controllers/elements/element-controller").ElementController; 39var ElementController = require("js/controllers/elements/element-controller").ElementController;
41var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager; 40var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;
42var ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils; 41var ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index e1ca31e6..a4fd98e6 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -33,8 +33,7 @@ var Montage = require("montage/core/core").Montage,
33 DrawingTool = require("js/tools/drawing-tool").DrawingTool, 33 DrawingTool = require("js/tools/drawing-tool").DrawingTool,
34 NJUtils = require("js/lib/NJUtils").NJUtils, 34 NJUtils = require("js/lib/NJUtils").NJUtils,
35 ShapesController = require("js/controllers/elements/shapes-controller").ShapesController, 35 ShapesController = require("js/controllers/elements/shapes-controller").ShapesController,
36 ShapeModel = require("js/models/shape-model").ShapeModel, 36 ShapeModel = require("js/models/shape-model").ShapeModel;
37 TagTool = require("js/tools/TagTool").TagTool;
38 37
39var World = require("js/lib/drawing/world").World; 38var World = require("js/lib/drawing/world").World;
40 39