From f2728b04b9444770375a31d8a2f6d0d2cd926cd2 Mon Sep 17 00:00:00 2001 From: mikedeboer Date: Fri, 23 Sep 2011 16:34:17 +0200 Subject: [PATCH 1/5] updated pilot --- support/pilot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/pilot b/support/pilot index f16b1438..5f347106 160000 --- a/support/pilot +++ b/support/pilot @@ -1 +1 @@ -Subproject commit f16b1438c95900416e443f6bf585562c1c94ca43 +Subproject commit 5f347106caf67f7be016233d11b807279947056b From a4c2304476671ba225b3c62589a5f604d14f5988 Mon Sep 17 00:00:00 2001 From: mikedeboer Date: Fri, 23 Sep 2011 16:39:53 +0200 Subject: [PATCH 2/5] refactored the mouse_handler to support custom event hooks for all mouse events --- lib/ace/editor.js | 2 +- .../default_handlers.js} | 190 ++++++++---------- lib/ace/mouse/dragdrop.js | 0 lib/ace/mouse/mouse_handler.js | 146 ++++++++++++++ lib/ace/worker/worker_client.js | 5 +- 5 files changed, 234 insertions(+), 109 deletions(-) rename lib/ace/{mouse_handler.js => mouse/default_handlers.js} (65%) create mode 100644 lib/ace/mouse/dragdrop.js create mode 100644 lib/ace/mouse/mouse_handler.js diff --git a/lib/ace/editor.js b/lib/ace/editor.js index 4fae0cdd..8b9ee8b9 100644 --- a/lib/ace/editor.js +++ b/lib/ace/editor.js @@ -47,7 +47,7 @@ var event = require("pilot/event"); var lang = require("pilot/lang"); var useragent = require("pilot/useragent"); var TextInput = require("ace/keyboard/textinput").TextInput; -var MouseHandler = require("ace/mouse_handler").MouseHandler; +var MouseHandler = require("ace/mouse/mouse_handler").MouseHandler; //var TouchHandler = require("ace/touch_handler").TouchHandler; var KeyBinding = require("ace/keyboard/keybinding").KeyBinding; var EditSession = require("ace/edit_session").EditSession; diff --git a/lib/ace/mouse_handler.js b/lib/ace/mouse/default_handlers.js similarity index 65% rename from lib/ace/mouse_handler.js rename to lib/ace/mouse/default_handlers.js index aa706493..b065f20a 100644 --- a/lib/ace/mouse_handler.js +++ b/lib/ace/mouse/default_handlers.js @@ -21,7 +21,7 @@ * * Contributor(s): * Fabian Jakobs - * Mihai Sucan + * Mike de Boer * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -41,7 +41,7 @@ define(function(require, exports, module) { var event = require("pilot/event"); var dom = require("pilot/dom"); -var BrowserFocus = require("pilot/browser_focus").BrowserFocus; +var EventEmitter = require("pilot/event_emitter").EventEmitter; var STATE_UNKNOWN = 0; var STATE_SELECT = 1; @@ -50,75 +50,33 @@ var STATE_DRAG = 2; var DRAG_TIMER = 250; // milliseconds var DRAG_OFFSET = 5; // pixels -var MouseHandler = function(editor) { - this.editor = editor; - - this.browserFocus = new BrowserFocus(); - event.addListener(editor.container, "mousedown", function(e) { - editor.focus(); - return event.preventDefault(e); - }); - event.addListener(editor.container, "selectstart", function(e) { - return event.preventDefault(e); - }); +function calcDistance(ax, ay, bx, by) { + return Math.sqrt(Math.pow(bx - ax, 2) + Math.pow(by - ay, 2)); +} - var mouseTarget = editor.renderer.getMouseEventTarget(); - event.addListener(mouseTarget, "mousedown", this.onMouseDown.bind(this)); - event.addMultiMouseDownListener(mouseTarget, 0, 2, 500, this.onMouseDoubleClick.bind(this)); - event.addMultiMouseDownListener(mouseTarget, 0, 3, 600, this.onMouseTripleClick.bind(this)); - event.addMultiMouseDownListener(mouseTarget, 0, 4, 600, this.onMouseQuadClick.bind(this)); - event.addMouseWheelListener(editor.container, this.onMouseWheel.bind(this)); -}; - -(function() { - - this.$scrollSpeed = 1; - this.setScrollSpeed = function(speed) { - this.$scrollSpeed = speed; - }; - - this.getScrollSpeed = function() { - return this.$scrollSpeed; - }; - - this.$getEventPosition = function(e) { - var pageX = event.getDocumentX(e); - var pageY = event.getDocumentY(e); - var pos = this.editor.renderer.screenToTextCoordinates(pageX, pageY); - pos.row = Math.max(0, Math.min(pos.row, this.editor.session.getLength()-1)); - return pos; - }; - - this.$distance = function(ax, ay, bx, by) { - return Math.sqrt(Math.pow(bx - ax, 2) + Math.pow(by - ay, 2)); - }; - - this.onMouseDown = function(e) { - var pageX = event.getDocumentX(e); - var pageY = event.getDocumentY(e); +var handlers = exports.DefaultHandlers = { + onMouseDown: function(ev) { + var e = ev.DOMEvent; + var editor = ev.editor; + var inSelection = ev.inSelection; + var pageX = ev.pageX; + var pageY = ev.pageY + var pos = ev.pos; - var pos = this.$getEventPosition(e); - - var editor = this.editor; - var self = this; var selectionRange = editor.getSelectionRange(); var selectionEmpty = selectionRange.isEmpty(); - var inSelection = !editor.getReadOnly() - && !selectionEmpty - && selectionRange.contains(pos.row, pos.column); - var state = STATE_UNKNOWN; // if this click caused the editor to be focused should not clear the // selection if ( inSelection && ( - !this.browserFocus.isFocused() - || new Date().getTime() - this.browserFocus.lastFocus < 20 - || !this.editor.isFocused() + !editor.$mouseHandler.browserFocus.isFocused() + || new Date().getTime() - editor.$mouseHandler.browserFocus.lastFocus < 20 + || !editor.isFocused() ) ) { - this.editor.focus(); + editor.focus(); return; } @@ -132,7 +90,8 @@ var MouseHandler = function(editor) { event.capture(editor.container, function(){}, editor.textInput.onContextMenuClose); } return; - } else { + } + else { // Select the fold as the user clicks it. var fold = editor.session.getFoldAt(pos.row, pos.column, 1); if (fold) { @@ -164,7 +123,7 @@ var MouseHandler = function(editor) { else if (state == STATE_DRAG) onMouseDragSelectionEnd(); - self.$clickSelection = null; + editor.$mouseHandler.$clickSelection = null; state = STATE_UNKNOWN; }; @@ -172,7 +131,7 @@ var MouseHandler = function(editor) { dom.removeCssClass(editor.container, "ace_dragging"); editor.session.removeMarker(dragSelectionMarker); - if (!self.$clickSelection) { + if (!editor.$mouseHandler.$clickSelection) { if (!dragCursor) { editor.moveCursorToPosition(pos); editor.selection.clearSelection(pos.row, pos.column); @@ -202,16 +161,16 @@ var MouseHandler = function(editor) { return; if (state == STATE_UNKNOWN) { - var distance = self.$distance(pageX, pageY, mousePageX, mousePageY); + var distance = calcDistance(pageX, pageY, mousePageX, mousePageY); var time = (new Date()).getTime(); - if (distance > DRAG_OFFSET) { state = STATE_SELECT; var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY); cursor.row = Math.max(0, Math.min(cursor.row, editor.session.getLength()-1)); onStartSelect(cursor); - } else if ((time - mousedownTime) > DRAG_TIMER) { + } + else if ((time - mousedownTime) > DRAG_TIMER) { state = STATE_DRAG; dragRange = editor.getSelectionRange(); var style = editor.getSelectionStyle(); @@ -229,10 +188,11 @@ var MouseHandler = function(editor) { }; function onStartSelect(pos) { - if (e.shiftKey) - editor.selection.selectToPosition(pos) + if (e.shiftKey) { + editor.selection.selectToPosition(pos); + } else { - if (!self.$clickSelection) { + if (!editor.$mouseHandler.$clickSelection) { editor.moveCursorToPosition(pos); editor.selection.clearSelection(pos.row, pos.column); } @@ -241,17 +201,20 @@ var MouseHandler = function(editor) { } var onUpdateSelectionInterval = function() { + var anchor; var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY); cursor.row = Math.max(0, Math.min(cursor.row, editor.session.getLength()-1)); - if (self.$clickSelection) { - if (self.$clickSelection.contains(cursor.row, cursor.column)) { - editor.selection.setSelectionRange(self.$clickSelection); - } else { - if (self.$clickSelection.compare(cursor.row, cursor.column) == -1) { - var anchor = self.$clickSelection.end; - } else { - var anchor = self.$clickSelection.start; + if (editor.$mouseHandler.$clickSelection) { + if (editor.$mouseHandler.$clickSelection.contains(cursor.row, cursor.column)) { + editor.selection.setSelectionRange(editor.$mouseHandler.$clickSelection); + } + else { + if (editor.$mouseHandler.$clickSelection.compare(cursor.row, cursor.column) == -1) { + anchor = editor.$mouseHandler.$clickSelection.end; + } + else { + anchor = editor.$mouseHandler.$clickSelection.start; } editor.selection.setSelectionAnchor(anchor.row, anchor.column); editor.selection.selectToPosition(cursor); @@ -275,45 +238,58 @@ var MouseHandler = function(editor) { var timerId = setInterval(onSelectionInterval, 20); return event.preventDefault(e); - }; - - this.onMouseDoubleClick = function(e) { - var editor = this.editor; - var pos = this.$getEventPosition(e); - + }, + + onDoubleClick: function(ev) { + var e = ev.DOMEvent; + var editor = ev.editor; + var pos = ev.pos; + // If the user dclicked on a fold, then expand it. var fold = editor.session.getFoldAt(pos.row, pos.column, 1); if (fold) { editor.session.expandFold(fold); - } else { + } + else { editor.moveCursorToPosition(pos); editor.selection.selectWord(); - this.$clickSelection = editor.getSelectionRange(); + editor.$mouseHandler.$clickSelection = editor.getSelectionRange(); } - }; - - this.onMouseTripleClick = function(e) { - var pos = this.$getEventPosition(e); - this.editor.moveCursorToPosition(pos); - this.editor.selection.selectLine(); - this.$clickSelection = this.editor.getSelectionRange(); - }; - - this.onMouseQuadClick = function(e) { - this.editor.selectAll(); - this.$clickSelection = this.editor.getSelectionRange(); - }; - - this.onMouseWheel = function(e) { - var speed = this.$scrollSpeed * 2; - - this.editor.renderer.scrollBy(e.wheelX * speed, e.wheelY * speed); - if (this.editor.renderer.isScrollableBy(e.wheelX, e.wheelY)) + }, + + onTripleClick: function(ev) { + var e = ev.DOMEvent; + var editor = ev.editor; + var pos = ev.pos; + + editor.moveCursorToPosition(pos); + editor.selection.selectLine(); + editor.$mouseHandler.$clickSelection = editor.getSelectionRange(); + }, + + onQuadClick: function(ev) { + var e = ev.DOMEvent; + var editor = ev.editor; + + editor.selectAll(); + editor.$mouseHandler.$clickSelection = editor.getSelectionRange(); + }, + + onScroll: function(ev) { + var e = ev.DOMEvent; + var editor = ev.editor; + var speed = ev.speed; + + editor.renderer.scrollBy(e.wheelX * speed, e.wheelY * speed); + if (editor.renderer.isScrollableBy(e.wheelX, e.wheelY)) return event.preventDefault(e); - }; + } +}; +EventEmitter.setDefaultHandler("mousedown", handlers.onMouseDown); +EventEmitter.setDefaultHandler("dblclick", handlers.onDoubleClick); +EventEmitter.setDefaultHandler("tripleclick", handlers.onTripleClick); +EventEmitter.setDefaultHandler("quadclick", handlers.onQuadClick); +EventEmitter.setDefaultHandler("scroll", handlers.onScroll); -}).call(MouseHandler.prototype); - -exports.MouseHandler = MouseHandler; }); diff --git a/lib/ace/mouse/dragdrop.js b/lib/ace/mouse/dragdrop.js new file mode 100644 index 00000000..e69de29b diff --git a/lib/ace/mouse/mouse_handler.js b/lib/ace/mouse/mouse_handler.js new file mode 100644 index 00000000..b56d30ec --- /dev/null +++ b/lib/ace/mouse/mouse_handler.js @@ -0,0 +1,146 @@ +/* vim:ts=4:sts=4:sw=4: + * ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Ajax.org Code Editor (ACE). + * + * The Initial Developer of the Original Code is + * Ajax.org B.V. + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Fabian Jakobs + * Mihai Sucan + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +define(function(require, exports, module) { + +var event = require("pilot/event"); +var BrowserFocus = require("pilot/browser_focus").BrowserFocus; +var DefaultHandlers = require("ace/mouse/default_handlers").DefaultHandlers; + +var MouseHandler = function(editor) { + this.editor = editor; + + this.browserFocus = new BrowserFocus(); + event.addListener(editor.container, "mousedown", function(e) { + editor.focus(); + return event.preventDefault(e); + }); + event.addListener(editor.container, "selectstart", function(e) { + return event.preventDefault(e); + }); + + var mouseTarget = editor.renderer.getMouseEventTarget(); + event.addListener(mouseTarget, "mousedown", this.onMouseDown.bind(this)); + event.addMultiMouseDownListener(mouseTarget, 0, 2, 500, this.onMouseDoubleClick.bind(this)); + event.addMultiMouseDownListener(mouseTarget, 0, 3, 600, this.onMouseTripleClick.bind(this)); + event.addMultiMouseDownListener(mouseTarget, 0, 4, 600, this.onMouseQuadClick.bind(this)); + event.addMouseWheelListener(editor.container, this.onMouseWheel.bind(this)); +}; + +(function() { + + this.$scrollSpeed = 1; + this.setScrollSpeed = function(speed) { + this.$scrollSpeed = speed; + }; + + this.getScrollSpeed = function() { + return this.$scrollSpeed; + }; + + this.$getEventPosition = function(e) { + var pageX = event.getDocumentX(e); + var pageY = event.getDocumentY(e); + var pos = this.editor.renderer.screenToTextCoordinates(pageX, pageY); + pos.row = Math.max(0, Math.min(pos.row, this.editor.session.getLength()-1)); + return pos; + }; + + this.onMouseDown = function(e) { + var pageX = event.getDocumentX(e); + var pageY = event.getDocumentY(e); + + var pos = this.$getEventPosition(e); + + var editor = this.editor; + var self = this; + var selectionRange = editor.getSelectionRange(); + var selectionEmpty = selectionRange.isEmpty(); + var inSelection = !editor.getReadOnly() + && !selectionEmpty + && selectionRange.contains(pos.row, pos.column); + + this.editor._dispatchEvent("mousedown", { + DOMEvent: e, + editor: editor, + pageX: pageX, + pageY: pageY, + pos: pos, + inSelection: inSelection + }); + }; + + this.onMouseDoubleClick = function(e) { + this.editor._dispatchEvent("dblclick", { + DOMEvent: e, + editor: this.editor, + pos: this.$getEventPosition(e) + }); + }; + + this.onMouseTripleClick = function(e) { + this.editor._dispatchEvent("tripleclick", { + DOMEvent: e, + editor: this.editor, + pos: this.$getEventPosition(e) + }); + }; + + this.onMouseQuadClick = function(e) { + this.editor._dispatchEvent("quadclick", { + DOMEvent: e, + editor: this.editor, + pos: this.$getEventPosition(e) + }); + }; + + this.onMouseWheel = function(e) { + var speed = this.$scrollSpeed * 2; + + this.editor._dispatchEvent("scroll", { + DOMEvent: e, + editor: this.editor, + speed: speed + }); + }; + +}).call(MouseHandler.prototype); + +exports.MouseHandler = MouseHandler; +}); diff --git a/lib/ace/worker/worker_client.js b/lib/ace/worker/worker_client.js index 1fba2f7e..25391e44 100644 --- a/lib/ace/worker/worker_client.js +++ b/lib/ace/worker/worker_client.js @@ -154,7 +154,10 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) { }; this.emit = function(event, data) { - this.$worker.postMessage({event: event, data: data}); + try { + this.$worker.postMessage({event: event, data: data}); + } + catch(ex) {} }; }).call(WorkerClient.prototype); From ed9fc8b6b4e7502d6098b4494da965eeafb14a02 Mon Sep 17 00:00:00 2001 From: mikedeboer Date: Fri, 23 Sep 2011 18:22:20 +0200 Subject: [PATCH 3/5] changed default_handlers into a class --- lib/ace/mouse/default_handlers.js | 52 ++++++++++++++++++------------- lib/ace/mouse/mouse_handler.js | 19 ++++++++--- 2 files changed, 44 insertions(+), 27 deletions(-) diff --git a/lib/ace/mouse/default_handlers.js b/lib/ace/mouse/default_handlers.js index b065f20a..2b0d4d4e 100644 --- a/lib/ace/mouse/default_handlers.js +++ b/lib/ace/mouse/default_handlers.js @@ -54,14 +54,25 @@ function calcDistance(ax, ay, bx, by) { return Math.sqrt(Math.pow(bx - ax, 2) + Math.pow(by - ay, 2)); } -var handlers = exports.DefaultHandlers = { - onMouseDown: function(ev) { +function DefaultHandlers(editor) { + this.editor = editor; + + editor.setDefaultHandler("mousedown", this.onMouseDown.bind(this)); + editor.setDefaultHandler("dblclick", this.onDoubleClick.bind(this)); + editor.setDefaultHandler("tripleclick", this.onTripleClick.bind(this)); + editor.setDefaultHandler("quadclick", this.onQuadClick.bind(this)); + editor.setDefaultHandler("scroll", this.onScroll.bind(this)); +} + +(function() { + + this.onMouseDown = function(ev) { var e = ev.DOMEvent; - var editor = ev.editor; var inSelection = ev.inSelection; var pageX = ev.pageX; var pageY = ev.pageY var pos = ev.pos; + var editor = this.editor; var selectionRange = editor.getSelectionRange(); var selectionEmpty = selectionRange.isEmpty(); @@ -238,12 +249,12 @@ var handlers = exports.DefaultHandlers = { var timerId = setInterval(onSelectionInterval, 20); return event.preventDefault(e); - }, + }; - onDoubleClick: function(ev) { + this.onDoubleClick = function(ev) { var e = ev.DOMEvent; - var editor = ev.editor; var pos = ev.pos; + var editor = this.editor; // If the user dclicked on a fold, then expand it. var fold = editor.session.getFoldAt(pos.row, pos.column, 1); @@ -255,41 +266,38 @@ var handlers = exports.DefaultHandlers = { editor.selection.selectWord(); editor.$mouseHandler.$clickSelection = editor.getSelectionRange(); } - }, + }; - onTripleClick: function(ev) { + this.onTripleClick = function(ev) { var e = ev.DOMEvent; - var editor = ev.editor; var pos = ev.pos; + var editor = this.editor; editor.moveCursorToPosition(pos); editor.selection.selectLine(); editor.$mouseHandler.$clickSelection = editor.getSelectionRange(); - }, + }; - onQuadClick: function(ev) { + this.onQuadClick = function(ev) { var e = ev.DOMEvent; - var editor = ev.editor; + var editor = this.editor; editor.selectAll(); editor.$mouseHandler.$clickSelection = editor.getSelectionRange(); - }, + }; - onScroll: function(ev) { + this.onScroll = function(ev) { var e = ev.DOMEvent; - var editor = ev.editor; var speed = ev.speed; + var editor = this.editor; editor.renderer.scrollBy(e.wheelX * speed, e.wheelY * speed); if (editor.renderer.isScrollableBy(e.wheelX, e.wheelY)) return event.preventDefault(e); - } -}; + }; + +}).call(DefaultHandlers.prototype); -EventEmitter.setDefaultHandler("mousedown", handlers.onMouseDown); -EventEmitter.setDefaultHandler("dblclick", handlers.onDoubleClick); -EventEmitter.setDefaultHandler("tripleclick", handlers.onTripleClick); -EventEmitter.setDefaultHandler("quadclick", handlers.onQuadClick); -EventEmitter.setDefaultHandler("scroll", handlers.onScroll); +exports.DefaultHandlers = DefaultHandlers; }); diff --git a/lib/ace/mouse/mouse_handler.js b/lib/ace/mouse/mouse_handler.js index b56d30ec..63760028 100644 --- a/lib/ace/mouse/mouse_handler.js +++ b/lib/ace/mouse/mouse_handler.js @@ -47,6 +47,7 @@ var MouseHandler = function(editor) { this.editor = editor; this.browserFocus = new BrowserFocus(); + this.defaultHandlers = new DefaultHandlers(editor); event.addListener(editor.container, "mousedown", function(e) { editor.focus(); return event.preventDefault(e); @@ -57,6 +58,7 @@ var MouseHandler = function(editor) { var mouseTarget = editor.renderer.getMouseEventTarget(); event.addListener(mouseTarget, "mousedown", this.onMouseDown.bind(this)); + event.addListener(mouseTarget, "mousemove", this.onMouseMove.bind(this)); event.addMultiMouseDownListener(mouseTarget, 0, 2, 500, this.onMouseDoubleClick.bind(this)); event.addMultiMouseDownListener(mouseTarget, 0, 3, 600, this.onMouseTripleClick.bind(this)); event.addMultiMouseDownListener(mouseTarget, 0, 4, 600, this.onMouseQuadClick.bind(this)); @@ -98,18 +100,28 @@ var MouseHandler = function(editor) { this.editor._dispatchEvent("mousedown", { DOMEvent: e, - editor: editor, pageX: pageX, pageY: pageY, pos: pos, inSelection: inSelection }); }; + + this.onMouseMove = function(e) { + // optimization, because mousemove doesn't have a default handler. + var listeners = this.editor._eventRegistry["mousemove"]; + if (!listeners || !listeners.length) + return; + + this.editor._dispatchEvent("mousemove", { + DOMEvent: e, + pos: this.$getEventPosition(e) + }); + }; this.onMouseDoubleClick = function(e) { this.editor._dispatchEvent("dblclick", { DOMEvent: e, - editor: this.editor, pos: this.$getEventPosition(e) }); }; @@ -117,7 +129,6 @@ var MouseHandler = function(editor) { this.onMouseTripleClick = function(e) { this.editor._dispatchEvent("tripleclick", { DOMEvent: e, - editor: this.editor, pos: this.$getEventPosition(e) }); }; @@ -125,7 +136,6 @@ var MouseHandler = function(editor) { this.onMouseQuadClick = function(e) { this.editor._dispatchEvent("quadclick", { DOMEvent: e, - editor: this.editor, pos: this.$getEventPosition(e) }); }; @@ -135,7 +145,6 @@ var MouseHandler = function(editor) { this.editor._dispatchEvent("scroll", { DOMEvent: e, - editor: this.editor, speed: speed }); }; From d0ced941ef7c62731d3ed166e2046d0dcfcf3e25 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Sat, 24 Sep 2011 11:55:19 +0000 Subject: [PATCH 4/5] extract mouse event class --- lib/ace/mouse/default_handlers.js | 62 +++++++------- lib/ace/mouse/mouse_event.js | 133 ++++++++++++++++++++++++++++++ lib/ace/mouse/mouse_handler.js | 62 +++----------- 3 files changed, 173 insertions(+), 84 deletions(-) create mode 100644 lib/ace/mouse/mouse_event.js diff --git a/lib/ace/mouse/default_handlers.js b/lib/ace/mouse/default_handlers.js index 2b0d4d4e..138e2b7a 100644 --- a/lib/ace/mouse/default_handlers.js +++ b/lib/ace/mouse/default_handlers.js @@ -42,6 +42,7 @@ define(function(require, exports, module) { var event = require("pilot/event"); var dom = require("pilot/dom"); var EventEmitter = require("pilot/event_emitter").EventEmitter; +var BrowserFocus = require("pilot/browser_focus").BrowserFocus; var STATE_UNKNOWN = 0; var STATE_SELECT = 1; @@ -50,12 +51,10 @@ var STATE_DRAG = 2; var DRAG_TIMER = 250; // milliseconds var DRAG_OFFSET = 5; // pixels -function calcDistance(ax, ay, bx, by) { - return Math.sqrt(Math.pow(bx - ax, 2) + Math.pow(by - ay, 2)); -} - function DefaultHandlers(editor) { this.editor = editor; + this.$clickSelection = null; + this.browserFocus = new BrowserFocus(); editor.setDefaultHandler("mousedown", this.onMouseDown.bind(this)); editor.setDefaultHandler("dblclick", this.onDoubleClick.bind(this)); @@ -67,12 +66,12 @@ function DefaultHandlers(editor) { (function() { this.onMouseDown = function(ev) { - var e = ev.DOMEvent; - var inSelection = ev.inSelection; + var inSelection = ev.inSelection(); var pageX = ev.pageX; - var pageY = ev.pageY - var pos = ev.pos; + var pageY = ev.pageY; + var pos = ev.getDocumentPosition(); var editor = this.editor; + var _self = this; var selectionRange = editor.getSelectionRange(); var selectionEmpty = selectionRange.isEmpty(); @@ -82,8 +81,8 @@ function DefaultHandlers(editor) { // selection if ( inSelection && ( - !editor.$mouseHandler.browserFocus.isFocused() - || new Date().getTime() - editor.$mouseHandler.browserFocus.lastFocus < 20 + !this.browserFocus.isFocused() + || new Date().getTime() - this.browserFocus.lastFocus < 20 || !editor.isFocused() ) ) { @@ -91,7 +90,7 @@ function DefaultHandlers(editor) { return; } - var button = event.getButton(e); + var button = ev.getButton(); if (button !== 0) { if (selectionEmpty) { editor.moveCursorToPosition(pos); @@ -134,7 +133,7 @@ function DefaultHandlers(editor) { else if (state == STATE_DRAG) onMouseDragSelectionEnd(); - editor.$mouseHandler.$clickSelection = null; + _self.$clickSelection = null; state = STATE_UNKNOWN; }; @@ -199,11 +198,11 @@ function DefaultHandlers(editor) { }; function onStartSelect(pos) { - if (e.shiftKey) { + if (ev.getShiftKey()) { editor.selection.selectToPosition(pos); } else { - if (!editor.$mouseHandler.$clickSelection) { + if (!_self.$clickSelection) { editor.moveCursorToPosition(pos); editor.selection.clearSelection(pos.row, pos.column); } @@ -216,16 +215,16 @@ function DefaultHandlers(editor) { var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY); cursor.row = Math.max(0, Math.min(cursor.row, editor.session.getLength()-1)); - if (editor.$mouseHandler.$clickSelection) { - if (editor.$mouseHandler.$clickSelection.contains(cursor.row, cursor.column)) { - editor.selection.setSelectionRange(editor.$mouseHandler.$clickSelection); + if (_self.$clickSelection) { + if (_self.$clickSelection.contains(cursor.row, cursor.column)) { + editor.selection.setSelectionRange(_self.$clickSelection); } else { - if (editor.$mouseHandler.$clickSelection.compare(cursor.row, cursor.column) == -1) { - anchor = editor.$mouseHandler.$clickSelection.end; + if (_self.$clickSelection.compare(cursor.row, cursor.column) == -1) { + anchor = _self.$clickSelection.end; } else { - anchor = editor.$mouseHandler.$clickSelection.start; + anchor = _self.$clickSelection.start; } editor.selection.setSelectionAnchor(anchor.row, anchor.column); editor.selection.selectToPosition(cursor); @@ -248,12 +247,11 @@ function DefaultHandlers(editor) { event.capture(editor.container, onMouseSelection, onMouseSelectionEnd); var timerId = setInterval(onSelectionInterval, 20); - return event.preventDefault(e); + return ev.preventDefault(); }; this.onDoubleClick = function(ev) { - var e = ev.DOMEvent; - var pos = ev.pos; + var pos = ev.getDocumentPosition(); var editor = this.editor; // If the user dclicked on a fold, then expand it. @@ -264,34 +262,30 @@ function DefaultHandlers(editor) { else { editor.moveCursorToPosition(pos); editor.selection.selectWord(); - editor.$mouseHandler.$clickSelection = editor.getSelectionRange(); + this.$clickSelection = editor.getSelectionRange(); } }; this.onTripleClick = function(ev) { - var e = ev.DOMEvent; - var pos = ev.pos; + var pos = ev.getDocumentPosition(); var editor = this.editor; editor.moveCursorToPosition(pos); editor.selection.selectLine(); - editor.$mouseHandler.$clickSelection = editor.getSelectionRange(); + this.$clickSelection = editor.getSelectionRange(); }; this.onQuadClick = function(ev) { - var e = ev.DOMEvent; var editor = this.editor; editor.selectAll(); - editor.$mouseHandler.$clickSelection = editor.getSelectionRange(); + this.$clickSelection = editor.getSelectionRange(); }; this.onScroll = function(ev) { - var e = ev.DOMEvent; - var speed = ev.speed; var editor = this.editor; - editor.renderer.scrollBy(e.wheelX * speed, e.wheelY * speed); + editor.renderer.scrollBy(e.wheelX * ev.speed, e.wheelY * speed); if (editor.renderer.isScrollableBy(e.wheelX, e.wheelY)) return event.preventDefault(e); }; @@ -300,4 +294,8 @@ function DefaultHandlers(editor) { exports.DefaultHandlers = DefaultHandlers; +function calcDistance(ax, ay, bx, by) { + return Math.sqrt(Math.pow(bx - ax, 2) + Math.pow(by - ay, 2)); +} + }); diff --git a/lib/ace/mouse/mouse_event.js b/lib/ace/mouse/mouse_event.js new file mode 100644 index 00000000..474686b7 --- /dev/null +++ b/lib/ace/mouse/mouse_event.js @@ -0,0 +1,133 @@ +/* vim:ts=4:sts=4:sw=4: + * ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Ajax.org Code Editor (ACE). + * + * The Initial Developer of the Original Code is + * Ajax.org B.V. + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Fabian Jakobs + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +define(function(require, exports, module) { + +var event = require("pilot/event"); +var dom = require("pilot/dom"); + +/** + * Custom Ace mouse event + */ +var MouseEvent = exports.MouseEvent = function(domEvent, editor) { + this.domEvent = domEvent; + this.editor = editor; + + this.pageX = event.getDocumentX(domEvent); + this.pageY = event.getDocumentY(domEvent); + + this.$pos = null; + this.$inSelection = null; + + this.propagationStopped = false; + this.defaultPrevented = false; +}; + +(function() { + + this.stopPropagation = function() { + event.stopPropagation(this.domEvent); + this.propagationStopped = true; + }; + + this.preventDefault = function() { + event.preventDefault(this.domEvent); + this.defaultPrevented = true; + }; + + /** + * Get the document position below the mouse cursor + * + * @return {Object} 'row' and 'column' of the document position + */ + this.getDocumentPosition = function() { + if (this.$pos) + return this.$pos; + + var pageX = event.getDocumentX(this.domEvent); + var pageY = event.getDocumentY(this.domEvent); + this.$pos = this.editor.renderer.screenToTextCoordinates(pageX, pageY); + this.$pos.row = Math.max(0, Math.min(this.$pos.row, this.editor.session.getLength()-1)); + return this.$pos; + }; + + /** + * Check if the mouse cursor is inside of the text selection + * + * @return {Boolean} whether the mouse cursor is inside of the selection + */ + this.inSelection = function() { + if (this.$inSelection !== null) + return this.$inSelection; + + var editor = this.editor; + + if (editor.getReadOnly()) { + this.$inSelection = false; + } + else { + var selectionRange = editor.getSelectionRange(); + if (selectionRange.isEmpty()) + this.$inSelection = false; + else { + var pos = this.getDocumentPosition(); + this.$inSelection = selectionRange.contains(pos.row, pos.column); + } + } + return this.$inSelection; + }; + + /** + * Get the clicked mouse button + * + * @return {Number} 0 for left button, 1 for middle button, 2 for right button + */ + this.getButton = function() { + return event.getButton(this.domEvent); + }; + + /** + * @return {Boolean} whether the shift key was pressed when the event was emitted + */ + this.getShiftKey = function() { + return this.domEvent.shiftKey; + }; + +}).call(MouseEvent.prototype); + +}); \ No newline at end of file diff --git a/lib/ace/mouse/mouse_handler.js b/lib/ace/mouse/mouse_handler.js index 63760028..a76116a1 100644 --- a/lib/ace/mouse/mouse_handler.js +++ b/lib/ace/mouse/mouse_handler.js @@ -40,13 +40,12 @@ define(function(require, exports, module) { var event = require("pilot/event"); -var BrowserFocus = require("pilot/browser_focus").BrowserFocus; var DefaultHandlers = require("ace/mouse/default_handlers").DefaultHandlers; +var MouseEvent = require("ace/mouse/mouse_event").MouseEvent; var MouseHandler = function(editor) { this.editor = editor; - this.browserFocus = new BrowserFocus(); this.defaultHandlers = new DefaultHandlers(editor); event.addListener(editor.container, "mousedown", function(e) { editor.focus(); @@ -76,77 +75,36 @@ var MouseHandler = function(editor) { return this.$scrollSpeed; }; - this.$getEventPosition = function(e) { - var pageX = event.getDocumentX(e); - var pageY = event.getDocumentY(e); - var pos = this.editor.renderer.screenToTextCoordinates(pageX, pageY); - pos.row = Math.max(0, Math.min(pos.row, this.editor.session.getLength()-1)); - return pos; - }; - this.onMouseDown = function(e) { - var pageX = event.getDocumentX(e); - var pageY = event.getDocumentY(e); - - var pos = this.$getEventPosition(e); - - var editor = this.editor; - var self = this; - var selectionRange = editor.getSelectionRange(); - var selectionEmpty = selectionRange.isEmpty(); - var inSelection = !editor.getReadOnly() - && !selectionEmpty - && selectionRange.contains(pos.row, pos.column); - - this.editor._dispatchEvent("mousedown", { - DOMEvent: e, - pageX: pageX, - pageY: pageY, - pos: pos, - inSelection: inSelection - }); + this.editor._dispatchEvent("mousedown", new MouseEvent(e, this.editor)); }; this.onMouseMove = function(e) { // optimization, because mousemove doesn't have a default handler. - var listeners = this.editor._eventRegistry["mousemove"]; + var listeners = this.editor._eventRegistry && this.editor._eventRegistry["mousemove"]; if (!listeners || !listeners.length) return; - this.editor._dispatchEvent("mousemove", { - DOMEvent: e, - pos: this.$getEventPosition(e) - }); + this.editor._dispatchEvent("mousemove", new MouseEvent(e, this.editor)); }; this.onMouseDoubleClick = function(e) { - this.editor._dispatchEvent("dblclick", { - DOMEvent: e, - pos: this.$getEventPosition(e) - }); + this.editor._dispatchEvent("dblclick", new MouseEvent(e, this.editor)); }; this.onMouseTripleClick = function(e) { - this.editor._dispatchEvent("tripleclick", { - DOMEvent: e, - pos: this.$getEventPosition(e) - }); + this.editor._dispatchEvent("tripleclick", new MouseEvent(e, this.editor)); }; this.onMouseQuadClick = function(e) { - this.editor._dispatchEvent("quadclick", { - DOMEvent: e, - pos: this.$getEventPosition(e) - }); + this.editor._dispatchEvent("quadclick", new MouseEvent(e, this.editor)); }; this.onMouseWheel = function(e) { - var speed = this.$scrollSpeed * 2; + var mouseEvent = new MouseEvent(e, this.editor); + mouseEvent.speed = this.$scrollSpeed * 2; - this.editor._dispatchEvent("scroll", { - DOMEvent: e, - speed: speed - }); + this.editor._dispatchEvent("quadclick", mouseEvent); }; }).call(MouseHandler.prototype); From 2dd2cea46b112fe33243f8dbde03090f3b04f3a0 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Sat, 24 Sep 2011 12:06:41 +0000 Subject: [PATCH 5/5] pilot --- support/pilot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/pilot b/support/pilot index 5f347106..3fdfcc07 160000 --- a/support/pilot +++ b/support/pilot @@ -1 +1 @@ -Subproject commit 5f347106caf67f7be016233d11b807279947056b +Subproject commit 3fdfcc071929aa96dff4f2d710dce10cda164fa7