Skip to content

Commit

Permalink
Merge pull request #1742 from hartman/commas
Browse files Browse the repository at this point in the history
Remove trailing comma's, which break scripts in IE7
  • Loading branch information
nightwing committed Dec 31, 2013
2 parents 6e46195 + 1240a04 commit a9d1948
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/ace/ext/themelist.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ var themeData = [
["Tomorrow Night Bright","tomorrow_night_bright" , "dark"],
["Tomorrow Night 80s" ,"tomorrow_night_eighties" , "dark"],
["Twilight" ,"twilight" , "dark"],
["Vibrant Ink" ,"vibrant_ink" , "dark"],
["Vibrant Ink" ,"vibrant_ink" , "dark"]
]


Expand Down
2 changes: 1 addition & 1 deletion lib/ace/mode/sjs_highlight_rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ var SJSHighlightRules = function() {
token: "paren.lparen",
regex: '{',
next: "string_interp"
}),
})
].concat(embeddableRules);

// backtick strings can have single interpolation, which accept
Expand Down

0 comments on commit a9d1948

Please sign in to comment.