Merge branch 'timeline-local' into timeline-multiselect

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	resolved using theirs. (selectLayers)

1 files changed, 19 insertions, 0 deletions

diff --git a/imports/codemirror/mode/xquery/test/testQuotes.js b/imports/codemirror/mode/xquery/test/testQuotes.js
new file mode 100644
index 00000000..79e5142d
--- /dev/null
+++ b/imports/codemirror/mode/xquery/test/testQuotes.js
@@ -0,0 +1,19 @@
+  $(document).ready(function(){
+    module("testQuoteEscape");
+    test("testQuoteEscapeDouble", function() {
+      expect(1);
+
+      var input = 'let $rootfolder := "c:\\builds\\winnt\\HEAD\\qa\\scripts\\"\
+let $keysfolder := concat($rootfolder, "keys\\")\
+return\
+$keysfolder';
+      var expected = '<span class="cm-keyword">let</span> <span class="cm-variable">$rootfolder</span> <span class="cm-keyword">:=</span> <span class="cm-string">"c:\\builds\\winnt\\HEAD\\qa\\scripts\\"</span><span class="cm-keyword">let</span> <span class="cm-variable">$keysfolder</span> <span class="cm-keyword">:=</span> <span class="cm-variable cm-def">concat</span>(<span class="cm-variable">$rootfolder</span>, <span class="cm-string">"keys\\"</span>)<span class="cm-word">return$keysfolder</span>';
+
+      $("#sandbox").html('<textarea id="editor">' + input + '</textarea>');
+      var editor = CodeMirror.fromTextArea($("#editor")[0]);
+      var result = $(".CodeMirror-lines div div pre")[0].innerHTML;
+
+       equal(result, expected);
+       $("#editor").html("");
+    });
+  });