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, 91 insertions, 0 deletions

diff --git a/imports/codemirror/mode/xquery/test/testNamespaces.js b/imports/codemirror/mode/xquery/test/testNamespaces.js
new file mode 100644
index 00000000..4efea63e
--- /dev/null
+++ b/imports/codemirror/mode/xquery/test/testNamespaces.js
@@ -0,0 +1,91 @@
+$(document).ready(function(){
+  module("test namespaces");
+
+// --------------------------------------------------------------------------------
+// this test is based on this:
+//http://mbrevoort.github.com/CodeMirror2/#!exprSeqTypes/PrologExpr/VariableProlog/ExternalVariablesWith/K2-ExternalVariablesWith-10.xq
+// --------------------------------------------------------------------------------
+  test("test namespaced variable", function() {
+    expect(1);
+
+    var input = 'declare namespace e = "http://example.com/ANamespace";\
+declare variable $e:exampleComThisVarIsNotRecognized as element(*) external;';
+
+    var expected = '<span class="cm-keyword">declare</span> <span class="cm-keyword">namespace</span> <span class="cm-word">e</span> <span class="cm-keyword">=</span> <span class="cm-string">"http://example.com/ANamespace"</span><span class="cm-word">;declare</span> <span class="cm-keyword">variable</span> <span class="cm-variable">$e:exampleComThisVarIsNotRecognized</span> <span class="cm-keyword">as</span> <span class="cm-keyword">element</span>(<span class="cm-keyword">*</span>) <span class="cm-word">external;</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("");
+  });
+
+
+// --------------------------------------------------------------------------------
+// this test is based on:
+// http://mbrevoort.github.com/CodeMirror2/#!Basics/EQNames/eqname-002.xq  
+// --------------------------------------------------------------------------------
+  test("test EQName variable", function() {
+    expect(1);
+
+    var input = 'declare variable $"http://www.example.com/ns/my":var := 12;\
+<out>{$"http://www.example.com/ns/my":var}</out>';
+
+    var expected = '<span class="cm-keyword">declare</span> <span class="cm-keyword">variable</span> <span class="cm-variable">$"http://www.example.com/ns/my":var</span> <span class="cm-keyword">:=</span> <span class="cm-atom">12</span><span class="cm-word">;</span><span class="cm-tag">&lt;out&gt;</span>{<span class="cm-variable">$"http://www.example.com/ns/my":var</span>}<span class="cm-tag">&lt;/out&gt;</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("");
+  });
+
+// --------------------------------------------------------------------------------
+// this test is based on:
+// http://mbrevoort.github.com/CodeMirror2/#!Basics/EQNames/eqname-003.xq
+// --------------------------------------------------------------------------------
+  test("test EQName function", function() {
+    expect(1);
+
+    var input = 'declare function "http://www.example.com/ns/my":fn ($a as xs:integer) as xs:integer {\
+   $a + 2\
+};\
+<out>{"http://www.example.com/ns/my":fn(12)}</out>';
+
+    var expected = '<span class="cm-keyword">declare</span> <span class="cm-keyword">function</span> <span class="cm-variable cm-def">"http://www.example.com/ns/my":fn</span> (<span class="cm-variable">$a</span> <span class="cm-keyword">as</span> <span class="cm-atom">xs:integer</span>) <span class="cm-keyword">as</span> <span class="cm-atom">xs:integer</span> {   <span class="cm-variable">$a</span> <span class="cm-keyword">+</span> <span class="cm-atom">2</span>}<span class="cm-word">;</span><span class="cm-tag">&lt;out&gt;</span>{<span class="cm-variable cm-def">"http://www.example.com/ns/my":fn</span>(<span class="cm-atom">12</span>)}<span class="cm-tag">&lt;/out&gt;</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("");
+  });
+
+// --------------------------------------------------------------------------------
+// this test is based on:
+// http://mbrevoort.github.com/CodeMirror2/#!Basics/EQNames/eqname-003.xq
+// --------------------------------------------------------------------------------
+  test("test EQName function with single quotes", function() {
+    expect(1);
+
+    var input = 'declare function \'http://www.example.com/ns/my\':fn ($a as xs:integer) as xs:integer {\
+   $a + 2\
+};\
+<out>{\'http://www.example.com/ns/my\':fn(12)}</out>';
+
+    var expected = '<span class="cm-keyword">declare</span> <span class="cm-keyword">function</span> <span class="cm-variable cm-def">\'http://www.example.com/ns/my\':fn</span> (<span class="cm-variable">$a</span> <span class="cm-keyword">as</span> <span class="cm-atom">xs:integer</span>) <span class="cm-keyword">as</span> <span class="cm-atom">xs:integer</span> {   <span class="cm-variable">$a</span> <span class="cm-keyword">+</span> <span class="cm-atom">2</span>}<span class="cm-word">;</span><span class="cm-tag">&lt;out&gt;</span>{<span class="cm-variable cm-def">\'http://www.example.com/ns/my\':fn</span>(<span class="cm-atom">12</span>)}<span class="cm-tag">&lt;/out&gt;</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("");
+  });
+
+});
+
+