diff options
Diffstat (limited to 'js/tools')
-rwxr-xr-x | js/tools/SelectionTool.js | 36 | ||||
-rwxr-xr-x | js/tools/modifier-tool-base.js | 3 |
2 files changed, 15 insertions, 24 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index 48548271..37029e8c 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js | |||
@@ -115,8 +115,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
115 | HandleLeftButtonUp: { | 115 | HandleLeftButtonUp: { |
116 | value: function(event) { | 116 | value: function(event) { |
117 | var selectedItems, | 117 | var selectedItems, |
118 | point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, | 118 | point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY)); |
119 | new WebKitPoint(event.pageX, event.pageY)); | ||
120 | 119 | ||
121 | this.isDrawing = false; | 120 | this.isDrawing = false; |
122 | this.application.ninja.stage.showSelectionBounds = true; | 121 | this.application.ninja.stage.showSelectionBounds = true; |
@@ -184,28 +183,21 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
184 | } | 183 | } |
185 | }, | 184 | }, |
186 | 185 | ||
186 | /** | ||
187 | * Double click handler | ||
188 | * | ||
189 | * Sets the currentSelectionContainer to the current selected element. If no elements are selected set the | ||
190 | * currentSelectionContainer to the userDocument div. | ||
191 | */ | ||
187 | HandleDoubleClick: { | 192 | HandleDoubleClick: { |
188 | value: function(event) { | 193 | value: function(event) { |
189 | /* | 194 | if(this.application.ninja.selectedElements.length > 0) { |
190 | var selectedObject = stageManagerModule.stageManager.GetObjectFromPoint(event.layerX, event.layerY, this._canOperateOnStage); | 195 | this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]._element; |
191 | 196 | } else { | |
192 | if(selectedObject) { | 197 | this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; |
193 | if(selectionManagerModule.selectionManager.findSelectedElement(selectedObject) === -1) { | ||
194 | selectionManagerModule.selectionManager.setSingleSelection(selectedObject); | ||
195 | } | ||
196 | } | ||
197 | */ | ||
198 | |||
199 | // Temporary Code for Breadcrumb | ||
200 | if(this.application.ninja.selectedElements.length > 0) { | ||
201 | this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]._element; | ||
202 | } else { | ||
203 | console.log(this.application.ninja.currentDocument.documentRoot.uuid); | ||
204 | this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; | ||
205 | } | ||
206 | |||
207 | } | 198 | } |
208 | }, | 199 | } |
200 | }, | ||
209 | 201 | ||
210 | HandleKeyPress: { | 202 | HandleKeyPress: { |
211 | value: function(event){ | 203 | value: function(event){ |
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js index 67377ab3..7d946cb0 100755 --- a/js/tools/modifier-tool-base.js +++ b/js/tools/modifier-tool-base.js | |||
@@ -791,8 +791,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, { | |||
791 | HandleLeftButtonDown: { | 791 | HandleLeftButtonDown: { |
792 | value: function(event) { | 792 | value: function(event) { |
793 | 793 | ||
794 | var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, | 794 | var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY)); |
795 | new WebKitPoint(event.pageX, event.pageY)); | ||
796 | this.downPoint.x = point.x; | 795 | this.downPoint.x = point.x; |
797 | this.downPoint.y = point.y; | 796 | this.downPoint.y = point.y; |
798 | 797 | ||