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>

1 files changed, 118 insertions, 117 deletions

diff --git a/js/components/popup-manager.reel/popup-manager.js b/js/components/popup-manager.reel/popup-manager.js
index 07a07806..e7acf174 100755
--- a/js/components/popup-manager.reel/popup-manager.js
+++ b/js/components/popup-manager.reel/popup-manager.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
@@ -30,144 +31,144 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =                   require("montage/core/core").Montage,
-        Component =             require("montage/ui/component").Component,
-        Popup =                         require("js/components/popup.reel").Popup;
+var Montage =           require("montage/core/core").Montage,
+    Component =         require("montage/ui/component").Component,
+    Popup =             require("js/components/popup.reel").Popup;
 ////////////////////////////////////////////////////////////////////////
 //Exporting as PopupManager
 exports.PopupManager = Montage.create(Component, {
-        ////////////////////////////////////////////////////////////////////
-        //
+    ////////////////////////////////////////////////////////////////////
+    //
     deserializedFromTemplate: {
-        value: function () {
-                //Setting styles to popup container
-                this.element.style.zIndex = this._getNextHighestZindex(document.body); // Highest z-index in body
-                this.element.style.position = 'absolute';
-                this.element.style.top = 0;
-                this.element.style.left = 0;
-                this.element.style.width = '100%';
-                this.element.style.height = '100%';
-                //Allowing mouse events to pass through this layer
-                this.element.style.pointerEvents = 'none';
-        }
+        value: function () {
+            //Setting styles to popup container
+            this.element.style.zIndex = this._getNextHighestZindex(document.body); // Highest z-index in body
+            this.element.style.position = 'absolute';
+            this.element.style.top = 0;
+            this.element.style.left = 0;
+            this.element.style.width = '100%';
+            this.element.style.height = '100%';
+            //Allowing mouse events to pass through this layer
+            this.element.style.pointerEvents = 'none';
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //Adding the popup object
     addPopup: {
-        enumerable: true,
-        value: function (popup, depth, blackout) {
-                //Fix to ensure always highest
-                this.element.style.zIndex = this._getNextHighestZindex(document.body); // Highest z-index in body
-                //TODO: Add blackout background
-                //Checking for manual or setting auto to next highest depth
-                if (depth) {
-                        popup.style.zIndex = depth;
-                } else {
-                        popup.style.zIndex = this._getNextHighestZindex(this.element);
-                }
-                //Adding pointer events (inherits none)
-                popup.style.pointerEvents = 'auto';
+        enumerable: true,
+        value: function (popup, depth, blackout) {
+            //Fix to ensure always highest
+            this.element.style.zIndex = this._getNextHighestZindex(document.body); // Highest z-index in body
+            //TODO: Add blackout background
+            //Checking for manual or setting auto to next highest depth
+            if (depth) {
+                popup.style.zIndex = depth;
+            } else {
+                popup.style.zIndex = this._getNextHighestZindex(this.element);
+            }
+            //Adding pointer events (inherits none)
+            popup.style.pointerEvents = 'auto';
             this.element.appendChild(popup);
-                //TODO: Test further (perhaps defined in CSS)
-                popup.style.opacity = 0;
-                popup.style.webkitTransitionProperty = 'opacity';
-                popup.style.webkitTransitionDuration = '150ms';
-                //TODO: Fix animation hack
-                if (popup.style.webkitTransitionDuration) {
-                        setTimeout(function () {popup.style.opacity = 1}.bind(this), parseInt(popup.style.webkitTransitionDuration));
-                } else {
-                        popup.style.opacity = 1;
-                }
-        }
+            //TODO: Test further (perhaps defined in CSS)
+            popup.style.opacity = 0;
+            popup.style.webkitTransitionProperty = 'opacity';
+            popup.style.webkitTransitionDuration = '150ms';
+            //TODO: Fix animation hack
+            if (popup.style.webkitTransitionDuration) {
+                setTimeout(function () {popup.style.opacity = 1}.bind(this), parseInt(popup.style.webkitTransitionDuration));
+            } else {
+                popup.style.opacity = 1;
+            }
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //Removing the popup object
     removePopup: {
-        enumerable: true,
-        value: function (popup) {
-                popup.style.opacity = 0;
-                //TODO: Fix animation hack
-                if (popup.style && popup.style.webkitTransitionDuration) {
-                        setTimeout(function () {this.element.removeChild(popup)}.bind(this), parseInt(popup.style.webkitTransitionDuration));
-                } else {
-                        this.element.removeChild(popup);
-                }
-        }
+        enumerable: true,
+        value: function (popup) {
+            popup.style.opacity = 0;
+            //TODO: Fix animation hack
+            if (popup.style && popup.style.webkitTransitionDuration) {
+                setTimeout(function () {this.element.removeChild(popup)}.bind(this), parseInt(popup.style.webkitTransitionDuration));
+            } else {
+                this.element.removeChild(popup);
+            }
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //Swapping first with second object
     swapPopup: {
-        enumerable: true,
-        value: function (first, second) {
-                var f = first.style.zIndex, s = second.style.zIndex;
-                //Setting after storing values
-                first.style.zIndex = s;
-                second.style.zIndex = f;
-        }
+        enumerable: true,
+        value: function (first, second) {
+            var f = first.style.zIndex, s = second.style.zIndex;
+            //Setting after storing values
+            first.style.zIndex = s;
+            second.style.zIndex = f;
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //Setting Popup to highest z-index
     bringToFrontPopup: {
-        enumerable: true,
-        value: function (popup) {
-                popup.style.zIndex = this._getNextHighestZindex(this.element);
-        }
+        enumerable: true,
+        value: function (popup) {
+            popup.style.zIndex = this._getNextHighestZindex(this.element);
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
     createPopup: {
-        enumerable: true,
-        value: function (content, position, tooltip) {
-                //Creating container for Popup
-                var container = document.createElement('div');
-                var pop = Popup.create();
-                //Setting container and content
-                pop.element = container;
-                pop.content = content;
-                //Checking for optional parameters
+        enumerable: true,
+        value: function (content, position, tooltip) {
+            //Creating container for Popup
+            var container = document.createElement('div');
+            var pop = Popup.create();
+            //Setting container and content
+            pop.element = container;
+            pop.content = content;
+            //Checking for optional parameters