Merge branch 'timeline-local' into timeline-multiselect

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

1 files changed, 16 insertions, 0 deletions

diff --git a/imports/codemirror/mode/xquery/test/testEmptySequenceKeyword.js b/imports/codemirror/mode/xquery/test/testEmptySequenceKeyword.js
new file mode 100644
index 00000000..39ed0905
--- /dev/null
+++ b/imports/codemirror/mode/xquery/test/testEmptySequenceKeyword.js
@@ -0,0 +1,16 @@
+$(document).ready(function(){
+  module("testEmptySequenceKeyword");
+  test("testEmptySequenceKeyword", function() {
+    expect(1);
+
+    var input = '"foo" instance of empty-sequence()';
+    var expected = '<span class="cm-string">"foo"</span> <span class="cm-keyword">instance</span> <span class="cm-keyword">of</span> <span class="cm-keyword">empty-sequence</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("");
+  });
+});