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

Merge pull request #1361 from rgriffith/ie_fix

Browse source 
Removed trailing commas that cause errors in IE
This commit is contained in:
Harutyun Amirjanyan 2013-04-08 13:42:31 -07:00
commit 5f8f3bf925
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@
* *
* Copyright (c) 2010, Ajax.org B.V. * Copyright (c) 2010, Ajax.org B.V.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
@ -14,7 +14,7 @@
* * Neither the name of Ajax.org B.V. nor the * * Neither the name of Ajax.org B.V. nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@ -273,7 +273,7 @@ var JavaScriptHighlightRules = function() {
}, { }, {
token: "constant.language.escape", token: "constant.language.escape",
regex: "]", regex: "]",
next: "regex", next: "regex"
}, { }, {
token: "constant.language.escape", token: "constant.language.escape",
regex: "-" regex: "-"

4
lib/ace/snippets.js
View file

@ -99,7 +99,7 @@ var SnippetManager = function() {
onMatch: function(val, state, stack) { onMatch: function(val, state, stack) {
var ts = stack[0]; var ts = stack[0];
ts.fmtString = val; ts.fmtString = val;
val = this.splitRegex.exec(val); val = this.splitRegex.exec(val);
ts.guard = val[1]; ts.guard = val[1];
ts.fmt = val[2]; ts.fmt = val[2];
@ -764,7 +764,7 @@ var TabstopManager = function(editor) {
"!Return": function(ed) { "!Return": function(ed) {
//ed.tabstopManager.tabNext(1); //ed.tabstopManager.tabNext(1);
return false; return false;
}, }
}); });
}).call(TabstopManager.prototype); }).call(TabstopManager.prototype);