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-06-06 18:43:44 +02:00
commit e649e9fdcc
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ace/keyboard/state_handler.js
View file

@ -140,11 +140,11 @@ StateHandler.prototype = {
}
// If there is a command to execute, then figure out the
// comand and the arguments.
// command and the arguments.
if (binding.exec) {
result.command = binding.exec;
// Bulid the arguments.
// Build the arguments.
if (binding.params) {
var value;
result.args = {};

2
lib/ace/mode/behaviour/cstyle.js
View file

@ -186,7 +186,7 @@ var CstyleBehaviour = function () {
}
// Try and be smart about when we auto insert.
if (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1))) {
if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf('"') === token.value.length-1)))) {
return {
text: '""',
selection: [1,1]

6
lib/ace/mode/html_highlight_rules.js
View file

@ -131,7 +131,7 @@ var HtmlHighlightRules = function() {
}, {
token : "text",
regex : "\\s+"
}].concat(string("css")),
}].concat(string("style")),
tag : [ {
token : "text",
@ -145,8 +145,8 @@ var HtmlHighlightRules = function() {
regex : "\\s+"
}].concat(string("tag")),
"css-qstring": multiLineString("'", "css"),
"css-qqstring": multiLineString('"', "css"),
"style-qstring": multiLineString("'", "style"),
"style-qqstring": multiLineString('"', "style"),
"script-qstring": multiLineString("'", "script"),
"script-qqstring": multiLineString('"', "script"),
"tag-qstring": multiLineString("'", "tag"),