From 604b9e5aae293f1168947a7f4a6d0501950fead9 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 9 Jul 2013 22:50:49 +0400 Subject: [PATCH] cherypick changes from previous attempts to add ipad support --- demo/kitchen-sink/demo.js | 1 + lib/ace/ext/mobile.js | 50 +++++++++++++ lib/ace/mouse/touch_handler.js | 126 +++++++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+) create mode 100644 lib/ace/ext/mobile.js create mode 100644 lib/ace/mouse/touch_handler.js diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js index d565bd81..50f904b4 100644 --- a/demo/kitchen-sink/demo.js +++ b/demo/kitchen-sink/demo.js @@ -613,6 +613,7 @@ env.editor.setOptions({ enableBasicAutocompletion: true, enableSnippets: true }) +require("ace/ext/mobile"); }); diff --git a/lib/ace/ext/mobile.js b/lib/ace/ext/mobile.js new file mode 100644 index 00000000..9fbc30ef --- /dev/null +++ b/lib/ace/ext/mobile.js @@ -0,0 +1,50 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * Copyright (c) 2012, Ajax.org B.V. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Ajax.org B.V. nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ***** END LICENSE BLOCK ***** */ + +define(function(require, exports, module) { +"use strict"; + +var TouchHandler = require("../mouse/touch_handler").TouchHandler; +var config = require("../config"); + +var Editor = require("../editor").Editor; +require("../config").defineOptions(Editor.prototype, "editor", { + enableTouchSupport: { + set: function(val) { + if ('ontouchstart' in this.container || 1) + if (val && !this.$touchHandler) + this.$touchHandler = new TouchHandler(this); + }, + value: true, + initialValue: false + } +}); + +}); \ No newline at end of file diff --git a/lib/ace/mouse/touch_handler.js b/lib/ace/mouse/touch_handler.js new file mode 100644 index 00000000..2f942f5d --- /dev/null +++ b/lib/ace/mouse/touch_handler.js @@ -0,0 +1,126 @@ +/* ***** 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("../lib/event"); + +var TouchHandler = function(editor) { + this.editor = editor; + event.addListener(editor.container, "click", function(e) { + // does this only work on click? + editor.focus(); + }); + var mouseTarget = editor.renderer.getMouseEventTarget(); + mouseTarget.ontouchstart = this.onTouchStart.bind(this); + mouseTarget.ontouchmove = this.onTouchMove.bind(this); + mouseTarget.ontouchend = this.onTouchEnd.bind(this); +}; + +(function() { + + this.$scrollSpeed = 1; + this.setScrollSpeed = function(speed) { + this.$scrollSpeed = speed; + }; + + this.getScrollSpeed = function() { + return this.$scrollSpeed; + }; + + this.onTouchMove = function(e) { + e.preventDefault(); + if (e.touches.length == 1) { + this.$moveCursor(e.touches[0]); + } + else if (e.touches.length == 2) { + if (!this.$scroll) + return; + + var touch = e.touches[0]; + var diffX = this.$scroll.pageX - touch.pageX; + var diffY = this.$scroll.pageY - touch.pageY; + this.editor.renderer.scrollBy(diffX, diffY); + + this.$scroll = { + pageX: touch.pageX, + pageY: touch.pageY, + ts: new Date().getTime() + } + } + }; + + this.$moveCursor = function(touch) { + var pageX = touch.pageX; + var pageY = touch.pageY; + + var editor = this.editor; + var pos = editor.renderer.screenToTextCoordinates(pageX, pageY); + pos.row = Math.max(0, Math.min(pos.row, editor.session.getLength()-1)); + + editor.moveCursorToPosition(pos); + editor.renderer.scrollCursorIntoView(); + }; + + this.onTouchEnd = function(e) { + //if (e.touches.length == 1) { + console.log("focus") + // editor.focus(); + //e.preventDefault(); + //} + + + }; + + this.onTouchStart = function(e) { + if (e.touches.length == 1) { + this.$moveCursor(e.touches[0]); + } + else if (e.touches.length == 2) { + e.preventDefault(); + var touch = e.touches[0]; + this.$scroll = { + pageX: touch.pageX, + pageY: touch.pageY + } + } + }; + +}).call(TouchHandler.prototype); + +exports.TouchHandler = TouchHandler; +}); \ No newline at end of file