From 619fd9bd93f9c4736702d59c123df4282b332576 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Mon, 4 Jun 2012 09:49:24 +0200 Subject: [PATCH 1/3] Update textmate theme for meta tag. --- lib/ace/theme/textmate.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ace/theme/textmate.css b/lib/ace/theme/textmate.css index dafb9fa1..70793692 100644 --- a/lib/ace/theme/textmate.css +++ b/lib/ace/theme/textmate.css @@ -157,9 +157,9 @@ } .ace-tm .ace_meta.ace_tag { - color:rgb(0, 50, 198); + color:rgb(0, 22, 42); } .ace-tm .ace_string.ace_regex { color: rgb(255, 0, 0) -} \ No newline at end of file +} From 6c7465892b9912ae47ec4445df70b00550bf2450 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Mon, 4 Jun 2012 09:53:35 +0200 Subject: [PATCH 2/3] Update textmate theme. --- lib/ace/theme/textmate.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ace/theme/textmate.css b/lib/ace/theme/textmate.css index 70793692..87f66f1c 100644 --- a/lib/ace/theme/textmate.css +++ b/lib/ace/theme/textmate.css @@ -157,7 +157,7 @@ } .ace-tm .ace_meta.ace_tag { - color:rgb(0, 22, 42); + color:rgb(0, 22, 142); } .ace-tm .ace_string.ace_regex { From 447ba1418ce7d7d00d3a8e8f4ed84b94539ae224 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Fri, 13 Jul 2012 20:31:59 +0200 Subject: [PATCH 3/3] Disable buggy XQuery behavior. --- lib/ace/mode/behaviour/xquery.js | 62 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/lib/ace/mode/behaviour/xquery.js b/lib/ace/mode/behaviour/xquery.js index e5fb7b6b..dfe17de7 100644 --- a/lib/ace/mode/behaviour/xquery.js +++ b/lib/ace/mode/behaviour/xquery.js @@ -28,39 +28,39 @@ define(function(require, exports, module) { this.inherit(CstyleBehaviour, ["braces", "parens", "string_dquotes"]); // Get string behaviour this.parent = parent; - this.add("brackets", "insertion", function (state, action, editor, session, text) { - if (text == "\n") { - var cursor = editor.getCursorPosition(); - var line = session.doc.getLine(cursor.row); - var rightChars = line.substring(cursor.column, cursor.column + 2); - if (rightChars == ' 0 && line.charAt(cursor.column - 1) == "<") { - line = line.substring(0, cursor.column) + "/" + line.substring(cursor.column); - var lines = session.doc.getAllLines(); - lines[cursor.row] = line; - // call mode helper to close the tag if possible - parent.exec("closeTag", lines.join(session.doc.getNewLineCharacter()), cursor.row); - } - } - return false; - }); +// this.add("slash", "insertion", function (state, action, editor, session, text) { +// if (text == "/") { +// var cursor = editor.getCursorPosition(); +// var line = session.doc.getLine(cursor.row); +// if (cursor.column > 0 && line.charAt(cursor.column - 1) == "<") { +// line = line.substring(0, cursor.column) + "/" + line.substring(cursor.column); +// var lines = session.doc.getAllLines(); +// lines[cursor.row] = line; +// // call mode helper to close the tag if possible +// parent.exec("closeTag", lines.join(session.doc.getNewLineCharacter()), cursor.row); +// } +// } +// return false; +// }); } oop.inherits(XQueryBehaviour, Behaviour);