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

minor tidyups

Browse source
This commit is contained in:
Joe Walker 2010-11-23 14:40:07 +00:00
commit 81cb24ef17
3 changed files with 25 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

51
demo/demo_startup.js
View file

@ -41,30 +41,19 @@ define(function(require, exports, module) {
exports.launch = function() { exports.launch = function() {
var eventMod = require("pilot/event"); var event = require("pilot/event").event;
var editorMod = require("ace/editor"); var Editor = require("ace/editor").Editor;
var renderMod = require("ace/virtual_renderer"); var Renderer = require("ace/virtual_renderer").VirtualRenderer;
var theme = require("ace/theme/textmate"); var theme = require("ace/theme/textmate");
var docMod = require("ace/document"); var Document = require("ace/document").Document;
var jsMod = require("ace/mode/javascript"); var JavaScriptMode = require("ace/mode/javascript").JavaScript;
var cssMod = require("ace/mode/css"); var CssMode = require("ace/mode/css").Css;
var htmlMod = require("ace/mode/html"); var HtmlMode = require("ace/mode/html").Html;
var xmlMod = require("ace/mode/xml"); var XmlMode = require("ace/mode/xml").Xml;
var textMod = require("ace/mode/text"); var TextMode = require("ace/mode/text").Text;
var undoMod = require("ace/undomanager"); var UndoManager = require("ace/undomanager").UndoManager;
var event = eventMod.event; var docs = {};
var Editor = editorMod.Editor;
var Renderer = renderMod.VirtualRenderer;
var Document = docMod.Document;
var JavaScriptMode = jsMod.JavaScript;
var CssMode = cssMod.Css;
var HtmlMode = htmlMod.Html;
var XmlMode = xmlMod.Xml;
var TextMode = textMod.Text;
var UndoManager = undoMod.UndoManager;
var docs = {}
docs.js = new Document(document.getElementById("jstext").innerHTML); docs.js = new Document(document.getElementById("jstext").innerHTML);
docs.js.setMode(new JavaScriptMode()); docs.js.setMode(new JavaScriptMode());
@ -86,19 +75,19 @@ exports.launch = function() {
var mode = doc.getMode(); var mode = doc.getMode();
if (mode instanceof JavaScriptMode) { if (mode instanceof JavaScriptMode) {
modeEl.value = "javascript" modeEl.value = "javascript";
} }
else if (mode instanceof CssMode) { else if (mode instanceof CssMode) {
modeEl.value = "css" modeEl.value = "css";
} }
else if (mode instanceof HtmlMode) { else if (mode instanceof HtmlMode) {
modeEl.value = "html" modeEl.value = "html";
} }
else if (mode instanceof XmlMode) { else if (mode instanceof XmlMode) {
modeEl.value = "xml" modeEl.value = "xml";
} }
else { else {
modeEl.value = "text" modeEl.value = "text";
} }
editor.focus(); editor.focus();
@ -150,13 +139,13 @@ exports.launch = function() {
onDocChange(); onDocChange();
window.jump = function() { window.jump = function() {
var jump = document.getElementById("jump") var jump = document.getElementById("jump");
var cursor = editor.getCursorPosition() var cursor = editor.getCursorPosition();
var pos = editor.renderer.textToScreenCoordinates(cursor.row, cursor.column); var pos = editor.renderer.textToScreenCoordinates(cursor.row, cursor.column);
jump.style.left = pos.pageX + "px"; jump.style.left = pos.pageX + "px";
jump.style.top = pos.pageY + "px"; jump.style.top = pos.pageY + "px";
jump.style.display = "block"; jump.style.display = "block";
} };
function onResize() { function onResize() {
container.style.width = (document.documentElement.clientWidth - 4) + "px"; container.style.width = (document.documentElement.clientWidth - 4) + "px";
@ -198,7 +187,7 @@ exports.launch = function() {
modeEl.value = mode; modeEl.value = mode;
editor.getDocument().setMode(modes[mode]); editor.getDocument().setMode(modes[mode]);
} };
reader.readAsText(file); reader.readAsText(file);
} }

2
lib/ace/event_emitter.js
View file

@ -39,7 +39,7 @@ define(function(require, exports, module) {
var lang = require("pilot/lang").lang; var lang = require("pilot/lang").lang;
var MEventEmitter = {} var MEventEmitter = {};
MEventEmitter.$dispatchEvent = function(eventName, e) { MEventEmitter.$dispatchEvent = function(eventName, e) {
this.$eventRegistry = this.$eventRegistry || {}; this.$eventRegistry = this.$eventRegistry || {};

8
plugins/pilot/lib/event.js
View file

@ -37,8 +37,7 @@
define(function(require, exports, module) { define(function(require, exports, module) {
var core = require("pilot/core").core;
var core = require("pilot/core").core;
var event = {}; var event = {};
event.addListener = function(elem, type, callback) { event.addListener = function(elem, type, callback) {
@ -111,7 +110,7 @@ var core = require("pilot/core").core;
} }
// old IE // old IE
else { else {
return Math.max(e.button - 1, 2) return Math.max(e.button - 1, 2);
} }
}; };
@ -239,4 +238,5 @@ var core = require("pilot/core").core;
}; };
exports.event = event; exports.event = event;
});
});