make jslint happy

This commit is contained in:
Fabian Jakobs 2010-04-12 13:10:47 +02:00
commit 443b712b8f
15 changed files with 968 additions and 949 deletions

View file

@ -1,3 +1,3 @@
onmessage = function(e) {
onmessage = new Function("e", e.data);
}
onmessage = new Function("e", e.data);
};

View file

@ -45,7 +45,7 @@ ace.BackgroundTokenizer = function(tokenizer, onUpdate, onComplete) {
self.onUpdate(startLine, textLines.length - 1);
self.onComplete();
}
};
};
ace.BackgroundTokenizer.prototype.setLines = function(textLines) {

View file

@ -10,7 +10,7 @@ ace.CursorLayer = function(parentEl) {
this.cursor.className = "cursor";
this.isVisible = false;
}
};
ace.CursorLayer.prototype.setCursor = function(position) {
this.position = {
@ -47,7 +47,7 @@ ace.CursorLayer.prototype.getPixelPosition = function() {
left : 0,
top : 0
};
}
};
ace.CursorLayer.prototype.update = function(config) {
if (!this.position)

File diff suppressed because it is too large Load diff

View file

@ -5,7 +5,7 @@ ace.GutterLayer = function(parentEl) {
this.element = document.createElement("div");
this.element.className = "layer gutter-layer";
parentEl.appendChild(this.element);
}
};
ace.GutterLayer.prototype.update = function(config) {
var html = [];

View file

@ -3,112 +3,112 @@ if (!window.ace)
(function() {
ace.JavaScript = {};
ace.JavaScript = {};
var keywords = {
"break" : 1,
"case" : 1,
"catch" : 1,
"continue" : 1,
"default" : 1,
"delete" : 1,
"do" : 1,
"else" : 1,
"finally" : 1,
"for" : 1,
"function" : 1,
"if" : 1,
"in" : 1,
"instanceof" : 1,
"new" : 1,
"return" : 1,
"switch" : 1,
"throw" : 1,
"try" : 1,
"typeof" : 1,
"var" : 1,
"while" : 1,
"with" : 1
};
var keywords = {
"break" : 1,
"case" : 1,
"catch" : 1,
"continue" : 1,
"default" : 1,
"delete" : 1,
"do" : 1,
"else" : 1,
"finally" : 1,
"for" : 1,
"function" : 1,
"if" : 1,
"in" : 1,
"instanceof" : 1,
"new" : 1,
"return" : 1,
"switch" : 1,
"throw" : 1,
"try" : 1,
"typeof" : 1,
"var" : 1,
"while" : 1,
"with" : 1
};
// regexp must not have capturing parentheses
// regexps are ordered -> the first match is used
// regexp must not have capturing parentheses
// regexps are ordered -> the first match is used
ace.JavaScript.RULES = {
start : [ {
token : "comment",
regex : "\\/\\/.*$"
}, {
token : "comment", // multi line comment in one line
regex : "\\/\\*.*?\\*\\/"
}, {
token : "comment", // multi line comment start
regex : "\\/\\*.*$",
next : "comment"
}, {
token : "string", // single line
regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
}, {
token : "string", // multi line string start
regex : '["].*\\\\$',
next : "qqstring"
}, {
token : "string", // single line
regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
}, {
token : "string", // multi line string start
regex : "['].*\\\\$",
next : "qstring"
}, {
token : "number", // hex
regex : "0[xX][0-9a-fA-F]+\\b"
}, {
token : "number", // float
regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
}, {
token : function(value) {
if (keywords[value]) {
return "keyword";
}
else {
return "identifier"
}
ace.JavaScript.RULES = {
start : [ {
token : "comment",
regex : "\\/\\/.*$"
}, {
token : "comment", // multi line comment in one line
regex : "\\/\\*.*?\\*\\/"
}, {
token : "comment", // multi line comment start
regex : "\\/\\*.*$",
next : "comment"
}, {
token : "string", // single line
regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
}, {
token : "string", // multi line string start
regex : '["].*\\\\$',
next : "qqstring"
}, {
token : "string", // single line
regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
}, {
token : "string", // multi line string start
regex : "['].*\\\\$",
next : "qstring"
}, {
token : "number", // hex
regex : "0[xX][0-9a-fA-F]+\\b"
}, {
token : "number", // float
regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
}, {
token : function(value) {
if (keywords[value]) {
return "keyword";
}
else {
return "identifier";
}
},
regex : "[a-zA-Z_][a-zA-Z0-9_]*\\b"
}, {
token : function(value) {
// return parens[value];
return "text";
},
regex : "[a-zA-Z_][a-zA-Z0-9_]*\\b"
}, {
token : function(value) {
// return parens[value];
return "text";
},
regex : "[\\[\\]\\(\\)\\{\\}]"
}, {
token : "text",
regex : "\\s+"
} ],
"comment" : [ {
token : "comment", // closing comment
regex : ".*?\\*\\/",
next : "start"
}, {
token : "comment", // comment spanning whole line
regex : ".+"
} ],
"qqstring" : [ {
token : "string",
regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
next : "start"
}, {
token : "string",
regex : '.+'
} ],
"qstring" : [ {
token : "string",
regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
next : "start"
}, {
token : "string",
regex : '.+'
} ]
};
regex : "[\\[\\]\\(\\)\\{\\}]"
}, {
token : "text",
regex : "\\s+"
} ],
"comment" : [ {
token : "comment", // closing comment
regex : ".*?\\*\\/",
next : "start"
}, {
token : "comment", // comment spanning whole line
regex : ".+"
} ],
"qqstring" : [ {
token : "string",
regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
next : "start"
}, {
token : "string",
regex : '.+'
} ],
"qstring" : [ {
token : "string",
regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
next : "start"
}, {
token : "string",
regex : '.+'
} ]
};
})();

View file

@ -8,7 +8,7 @@ ace.MarkerLayer = function(parentEl) {
this.markers = {};
this._markerId = 1;
}
};
ace.MarkerLayer.prototype.addMarker = function(range, clazz) {
var id = this._markerId++;

View file

@ -6,10 +6,10 @@ ace.TextDocument = function(text) {
this.modified = true;
this.listeners = [];
}
};
ace.TextDocument.prototype._split = function(text) {
return text.split(/[\n\r]/)
return text.split(/[\n\r]/);
};
ace.TextDocument.prototype.addChangeListener = function(listener) {
@ -67,37 +67,6 @@ ace.TextDocument.prototype.keywords = {
"with" : 1
};
ace.TextDocument.prototype.getLineTokens = function(row) {
var tokens = [];
var re = /(?:(\s+)|("[^"]*")|('[^']*')|([\[\]\(\)\{\}])|([a-zA-Z_][a-zA-Z0-9_]*)|(\/\/.*)|(.))/g
re.lastIndex = 0;
var match;
var line = this.getLine(row);
while (match = re.exec(line)) {
var token = {
type : "text",
value : match[0]
}
if (match[2] || match[3]) {
token.type = "string";
}
else if (match[5] && this.keywords[match[5]]) {
token.type = "keyword";
}
else if (match[6]) {
token.type = "comment";
}
tokens.push(token);
}
;
return tokens;
};
ace.TextDocument.prototype.getLength = function() {
return this.lines.length;
};
@ -148,7 +117,7 @@ ace.TextDocument.prototype._insert = function(position, text) {
return {
row : position.row,
column : position.column + text.length
}
};
}
else {
var line = this.lines[position.row] || "";
@ -159,7 +128,7 @@ ace.TextDocument.prototype._insert = function(position, text) {
+ line.substring(position.column);
if (newLines.length > 2) {
var args = [ position.row + 1, 0 ]
var args = [ position.row + 1, 0 ];
args.push.apply(args, newLines.slice(1, -1));
this.lines.splice.apply(this.lines, args);
}
@ -209,4 +178,4 @@ ace.TextDocument.prototype.replace = function(range, text) {
: undefined);
return end;
}
};

View file

@ -19,8 +19,8 @@ ace.TextInput = function(parentNode, host) {
host.onTextInput(text.value);
text.value = "";
}
}, 0)
}
}, 0);
};
var onCompositionStart = function(e) {
inCompostion = true;
@ -31,28 +31,28 @@ ace.TextInput = function(parentNode, host) {
host.onCompositionStart();
setTimeout(onCompositionUpdate, 0);
}
};
var onCompositionUpdate = function() {
host.onCompositionUpdate(text.value);
}
};
var onCompositionEnd = function() {
inCompostion = false;
host.onCompositionEnd();
onTextInput();
}
};
var onCopy = function() {
text.value = host.getCopyText();
text.select();
}
};
var onCut = function() {
text.value = host.getCopyText();
host.onCut();
text.select();
}
};
ace.addListener(text, "keypress", onTextInput, false);
ace.addListener(text, "textInput", onTextInput, false);
@ -77,9 +77,9 @@ ace.TextInput = function(parentNode, host) {
this.focus = function() {
text.focus();
}
};
this.blur = function() {
this.blur();
}
};
};

View file

@ -7,7 +7,7 @@ ace.TextLayer = function(parentEl) {
parentEl.appendChild(this.element);
this._measureSizes();
}
};
ace.TextLayer.prototype.setTokenizer = function(tokenizer) {
this.tokenizer = tokenizer;

View file

@ -33,9 +33,9 @@ ace.Tokenizer.prototype.getLineTokens = function(line, startState) {
var token = {
type : "text",
value : match[0]
}
};
if (re.lastIndex == lastIndex) { throw new Error("tokenizer error") }
if (re.lastIndex == lastIndex) { throw new Error("tokenizer error"); }
lastIndex = re.lastIndex;
// console.log(match);
@ -71,5 +71,5 @@ ace.Tokenizer.prototype.getLineTokens = function(line, startState) {
return {
tokens : tokens,
state : currentState
}
};
};

View file

@ -32,7 +32,7 @@ ace.VirtualRenderer = function(container) {
row : 0,
column : 0
};
}
};
ace.VirtualRenderer.prototype.setDocument = function(doc) {
this.lines = doc.lines;
@ -63,7 +63,7 @@ ace.VirtualRenderer.prototype.updateLines = function(firstRow, lastRow) {
// if the last row is unknow -> redraw everything
if (lastRow === undefined) {
this.draw()
this.draw();
return;
}
@ -108,7 +108,7 @@ ace.VirtualRenderer.prototype.draw = function() {
this.gutterLayer.element.style.marginTop = (-offset) + "px";
this.gutterLayer.element.style.height = minHeight + "px";
this.gutterLayer.update(layerConfig);
}
};
ace.VirtualRenderer.prototype.addMarker = function(range, clazz) {
return this.markerLayer.addMarker(range, clazz);
@ -134,7 +134,7 @@ ace.VirtualRenderer.prototype.showCursor = function() {
ace.VirtualRenderer.prototype.scrollCursorIntoView = function() {
var pos = this.cursorLayer.getPixelPosition();
var left = pos.left
var left = pos.left;
var top = pos.top;
if (this.getScrollTop() > top) {
@ -163,7 +163,7 @@ ace.VirtualRenderer.prototype.getScrollTop = function() {
ace.VirtualRenderer.prototype.scrollToRow = function(row) {
this.scrollToY(row * this.lineHeight);
}
};
ace.VirtualRenderer.prototype.scrollToY = function(scrollTop) {
var maxHeight = this.lines.length * this.lineHeight
@ -187,7 +187,7 @@ ace.VirtualRenderer.prototype.screenToTextCoordinates = function(pageX, pageY) {
return {
row : row,
column : col
}
};
};
ace.VirtualRenderer.prototype.visualizeFocus = function() {

View file

@ -3,157 +3,157 @@ if (!window.ace)
(function() {
ace.addListener = function(elem, type, callback) {
if (elem.addEventListener) { return elem.addEventListener(type,
callback,
false); }
if (elem.attachEvent) {
var wrapper = function() {
callback(window.event);
ace.addListener = function(elem, type, callback) {
if (elem.addEventListener) { return elem.addEventListener(type,
callback,
false); }
if (elem.attachEvent) {
var wrapper = function() {
callback(window.event);
};
callback.$$wrapper = wrapper;
elem.attachEvent("on" + type, wrapper);
}
callback.$$wrapper = wrapper;
elem.attachEvent("on" + type, wrapper);
}
}
ace.removeListener = function(elem, type, callback) {
if (elem.removeEventListener) { return elem
.removeEventListener(type, callback, false); }
if (elem.detachEvent) {
elem.detachEvent("on" + type, callback.$$wrapper || callback);
}
}
ace.setText = function(elem, text) {
if (elem.innerText !== undefined) {
elem.innerText = text;
}
if (elem.textContent !== undefined) {
elem.textContent = text;
}
}
ace.stopEvent = function(e) {
ace.stopPropagation(e);
ace.preventDefault(e);
return false;
}
ace.stopPropagation = function(e) {
if (e.stopPropagation)
e.stopPropagation();
else
e.cancelBubble = true;
}
ace.preventDefault = function(e) {
if (e.preventDefault)
e.preventDefault();
else
e.returnValue = false;
}
ace.inherits = function(ctor, superCtor) {
var tempCtor = function() {
};
tempCtor.prototype = superCtor.prototype;
ctor.super_ = superCtor.prototype;
ctor.prototype = new tempCtor();
ctor.prototype.constructor = ctor;
};
ace.getInnerWidth = function(element) {
return (parseInt(ace.computedStyle(element, "paddingLeft"))
+ parseInt(ace.computedStyle(element, "paddingRight")) + element.clientWidth);
};
ace.getInnerHeight = function(element) {
return (parseInt(ace.computedStyle(element, "paddingTop"))
+ parseInt(ace.computedStyle(element, "paddingBottom")) + element.clientHeight);
};
ace.computedStyle = function(element, style) {
if (window.getComputedStyle) {
return (window.getComputedStyle(element, null))[style];
}
else {
return element.currentStyle[style];
}
}
ace.scrollbarHeight = function() {
var el = document.createElement("div");
var style = el.style;
style.position = "absolute";
style.left = "-10000px";
style.overflow = "scroll";
style.height = "100px";
document.body.appendChild(el);
var height = el.offsetHeight - el.clientHeight;
document.body.removeChild(el);
return height;
}
ace.bind = function(fcn, context) {
return function() {
return fcn.apply(context, arguments);
}
}
ace.capture = function(el, eventHandler, releaseCaptureHandler) {
function onMouseMove(e) {
eventHandler(e);
e.stopPropagation();
}
function onMouseUp(e) {
eventHandler && eventHandler(e);
releaseCaptureHandler && releaseCaptureHandler();
document.removeEventListener("mousemove", onMouseMove, true);
document.removeEventListener("mouseup", onMouseUp, true);
e.stopPropagation();
}
document.addEventListener("mousemove", onMouseMove, true);
document.addEventListener("mouseup", onMouseUp, true);
}
ace.addMouseWheelListener = function(el, callback) {
var listener = function(e) {
e.wheel = (e.wheelDelta) ? e.wheelDelta / 120
: -(e.detail || 0) / 3;
callback(e);
}
ace.addListener(el, "DOMMouseScroll", listener);
ace.addListener(el, "mousewheel", listener);
};
ace.autoremoveListener = function(el, type, callback, timeout) {
var listener = function(e) {
clearTimeout(timeoutId);
remove();
callback(e);
}
var remove = function() {
ace.removeListener(el, type, listener);
};
ace.addListener(el, type, listener);
var timeoutId = setTimeout(remove, timeout);
}
ace.removeListener = function(elem, type, callback) {
if (elem.removeEventListener) { return elem
.removeEventListener(type, callback, false); }
if (elem.detachEvent) {
elem.detachEvent("on" + type, callback.$$wrapper || callback);
}
};
ace.addTripleClickListener = function(el, callback) {
ace.addListener(el, "mousedown", function() {
ace.autoremoveListener(el, "mousedown", function() {
ace.autoremoveListener(el, "mousedown", callback, 300);
}, 300);
});
}
ace.setText = function(elem, text) {
if (elem.innerText !== undefined) {
elem.innerText = text;
}
if (elem.textContent !== undefined) {
elem.textContent = text;
}
};
ace.stopEvent = function(e) {
ace.stopPropagation(e);
ace.preventDefault(e);
return false;
};
ace.stopPropagation = function(e) {
if (e.stopPropagation)
e.stopPropagation();
else
e.cancelBubble = true;
};
ace.preventDefault = function(e) {
if (e.preventDefault)
e.preventDefault();
else
e.returnValue = false;
};
ace.inherits = function(ctor, superCtor) {
var tempCtor = function() {
};
tempCtor.prototype = superCtor.prototype;
ctor.super_ = superCtor.prototype;
ctor.prototype = new tempCtor();
ctor.prototype.constructor = ctor;
};
ace.getInnerWidth = function(element) {
return (parseInt(ace.computedStyle(element, "paddingLeft"))
+ parseInt(ace.computedStyle(element, "paddingRight")) + element.clientWidth);
};
ace.getInnerHeight = function(element) {
return (parseInt(ace.computedStyle(element, "paddingTop"))
+ parseInt(ace.computedStyle(element, "paddingBottom")) + element.clientHeight);
};
ace.computedStyle = function(element, style) {
if (window.getComputedStyle) {
return (window.getComputedStyle(element, null))[style];
}
else {
return element.currentStyle[style];
}
};
ace.scrollbarHeight = function() {
var el = document.createElement("div");
var style = el.style;
style.position = "absolute";
style.left = "-10000px";
style.overflow = "scroll";
style.height = "100px";
document.body.appendChild(el);
var height = el.offsetHeight - el.clientHeight;
document.body.removeChild(el);
return height;
};
ace.bind = function(fcn, context) {
return function() {
return fcn.apply(context, arguments);
};
};
ace.capture = function(el, eventHandler, releaseCaptureHandler) {
function onMouseMove(e) {
eventHandler(e);
e.stopPropagation();
}
function onMouseUp(e) {
eventHandler && eventHandler(e);
releaseCaptureHandler && releaseCaptureHandler();
document.removeEventListener("mousemove", onMouseMove, true);
document.removeEventListener("mouseup", onMouseUp, true);
e.stopPropagation();
}
document.addEventListener("mousemove", onMouseMove, true);
document.addEventListener("mouseup", onMouseUp, true);
};
ace.addMouseWheelListener = function(el, callback) {
var listener = function(e) {
e.wheel = (e.wheelDelta) ? e.wheelDelta / 120
: -(e.detail || 0) / 3;
callback(e);
};
ace.addListener(el, "DOMMouseScroll", listener);
ace.addListener(el, "mousewheel", listener);
};
ace.autoremoveListener = function(el, type, callback, timeout) {
var listener = function(e) {
clearTimeout(timeoutId);
remove();
callback(e);
};
var remove = function() {
ace.removeListener(el, type, listener);
};
ace.addListener(el, type, listener);
var timeoutId = setTimeout(remove, timeout);
};
ace.addTripleClickListener = function(el, callback) {
ace.addListener(el, "mousedown", function() {
ace.autoremoveListener(el, "mousedown", function() {
ace.autoremoveListener(el, "mousedown", callback, 300);
}, 300);
});
};
})();

View file

@ -1,16 +1,16 @@
MockRenderer = function() {
this.container = document.createElement("div");
this.cursor = {
row: 0,
column: 0
}
row : 0,
column : 0
};
this.visibleRowCount = 20;
this.layerConfig = {
firstVisibleRow: 0,
lastVisibleRow: this.visibleRowCount,
}
firstVisibleRow : 0,
lastVisibleRow : this.visibleRowCount
};
};
@ -41,18 +41,22 @@ MockRenderer.prototype.updateCursor = function(position) {
MockRenderer.prototype.scrollCursorIntoView = function() {
if (this.cursor.row < this.layerConfig.firstVisibleRow) {
this.scrollToRow(this.cursor.row);
} else if (this.cursor.row > this.layerConfig.lastVisibleRow) {
}
else if (this.cursor.row > this.layerConfig.lastVisibleRow) {
this.scrollToRow(this.cursor.row);
}
};
MockRenderer.prototype.scrollToRow = function(row) {
var row = Math.min(this.lines.length - this.visibleRowCount, Math.max(0, row));
var row = Math.min(this.lines.length - this.visibleRowCount, Math.max(0,
row));
this.layerConfig.firstVisibleRow = row;
this.layerConfig.lastVisibleRow = row + this.visibleRowCount;
}
};
MockRenderer.prototype.draw = function() {
};
MockRenderer.prototype.addMarker = function() {
};

View file

@ -47,5 +47,37 @@ var NavigationTest = TestCase("NavigationTest", {
editor.navigateFileStart();
assertEquals(0, editor.getFirstVisibleRow());
},
"test: move selection lead to end of file" : function() {
var editor = new ace.Editor(this.createTextDocument(200, 10),
new MockRenderer());
editor.moveCursorTo(100, 5);
editor.selectFileEnd();
var selection = editor.getSelectionRange();
assertEquals(100, selection.start.row);
assertEquals(5, selection.start.column);
assertEquals(199, selection.end.row);
assertEquals(10, selection.end.column);
},
"test: move selection lead to start of file" : function() {
var editor = new ace.Editor(this.createTextDocument(200, 10),
new MockRenderer());
editor.moveCursorTo(100, 5);
editor.selectFileStart();
var selection = editor.getSelectionRange();
assertEquals(0, selection.start.row);
assertEquals(0, selection.start.column);
assertEquals(100, selection.end.row);
assertEquals(5, selection.end.column);
}
});