This commit is contained in:
Fabian Jakobs 2011-11-28 17:03:55 +01:00
commit 15f2ef3f80
25 changed files with 81 additions and 82 deletions

View file

@ -2157,7 +2157,7 @@ exports.addMouseWheelListener = function(el, callback) {
// some versions of Safari (e.g. 5.0.5) report insanely high
// scroll values. These browsers require a higher factor
if (Math.abs(e.wheelDeltaY) > max)
max = Math.abs(e.wheelDeltaY)
max = Math.abs(e.wheelDeltaY);
if (max > 5000)
var factor = 400;
@ -2300,7 +2300,7 @@ exports.addCommandKeyListener = function(el, callback) {
if (window.postMessage) {
var postMessageId = 1;
this.nextTick = function(callback, win) {
exports.nextTick = function(callback, win) {
win = win || window;
var messageName = "zero-timeout-message-" + postMessageId;
exports.addListener(win, "message", function listener(e) {
@ -2314,7 +2314,7 @@ if (window.postMessage) {
};
}
else {
this.nextTick = function(callback, win) {
exports.nextTick = function(callback, win) {
win = win || window;
window.setTimeout(callback, 0);
};
@ -10669,7 +10669,7 @@ define('ace/mode/coffee_highlight_rules', ['require', 'exports', 'module' , 'ace
regex : "(?:(?:\\.|::)\\s*)" + identifier
}, {
token : "variable",
regex : "@" + identifier
regex : "@(?:" + identifier + ")?"
}, {
token: function(value) {
if (keywords.hasOwnProperty(value))
@ -10733,15 +10733,15 @@ define('ace/mode/coffee_highlight_rules', ['require', 'exports', 'module' , 'ace
}, {
token : "punctuation.operator",
regex : "\\?|\\:|\\,|\\."
}, {
token : "keyword.operator",
regex : "(?:[\\-=]>|[-+*/%<>&|^!?=]=|>>>=?|\\-\\-|\\+\\+|::|&&=|\\|\\|=|<<=|>>=|\\?\\.|\\.{2,3}|\\!)"
}, {
token : "paren.lparen",
regex : "[({[]"
}, {
token : "paren.rparen",
regex : "[\\]})]"
}, {
token : "keyword.operator",
regex : "\\S+"
}, {
token : "text",
regex : "\\s+"
@ -11131,7 +11131,6 @@ oop.inherits(Mode, TextMode);
this.toggleCommentLines = function(state, doc, startRow, endRow) {
var outdent = true;
var outentedRows = [];
var re = /^(\s*)\/\//;
for (var i=startRow; i<= endRow; i++) {
@ -11170,7 +11169,7 @@ oop.inherits(Mode, TextMode);
}
if (state == "start" || state == "regex_allowed") {
var match = line.match(/^.*[\{\(\[\:]\s*$/);
var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
if (match) {
indent += tab;
}
@ -20686,7 +20685,7 @@ var TextInput = function(parentNode, host) {
var text = dom.createElement("textarea");
if (useragent.isTouchPad)
text.setAttribute("x-palm-disable-auto-cap", true);
text.setAttribute("x-palm-disable-auto-cap", true);
text.style.left = "-10000px";
parentNode.appendChild(text);
@ -20840,7 +20839,7 @@ var TextInput = function(parentNode, host) {
clipboardData.setData("Text", copyText);
host.onCut();
}
event.preventDefault(e)
event.preventDefault(e);
}
});
}
@ -20852,10 +20851,10 @@ var TextInput = function(parentNode, host) {
event.addListener(text, "compositionstart", onCompositionStart);
if (useragent.isGecko) {
event.addListener(text, "text", onCompositionUpdate);
};
}
if (useragent.isWebKit) {
event.addListener(text, "keyup", onCompositionUpdate);
};
}
event.addListener(text, "compositionend", onCompositionEnd);
event.addListener(text, "blur", function() {
@ -20879,7 +20878,7 @@ var TextInput = function(parentNode, host) {
function isFocused() {
return document.activeElement === text;
};
}
this.isFocused = isFocused;
this.getElement = function() {
@ -20893,12 +20892,12 @@ var TextInput = function(parentNode, host) {
text.style.cssText =
'position:fixed; z-index:1000;' +
'left:' + (mousePos.x - 2) + 'px; top:' + (mousePos.y - 2) + 'px;'
'left:' + (mousePos.x - 2) + 'px; top:' + (mousePos.y - 2) + 'px;';
}
if (isEmpty)
text.value='';
}
};
this.onContextMenuClose = function(){
setTimeout(function () {
@ -20908,7 +20907,7 @@ var TextInput = function(parentNode, host) {
}
sendText();
}, 0);
}
};
};
exports.TextInput = TextInput;
@ -21611,9 +21610,8 @@ var MouseEvent = exports.MouseEvent = function(domEvent, editor) {
*
* ***** END LICENSE BLOCK ***** */
define('ace/keyboard/keybinding', ['require', 'exports', 'module' , 'ace/lib/useragent', 'ace/lib/keys', 'ace/lib/event', 'ace/commands/default_commands'], function(require, exports, module) {
define('ace/keyboard/keybinding', ['require', 'exports', 'module' , 'ace/lib/keys', 'ace/lib/event', 'ace/commands/default_commands'], function(require, exports, module) {
var useragent = require("../lib/useragent");
var keyUtil = require("../lib/keys");
var event = require("../lib/event");
require("../commands/default_commands");
@ -21650,8 +21648,9 @@ var KeyBinding = function(editor) {
};
this.$callKeyboardHandlers = function (hashId, keyString, keyCode, e) {
var toExecute;
for (var i = this.$handlers.length; i--;) {
var toExecute = this.$handlers[i].handleKeyboard(
toExecute = this.$handlers[i].handleKeyboard(
this.$data, hashId, keyString, keyCode, e
);
if (toExecute && toExecute.command)
@ -21671,13 +21670,13 @@ var KeyBinding = function(editor) {
if (success && e)
event.stopEvent(e);
return success
return success;
};
this.handleKeyboard = function(data, hashId, keyString) {
return {
command: this.$editor.commands.findKeyCommand(hashId, keyString)
}
};
};
this.onCommandKey = function(e, hashId, keyCode) {
@ -21953,12 +21952,12 @@ exports.commands = [{
readOnly: true
}, {
name: "togglerecording",
bindKey: bindKey("Ctrl-Shift-E", "Ctrl-Shift-E"),
bindKey: bindKey("Ctrl-Alt-E", "Command-Option-E"),
exec: function(editor) { editor.commands.toggleRecording(); },
readOnly: true
}, {
name: "replaymacro",
bindKey: bindKey("Ctrl-E", "Ctrl-E"),
bindKey: bindKey("Ctrl-Shift-E", "Command-Shift-E"),
exec: function(editor) { editor.commands.replay(editor); },
readOnly: true
},

File diff suppressed because one or more lines are too long