jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move event.js into pilot

Browse source
This commit is contained in:
Joe Walker 2010-11-23 14:33:38 +00:00
commit 0977c392f1
9 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

26
demo/demo_startup.js
View file

@ -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);
});
};

2
demo/editor-build.html
View file

@ -137,7 +137,7 @@
require(
{ baseUrl: "../build" },
[
"ace/lib/event",
"pilot/event",
"ace/editor",
"ace/virtual_renderer",
"ace/theme/textmate",

28
lib/ace/editor.js
View file

@ -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)

2
lib/ace/keybinding.js
View file

@ -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;

14
lib/ace/renderloop.js
View file

@ -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;

2
lib/ace/scrollbar.js
View file

@ -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) {

2
lib/ace/textinput.js
View file

@ -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) {

2
lib/ace/virtual_renderer.js
View file

@ -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;

0
lib/ace/lib/event.js → plugins/pilot/lib/event.js
View file