Skip to content

Commit 086772b

Browse files
committed
Merge pull request #2526 from ajaxorg/ace_update
[Liskov] Update ace and add new modes
2 parents a63a837 + 023d169 commit 086772b

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545

4646
"mappings": {
47-
"ace": ["npm", "https://github.com/ajaxorg/ace/tarball/3bc87268c88e60d83570c0a7b775b8496d49f419"],
47+
"ace": ["npm", "https://github.com/ajaxorg/ace/tarball/cc2a2c9e056c6d4049f8849ec3ad72974de37177"],
4848
"apf": ["npm", "https://github.com/ajaxorg/apf/tarball/2d17e74d9457dd841112532c1ea8d84eb82bee31"],
4949
"asyncjs": ["npm", "https://github.com/ajaxorg/async.js/tarball/0b4ed5608a32c280a7690b5f52883d8d1fc0de08"],
5050
"v8debug": ["npm", "https://github.com/ajaxorg/lib-v8debug/tarball/d2fac9b09724cb2e75e2807191eace9bc27d3b52"],

plugins-client/ext.code/code.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ apf.actiontracker.actions.aceupdate = function(undoObj, undo){
4343

4444
// name: ["Menu caption", "extensions", "content-type", "hidden|other"]
4545
var SupportedModes = {
46+
abap: ["ABAP", "abap", "text/x-abap", "other"],
4647
asciidoc: ["AsciiDoc", "asciidoc", "text/x-asciidoc", "other"],
4748
c9search: ["C9Search", "c9search", "text/x-c9search", "hidden"],
4849
c_cpp: ["C, C++", "c|cc|cpp|cxx|h|hh|hpp", "text/x-c"],
@@ -51,26 +52,26 @@ var SupportedModes = {
5152
coldfusion: ["ColdFusion", "cfm", "text/x-coldfusion", "other"],
5253
csharp: ["C#", "cs", "text/x-csharp"],
5354
css: ["CSS", "css", "text/css"],
54-
dart: ["Dart", "dart", "text/x-dart"],
55-
diff: ["Diff", "diff|patch", "text/x-diff", "other"],
56-
glsl: ["Glsl", "glsl|frag|vert", "text/x-glsl", "other"],
55+
dart: ["Dart", "dart", "text/x-dart"],
56+
diff: ["Diff", "diff|patch", "text/x-diff", "other"],
57+
glsl: ["Glsl", "glsl|frag|vert", "text/x-glsl", "other"],
5758
golang: ["Go", "go", "text/x-go"],
5859
groovy: ["Groovy", "groovy", "text/x-groovy", "other"],
5960
haml: ["Haml", "haml", "text/haml", "other"],
6061
haxe: ["haXe", "hx", "text/haxe", "other"],
6162
html: ["HTML", "htm|html|xhtml", "text/html"],
62-
jade: ["Jade", "jade", "text/x-jade"],
63+
jade: ["Jade", "jade", "text/x-jade"],
6364
java: ["Java", "java", "text/x-java-source"],
64-
jsp: ["JSP", "jsp", "text/x-jsp", "other"],
65+
jsp: ["JSP", "jsp", "text/x-jsp", "other"],
6566
javascript: ["JavaScript", "js", "application/javascript"],
6667
json: ["JSON", "json", "application/json"],
67-
jsx: ["JSX", "jsx", "text/x-jsx", "other"],
68+
jsx: ["JSX", "jsx", "text/x-jsx", "other"],
6869
latex: ["LaTeX", "latex|tex|ltx|bib", "application/x-latex", "other"],
6970
less: ["LESS", "less", "text/x-less"],
7071
lisp: ["Lisp", "lisp|scm|rkt", "text/x-lisp", "other"],
7172
liquid: ["Liquid", "liquid", "text/x-liquid", "other"],
7273
lua: ["Lua", "lua", "text/x-lua"],
73-
luapage: ["LuaPage" , "lp", "text/x-luapage", "other"],
74+
luapage: ["LuaPage", "lp", "text/x-luapage", "other"],
7475
makefile: ["Makefile", "*GNUmakefile|*makefile|*Makefile|*OCamlMakefile|make", "text/x-makefile", "other"],
7576
markdown: ["Markdown", "md|markdown", "text/x-markdown", "other"],
7677
objectivec: ["Objective-C", "m", "text/objective-c", "other"],
@@ -80,6 +81,9 @@ var SupportedModes = {
8081
php: ["PHP", "php|phtml", "application/x-httpd-php"],
8182
powershell: ["Powershell", "ps1", "text/x-script.powershell", "other"],
8283
python: ["Python", "py", "text/x-script.python"],
84+
r: ["R" , "r", "text/x-r", "other"],
85+
rdoc: ["RDoc" , "Rd", "text/x-rdoc", "other"],
86+
rhtml:["RHTML", "Rhtml", "text/x-rhtml", "other"],
8387
ruby: ["Ruby", "ru|gemspec|rake|rb", "text/x-script.ruby"],
8488
scad: ["OpenSCAD", "scad", "text/x-scad", "other"],
8589
scala: ["Scala", "scala", "text/x-scala"],
@@ -88,7 +92,7 @@ var SupportedModes = {
8892
stylus: ["Stylus", "styl|stylus", "text/x-stylus"],
8993
sql: ["SQL", "sql", "text/x-sql"],
9094
svg: ["SVG", "svg", "image/svg+xml", "other"],
91-
tcl: ["Tcl" , "tcl", "text/x-tcl", "other"],
95+
tcl: ["Tcl", "tcl", "text/x-tcl", "other"],
9296
text: ["Text", "txt", "text/plain", "hidden"],
9397
textile: ["Textile", "textile", "text/x-web-textile", "other"],
9498
typescript: ["Typescript", "ts|str", "text/x-typescript"],

plugins-client/ext.main/style/skins.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12921,7 +12921,7 @@
1292112921
.ace_one-line .ace_cursor {
1292212922
border-left-width: 1px;
1292312923
}
12924-
.ace_one-line .ace_cursor.ace_hidden {
12924+
.ace_one-line .ace_hidden-cursors {
1292512925
opacity: 0;
1292612926
}
1292712927
.ace_one-line .ace_scroller {

0 commit comments

Comments
 (0)