From 0a6b072079fc7b205db503ed0c792b114288fd19 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Wed, 14 Dec 2011 16:01:35 +0100 Subject: [PATCH] add default gutter handler --- lib/ace/mouse/default_gutter_handler.js | 53 +++++++++++++++++++++++++ lib/ace/mouse/fold_handler.js | 11 +++-- lib/ace/mouse/mouse_event.js | 5 +++ lib/ace/mouse/mouse_handler.js | 5 ++- 4 files changed, 67 insertions(+), 7 deletions(-) create mode 100644 lib/ace/mouse/default_gutter_handler.js diff --git a/lib/ace/mouse/default_gutter_handler.js b/lib/ace/mouse/default_gutter_handler.js new file mode 100644 index 00000000..2f0a26bf --- /dev/null +++ b/lib/ace/mouse/default_gutter_handler.js @@ -0,0 +1,53 @@ +/* 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) { + +function GutterHandler(editor) { + editor.setDefaultHandler("gutterclick", function(e) { + var row = e.getDocumentPosition().row; + var selection = editor.session.selection; + + selection.moveCursorTo(row, 0); + selection.selectLine(); + }); +} + +exports.GutterHandler = GutterHandler; + +}); \ No newline at end of file diff --git a/lib/ace/mouse/fold_handler.js b/lib/ace/mouse/fold_handler.js index 2366b7aa..b080bc7c 100644 --- a/lib/ace/mouse/fold_handler.js +++ b/lib/ace/mouse/fold_handler.js @@ -21,7 +21,6 @@ * * Contributor(s): * Fabian Jakobs - * 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,19 +40,19 @@ define(function(require, exports, module) { function FoldHandler(editor) { - editor.on("click", function(event) { - var position = event.getDocumentPosition(); + editor.on("click", function(e) { + var position = e.getDocumentPosition(); var session = editor.session; // If the user dclicked on a fold, then expand it. var fold = session.getFoldAt(position.row, position.column, 1); if (fold) { - if (event.getAccelKey()) + if (e.getAccelKey()) session.removeFold(fold); else session.expandFold(fold); - event.preventDefault(); + e.stop(); } }); @@ -61,7 +60,7 @@ function FoldHandler(editor) { if (e.domEvent.target.className.indexOf("ace_fold-widget") != -1) { var row = e.getDocumentPosition().row; editor.session.onFoldWidgetClick(row, e.domEvent); - e.preventDefault(); + e.stop(); } }); } diff --git a/lib/ace/mouse/mouse_event.js b/lib/ace/mouse/mouse_event.js index af5ea1b3..765ebb39 100644 --- a/lib/ace/mouse/mouse_event.js +++ b/lib/ace/mouse/mouse_event.js @@ -71,6 +71,11 @@ var MouseEvent = exports.MouseEvent = function(domEvent, editor) { event.preventDefault(this.domEvent); this.defaultPrevented = true; }; + + this.stop = function() { + this.stopPropagation(); + this.preventDefault(); + }; /** * Get the document position below the mouse cursor diff --git a/lib/ace/mouse/mouse_handler.js b/lib/ace/mouse/mouse_handler.js index 492c5315..1371d6fb 100644 --- a/lib/ace/mouse/mouse_handler.js +++ b/lib/ace/mouse/mouse_handler.js @@ -41,12 +41,15 @@ define(function(require, exports, module) { var event = require("../lib/event"); var DefaultHandlers = require("./default_handlers").DefaultHandlers; +var DefaultGutterHandler = require("./default_gutter_handler").GutterHandler; var MouseEvent = require("./mouse_event").MouseEvent; var MouseHandler = function(editor) { this.editor = editor; - this.defaultHandlers = new DefaultHandlers(editor); + new DefaultHandlers(editor); + new DefaultGutterHandler(editor); + event.addListener(editor.container, "mousedown", function(e) { editor.focus(); return event.preventDefault(e);