From 0977c392f1e679c187b6aadfd2bee01b44517c7c Mon Sep 17 00:00:00 2001 From: Joe Walker Date: Tue, 23 Nov 2010 14:33:38 +0000 Subject: [PATCH] move event.js into pilot --- demo/demo_startup.js | 26 +++++++++++------------ demo/editor-build.html | 2 +- lib/ace/editor.js | 28 ++++++++++++------------- lib/ace/keybinding.js | 2 +- lib/ace/renderloop.js | 14 ++++++------- lib/ace/scrollbar.js | 2 +- lib/ace/textinput.js | 2 +- lib/ace/virtual_renderer.js | 2 +- {lib/ace => plugins/pilot}/lib/event.js | 0 9 files changed, 39 insertions(+), 39 deletions(-) rename {lib/ace => plugins/pilot}/lib/event.js (100%) diff --git a/demo/demo_startup.js b/demo/demo_startup.js index 177b5e06..b0630077 100644 --- a/demo/demo_startup.js +++ b/demo/demo_startup.js @@ -40,8 +40,8 @@ define(function(require, exports, module) { exports.launch = function() { - - var eventMod = require("ace/lib/event"); + + var eventMod = require("pilot/event"); var editorMod = require("ace/editor"); var renderMod = require("ace/virtual_renderer"); var theme = require("ace/theme/textmate"); @@ -83,7 +83,7 @@ exports.launch = function() { function onDocChange() { var doc = getDoc(); editor.setDocument(doc); - + var mode = doc.getMode(); if (mode instanceof JavaScriptMode) { modeEl.value = "javascript" @@ -100,7 +100,7 @@ exports.launch = function() { else { modeEl.value = "text" } - + editor.focus(); } docEl.onchange = onDocChange; @@ -123,7 +123,7 @@ exports.launch = function() { }; function getMode() { - return modes[modeEl.value]; + return modes[modeEl.value]; } var themeEl = document.getElementById("theme"); @@ -160,8 +160,8 @@ exports.launch = function() { function onResize() { container.style.width = (document.documentElement.clientWidth - 4) + "px"; - container.style.height = (document.documentElement.clientHeight - 55 - 4) + "px"; - editor.resize(); + container.style.height = (document.documentElement.clientHeight - 55 - 4) + "px"; + editor.resize(); }; window.onresize = onResize; @@ -177,12 +177,12 @@ exports.launch = function() { } catch(e) { return event.stopEvent(); } - + if (window.FileReader) { var reader = new FileReader(); reader.onload = function(e) { editor.getSelection().selectAll(); - + var mode = "text"; if (/^.*\.js$/i.test(file.name)) { mode = "javascript"; @@ -193,15 +193,15 @@ exports.launch = function() { } else if (/^.*\.css$/i.test(file.name)) { mode = "css"; } - + editor.onTextInput(reader.result); - - modeEl.value = mode; + + modeEl.value = mode; editor.getDocument().setMode(modes[mode]); } reader.readAsText(file); } - + return event.preventDefault(e); }); }; diff --git a/demo/editor-build.html b/demo/editor-build.html index 637b672c..deac861c 100644 --- a/demo/editor-build.html +++ b/demo/editor-build.html @@ -137,7 +137,7 @@ require( { baseUrl: "../build" }, [ - "ace/lib/event", + "pilot/event", "ace/editor", "ace/virtual_renderer", "ace/theme/textmate", diff --git a/lib/ace/editor.js b/lib/ace/editor.js index 0b4ab4c1..01faa5c0 100644 --- a/lib/ace/editor.js +++ b/lib/ace/editor.js @@ -38,7 +38,7 @@ define(function(require, exports, module) { var oop = require("ace/lib/oop").oop; -var event = require("ace/lib/event").event; +var event = require("pilot/event").event; var lang = require("ace/lib/lang").lang; var TextInput = require("ace/textinput").TextInput; var KeyBinding = require("ace/keybinding").KeyBinding; @@ -301,7 +301,7 @@ var Editor =function(renderer, doc) { var pos = this.renderer.screenToTextCoordinates(pageX, pageY); pos.row = Math.max(0, Math.min(pos.row, this.doc.getLength()-1)); - + if (event.getButton(e) != 0) { if (this.selection.isEmpty()) { this.moveCursorToPosition(pos); @@ -436,7 +436,7 @@ var Editor =function(renderer, doc) { return; } */ - + _self.bgTokenizer.getState(cursor.row, function(lineState) { // multi line insert if (cursor.row !== end.row) { @@ -450,7 +450,7 @@ var Editor =function(renderer, doc) { for (var i = 0; i < line.length; ++i) if (line.charAt(i) == '\t') indent += size; - else if (line.charAt(i) == ' ') + else if (line.charAt(i) == ' ') indent += 1; else break; @@ -469,7 +469,7 @@ var Editor =function(renderer, doc) { _self.doc.replace(new Range(row, 0, row, line.length), line.substr(i)); } end.column += _self.doc.indentRows( - new Range(cursor.row + 1, 0, end.row, end.column), + new Range(cursor.row + 1, 0, end.row, end.column), lineIndent); } else { if (shouldOutdent) { @@ -603,19 +603,19 @@ var Editor =function(renderer, doc) { return; var range = this.getSelectionRange(); - + if (range.start.row < range.end.row || range.start.column < range.end.column) { var count = this.doc.indentRows(this.getSelectionRange(), "\t"); - + this.selection.shiftSelection(count); } else { var indentString; - + if (this.doc.getUseSoftTabs()) { var size = this.doc.getTabSize(), count = (size - this.getCursorPosition().column % size); - + indentString = lang.stringRepeat(" ", count); } else indentString = "\t"; @@ -629,7 +629,7 @@ var Editor =function(renderer, doc) { var selection = this.doc.getSelection(), range = this.doc.outdentRows(selection.getRange()); - + selection.setSelectionRange(range, selection.isBackwards()); this.$updateDesiredColumn(); }; @@ -793,7 +793,7 @@ var Editor =function(renderer, doc) { var row = this.getPageDownRow(), column = Math.min(this.getCursorPosition().column, this.doc.getLine(row).length); - + this.scrollToRow(row); this.getSelection().moveCursorTo(row, column); }; @@ -802,7 +802,7 @@ var Editor =function(renderer, doc) { var row = this.getPageUpRow(), column = Math.min(this.getCursorPosition().column, this.doc.getLine(row).length); - + this.scrollToRow(row); this.getSelection().moveCursorTo(row, column); }; @@ -846,7 +846,7 @@ var Editor =function(renderer, doc) { this.gotoLine = function(lineNumber, row) { this.selection.clearSelection(); - + this.$blockScrolling = true; this.moveCursorTo(lineNumber-1, row || 0); this.$blockScrolling = false; @@ -944,7 +944,7 @@ var Editor =function(renderer, doc) { this.replace = function(replacement, options) { if (options) this.$search.set(options); - + var range = this.$search.find(this.doc); this.$tryReplace(range, replacement); if (range !== null) diff --git a/lib/ace/keybinding.js b/lib/ace/keybinding.js index 82259692..78212755 100644 --- a/lib/ace/keybinding.js +++ b/lib/ace/keybinding.js @@ -38,7 +38,7 @@ define(function(require, exports, module) { var core = require("pilot/core").core; -var event = require("ace/lib/event").event; +var event = require("pilot/event").event; var default_mac = require("ace/conf/keybindings/default_mac").bindings; var default_win = require("ace/conf/keybindings/default_win").bindings; var PluginManager = require("pilot/plugin_manager").PluginManager; diff --git a/lib/ace/renderloop.js b/lib/ace/renderloop.js index 7f1639e4..f43efcc1 100644 --- a/lib/ace/renderloop.js +++ b/lib/ace/renderloop.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var event = require("ace/lib/event").event; +var event = require("pilot/event").event; var RenderLoop = function(onRender) { this.onRender = onRender; @@ -61,11 +61,11 @@ var RenderLoop = function(onRender) { }) } }; - + if (window.postMessage) { - + this.messageName = "zero-timeout-message"; - + this.setTimeoutZero = function(callback) { if (!this.attached) { var _self = this; @@ -80,14 +80,14 @@ var RenderLoop = function(onRender) { this.callback = callback; window.postMessage(this.messageName, "*"); } - + } else { - + this.setTimeoutZero = function(callback) { setTimeout(callback, 0); } } - + }).call(RenderLoop.prototype); exports.RenderLoop = RenderLoop; diff --git a/lib/ace/scrollbar.js b/lib/ace/scrollbar.js index 5d39c77b..7bc741e8 100644 --- a/lib/ace/scrollbar.js +++ b/lib/ace/scrollbar.js @@ -40,7 +40,7 @@ define(function(require, exports, module) { var oop = require("ace/lib/oop").oop; var lang = require("ace/lib/lang").lang; var dom = require("pilot/dom").dom; -var event = require("ace/lib/event").event; +var event = require("pilot/event").event; var MEventEmitter = require("ace/event_emitter").MEventEmitter; var ScrollBar = function(parent) { diff --git a/lib/ace/textinput.js b/lib/ace/textinput.js index 88f84dd5..d4abdc96 100644 --- a/lib/ace/textinput.js +++ b/lib/ace/textinput.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var event = require("ace/lib/event").event; +var event = require("pilot/event").event; var TextInput = function(parentNode, host) { diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index b2be79e3..46b45caa 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -40,7 +40,7 @@ define(function(require, exports, module) { var oop = require("ace/lib/oop").oop; var lang = require("ace/lib/lang").lang; var dom = require("pilot/dom").dom; -var event = require("ace/lib/event").event; +var event = require("pilot/event").event; var GutterLayer = require("ace/layer/gutter").Gutter; var MarkerLayer = require("ace/layer/marker").Marker; var TextLayer = require("ace/layer/text").Text; diff --git a/lib/ace/lib/event.js b/plugins/pilot/lib/event.js similarity index 100% rename from lib/ace/lib/event.js rename to plugins/pilot/lib/event.js