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

3 files changed, 19 insertions, 16 deletions

diff --git a/imports/codemirror/mode/properties/index.html b/imports/codemirror/mode/properties/index.html
index 3df6a3ae..4f0c269c 100755
--- a/imports/codemirror/mode/properties/index.html
+++ b/imports/codemirror/mode/properties/index.html
@@ -5,7 +5,6 @@
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
     <script src="properties.js"></script>
-    <link rel="stylesheet" href="properties.css">
     <style>.CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}</style>
     <link rel="stylesheet" href="../../doc/docs.css">
   </head>
@@ -34,7 +33,8 @@ spaces\ in\ keys=Not very common...
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
     </script>
 
-    <p><strong>MIME types defined:</strong> <code>text/x-properties</code>.</p>
+    <p><strong>MIME types defined:</strong> <code>text/x-properties</code>,
+    <code>text/x-ini</code>.</p>
 
   </body>
 </html>
diff --git a/imports/codemirror/mode/properties/properties.css b/imports/codemirror/mode/properties/properties.css
deleted file mode 100755
index d975375c..00000000
--- a/imports/codemirror/mode/properties/properties.css
+++ /dev/null
@@ -1,3 +0,0 @@
-span.cm-key {color: #00c;}
-span.cm-equals {color: #a11;}
-span.cm-value {color: #170;}
diff --git a/imports/codemirror/mode/properties/properties.js b/imports/codemirror/mode/properties/properties.js
index 2529505b..d3a13c76 100755
--- a/imports/codemirror/mode/properties/properties.js
+++ b/imports/codemirror/mode/properties/properties.js
@@ -1,21 +1,23 @@
 CodeMirror.defineMode("properties", function() {
   return {
     token: function(stream, state) {
-      var sol = stream.sol();
+      var sol = stream.sol() || state.afterSection;
       var eol = stream.eol();
 
+      state.afterSection = false;
+
       if (sol) {
         if (state.nextMultiline) {
           state.inMultiline = true;
           state.nextMultiline = false;
         } else {
-          state.position = "key";
+          state.position = "def";
         }
       }
 
       if (eol && ! state.nextMultiline) {
         state.inMultiline = false;
-        state.position = "key";
+        state.position = "def";
       }
 
       if (sol) {
@@ -24,16 +26,18 @@ CodeMirror.defineMode("properties", function() {
 
       var ch = stream.next();
 
-      if (sol && (ch === "#" || ch === "!")) {
+      if (sol && (ch === "#" || ch === "!" || ch === ";")) {
         state.position = "comment";
         stream.skipToEnd();
         return "comment";
-
+      } else if (sol && ch === "[") {
+        state.afterSection = true;
+        stream.skipTo("]"); stream.eat("]");
+        return "header";
       } else if (ch === "=" || ch === ":") {
-        state.position = "value";
-        return "equals";
-
-      } else if (ch === "\\" && state.position === "value") {
+        state.position = "quote";
+        return null;
+      } else if (ch === "\\" && state.position === "quote") {
         if (stream.next() !== "u") {    // u = Unicode sequence \u1234
           // Multiline value
           state.nextMultiline = true;
@@ -45,9 +49,10 @@ CodeMirror.defineMode("properties", function() {
 
     startState: function() {
       return {
-        position : "key",       // Current position, "key", "value" or "comment"
+        position : "def",       // Current position, "def", "quote" or "comment"
         nextMultiline : false,  // Is the next line multiline value
-        inMultiline : false     // Is the current line a multiline value
+        inMultiline : false,    // Is the current line a multiline value
+        afterSection : false    // Did we just open a section
       };
     }
 
@@ -55,3 +60,4 @@ CodeMirror.defineMode("properties", function() {
 });
 
 CodeMirror.defineMIME("text/x-properties", "properties");
+CodeMirror.defineMIME("text/x-ini", "properties");