Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed trailing commas that cause errors in IE #1361

Merged
merged 1 commit into from
Apr 8, 2013
Merged

Removed trailing commas that cause errors in IE #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/ace/mode/javascript_highlight_rules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Copyright (c) 2010, Ajax.org B.V.
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
Expand All @@ -14,7 +14,7 @@
* * Neither the name of Ajax.org B.V. nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
*
* 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
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
Expand Down Expand Up @@ -273,7 +273,7 @@ var JavaScriptHighlightRules = function() {
}, {
token: "constant.language.escape",
regex: "]",
next: "regex",
next: "regex"
}, {
token: "constant.language.escape",
regex: "-"
Expand Down
4 changes: 2 additions & 2 deletions lib/ace/snippets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ var SnippetManager = function() {
onMatch: function(val, state, stack) {
var ts = stack[0];
ts.fmtString = val;

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

Expand Down