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

Merge branch 'master' of github.com:ajaxorg/ace

Browse source
This commit is contained in:
Fabian Jakobs 2011-02-08 09:16:26 +01:00
commit faec023507
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ace/keyboard/keybinding/default_mac.js
View file

@ -75,8 +75,10 @@ exports.bindings = {
"gotoright": "Right", "gotoright": "Right",
"selectpagedown": "Shift-PageDown", "selectpagedown": "Shift-PageDown",
"pagedown": "PageDown", "pagedown": "PageDown",
"gotopagedown": "Option-PageDown",
"selectpageup": "Shift-PageUp", "selectpageup": "Shift-PageUp",
"pageup": "PageUp", "pageup": "PageUp",
"gotopageup": "Option-PageUp",
"selectlinestart": "Shift-Home", "selectlinestart": "Shift-Home",
"selectlineend": "Shift-End", "selectlineend": "Shift-End",
"del": "Delete", "del": "Delete",

4
lib/ace/keyboard/keybinding/default_win.js
View file

@ -74,9 +74,9 @@ exports.bindings = {
"selectright": "Shift-Right", "selectright": "Shift-Right",
"gotoright": "Right", "gotoright": "Right",
"selectpagedown": "Shift-PageDown", "selectpagedown": "Shift-PageDown",
"pagedown": "PageDown", "gotopagedown": "PageDown",
"selectpageup": "Shift-PageUp", "selectpageup": "Shift-PageUp",
"pageup": "PageUp", "gotopageup": "PageUp",
"selectlinestart": "Shift-Home", "selectlinestart": "Shift-Home",
"selectlineend": "Shift-End", "selectlineend": "Shift-End",
"del": "Delete", "del": "Delete",

9
lib/ace/tokenizer.js
View file

@ -74,11 +74,8 @@ var Tokenizer = function(rules) {
var type = "text"; var type = "text";
var value = match[0]; var value = match[0];
if (re.lastIndex == lastIndex) { throw new Error("tokenizer error"); }
lastIndex = re.lastIndex;
for ( var i = 0; i < state.length; i++) { for ( var i = 0; i < state.length; i++) {
if (match[i + 1]) { if (match[i + 1] !== undefined) {
if (typeof state[i].token == "function") { if (typeof state[i].token == "function") {
type = state[i].token(match[0]); type = state[i].token(match[0]);
} }
@ -110,6 +107,10 @@ var Tokenizer = function(rules) {
} else { } else {
token.value += value; token.value += value;
} }
if (lastIndex == line.length) {
break;
}
lastIndex = re.lastIndex;
}; };
if (token.type) { if (token.type) {