Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/components/tools-properties/brush-properties.reel/brush-properties.html
	js/components/tools-properties/fill-properties.reel/fill-properties.html
	js/components/tools-properties/pen-properties.reel/pen-properties.html
	js/components/tools-properties/pencil-properties.reel/pencil-properties.html
	js/components/tools-properties/selection-properties.reel/selection-properties.html
	js/components/tools-properties/shape-properties.reel/shape-properties.html
	js/components/tools-properties/tag-properties.reel/tag-properties.html
	js/components/tools-properties/text-properties.reel/text-properties.html

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("");
+  });
+});