Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal

Conflicts:
	js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
	js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

38 files changed, 5487 insertions, 4675 deletions

diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 1406ad98..cfb7ef07 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -39,7 +40,7 @@ var Montage = require("montage/core/core").Montage,
 exports.NJUtils = Montage.create(Component, {
 
     /* =============== DOM Access ================ */
-    
+
     ///// Quick "getElementById"
     $ : {
         value: function(id, doc) {
@@ -47,7 +48,7 @@ exports.NJUtils = Montage.create(Component, {
             return doc.getElementById(id);
         }
     },
-    
+
     ///// Quick "getElementsByClassName" which also returns as an Array
     ///// Can return as NodeList by passing true as second argument
     $$ : {
@@ -57,7 +58,7 @@ exports.NJUtils = Montage.create(Component, {
             return (asNodeList) ? list : this.toArray(list);
         }
     },
-    
+
     ///// Get child nodes of element
     ///// Omit filter to only return element nodes
     ///// Pass in filter function to minimize collection, or
@@ -65,14 +66,14 @@ exports.NJUtils = Montage.create(Component, {
     children : {
         value : function(el, filter) {
             var f = filter || function(item) {
-                        return item.nodeType === 1;
-                };
-                return this.toArray(el.childNodes).filter(f);
+                return item.nodeType === 1;
+            };
+            return this.toArray(el.childNodes).filter(f);
         }
     },
-    
+
      /* ============= DOM Manipulation ============= */
-    
+
     ///// Creates and returns text node from string
     textNode : {
         value: function(text) {
@@ -95,7 +96,7 @@ exports.NJUtils = Montage.create(Component, {
             return el;
         }
     },
-    
+
     decor: {
         value: function(el, attr) {
             if (typeof attr === 'object') {
@@ -183,56 +184,56 @@ exports.NJUtils = Montage.create(Component, {
             return node;
         }
     },
-    
+
     queryParentSelector : {
-        value: function(el, strSelector) {
-                        // queryParentSelector:
-                        // Given a DOM element el (required), walk up the DOM tree
-                        // and find the first parent that matches selector strSelector (required).
-                        // Returns: The element that matches, or false if there is no match
-                        // or if insufficient parameters are supplied.
-                        
-                        if ((typeof(el) === "undefined") || (typeof(strSelector) === "undefined")) {
-                                // Parameters are required, m'kay?
-                                return false;
-                        } else if ((typeof(el) !== "object") || (typeof(strSelector) !== "string" )) {
-                                // You also have to use the right parameters.
-                                return false;
-                        }
-                        
-                        // First, get an empty clone of the parent.
-                        var myParent = el.parentNode;
-                        var clone = myParent.cloneNode(false);
-                        if (clone === null) {
-                                return false;
-                        }
-                        
-                        // If we're at the top of the DOM, our clone will be an htmlDocument.
-                        // htmlDocument has no tagName.
-                        if (typeof(clone.tagName) !== "undefined") {
-                                // create a bogus div to use as a base for querySelector
-                                var temp = document.createElement("div");
-                                
-                                // Append the clone to the bogus div
-                                temp.appendChild(clone);
-                                
-                                // Now we can use querySelector!  Sweet.
-                                var selectorTest = temp.querySelector(strSelector);
-                                
+        value: function(el, strSelector) {
+            // queryParentSelector:
+            // Given a DOM element el (required), walk up the DOM tree
+            // and find the first parent that matches selector strSelector (required).
+            // Returns: The element that matches, or false if there is no match
+            // or if insufficient parameters are supplied.
+
+            if ((typeof(el) === "undefined") || (typeof(strSelector) === "undefined")) {
+                // Parameters are required, m'kay?
+                return false;
+            } else if ((typeof(el) !== "object") || (typeof(strSelector) !== "string" )) {
+                // You also have to use the right parameters.
+                return false;
+            }
+
+            // First, get an empty clone of the parent.
+            var myParent = el.parentNode;
+            var clone = myParent.cloneNode(false);
+            if (clone === null) {
+                return false;
+            }
+
+            // If we're at the top of the DOM, our clone will be an htmlDocument.
+            // htmlDocument has no tagName.
+            if (typeof(clone.tagName) !== "undefined") {
+                // create a bogus div to use as a base for querySelector
+                var temp = document.createElement("div");
+
+                // Append the clone to the bogus div
+                temp.appendChild(clone);
+
+                // Now we can use querySelector!  Sweet.
+                var selectorTest = temp.querySelector(strSelector);
+