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/testMultiAttr.js b/imports/codemirror/mode/xquery/test/testMultiAttr.js
new file mode 100644
index 00000000..8e98c47d
--- /dev/null
+++ b/imports/codemirror/mode/xquery/test/testMultiAttr.js
@@ -0,0 +1,16 @@
+  $(document).ready(function(){
+    module("testMultiAttr");
+    test("test1", function() {
+      expect(1);
+
+      var expected = '<span class="cm-tag">&lt;p </span><span class="cm-attribute">a1</span>=<span class="cm-string">"foo"</span> <span class="cm-attribute">a2</span>=<span class="cm-string">"bar"</span><span class="cm-tag">&gt;</span><span class="cm-word">hello</span> <span class="cm-word">world</span><span class="cm-tag">&lt;/p&gt;</span>';
+
+      $("#sandbox").html('<textarea id="editor"></textarea>');
+      $("#editor").html('<p a1="foo" a2="bar">hello world</p>');
+      var editor = CodeMirror.fromTextArea($("#editor")[0]);
+      var result = $(".CodeMirror-lines div div pre")[0].innerHTML;
+
+       equal(result, expected);
+       $("#editor").html("");
+    });
+  });
\ No newline at end of file