Fix Firefox dragging bug again.

ngrebenshikov · Dec 19, 2014 · 4ea097a · 4ea097a
1 parent 6fc8ee5
commit 4ea097a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/openfl/Lib.hx b/openfl/Lib.hx
@@ -34,7 +34,7 @@ class Lib {
 
 	private static inline var DEFAULT_HEIGHT = 500;
 	private static inline var DEFAULT_WIDTH = 500;
-	private static var HTML_DIV_EVENT_TYPES = [ 'resize', /*'mouseup',*/ 'mouseover', 'mouseout', /*'mousemove', 'mousedown',*/ 'mousewheel'/*, 'dblclick', 'click'*/ ];
+	private static var HTML_DIV_EVENT_TYPES = [ 'dragstart', 'resize', /*'mouseup',*/ 'mouseover', 'mouseout', /*'mousemove', 'mousedown',*/ 'mousewheel'/*, 'dblclick', 'click'*/ ];
 	private static var HTML_TOUCH_EVENT_TYPES = [ 'touchstart', 'touchmove', 'touchend' ];
 	private static var HTML_TOUCH_ALT_EVENT_TYPES = [ 'mousedown', 'mousemove', 'mouseup' ];
 	private static var HTML_WINDOW_EVENT_TYPES = [ 'keyup', 'keypress', 'keydown', 'resize', 'blur', 'focus', 'paste' ];

diff --git a/openfl/display/Stage.hx b/openfl/display/Stage.hx
@@ -331,7 +331,6 @@ class Stage extends DisplayObjectContainer {
 				__onMouse (cast evt, MouseEvent.MOUSE_MOVE);
 
 			case "mousedown":
-
 				__onMouse (cast evt, MouseEvent.MOUSE_DOWN);
 
 			case "mouseup":
@@ -423,14 +422,15 @@ class Stage extends DisplayObjectContainer {
 
 	public function __queueStageEvent (evt:js.html.Event):Void {
         var target: Element = cast evt.target;
-
-        if (evt.type == 'keydown') {
+        if (evt.type == "dragstart") {
+			evt.preventDefault();
+		} else if (evt.type == "keydown") {
             var e: KeyboardEvent = cast evt;
             if (e.keyCode == Keyboard.V && (e.ctrlKey || e.commandKey || e.controlKey || cast(e).metaKey)) {
                 var document: Document = untyped window.document;
                 var curFocus = document.activeElement;
                 var input = document.getElementById('openfl-snapsvg-input');
-                input.innerText = '';
+                input.innerText = "";
                 e.stopImmediatePropagation();
 
                 input.addEventListener('focusin', stopPropagationOfEvent);