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

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 142 insertions, 142 deletions

diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index c5c614ea..8be2421f 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -27,16 +27,16 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
- 
+
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =                   require("montage/core/core").Montage,
-    Component =                 require("montage/ui/component").Component,
-    ColorModel =                require("js/models/color-model").ColorModel,
-    ColorPanelBase =            require("js/panels/Color/colorpanelbase.reel").ColorPanelBase,
-    ElementsMediator =          require("js/mediators/element-mediator").ElementMediator,
-    ColorPopupManager =         require("js/panels/Color/colorpopup-manager").ColorPopupManager,
-    ColorButtonManager =        require("js/panels/Color/colorbutton-manager").ColorButtonManager;
+var Montage =               require("montage/core/core").Montage,
+    Component =             require("montage/ui/component").Component,
+    ColorModel =            require("js/models/color-model").ColorModel,
+    ColorPanelBase =        require("js/panels/Color/colorpanelbase.reel").ColorPanelBase,
+    ElementsMediator =      require("js/mediators/element-mediator").ElementMediator,
+    ColorPopupManager =     require("js/panels/Color/colorpopup-manager").ColorPopupManager,
+    ColorButtonManager =    require("js/panels/Color/colorbutton-manager").ColorButtonManager;
 ////////////////////////////////////////////////////////////////////////
 //Exporting as ColorController
 exports.ColorController = Montage.create(Component, {
@@ -48,14 +48,14 @@ exports.ColorController = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     deserializedFromTemplate: {
-        value: function () {
-                //Setting up colorManager in other classes
-                this.colorPanelBase.colorManager = this.colorModel;
-                this.colorPopupManager.colorManager = this.colorModel;
-                this.colorButtonManager.colorManager = this.colorModel;
-                //Listening for color changes
-                this.colorModel.addEventListener('change', this, false);
-        }
+        value: function () {
+            //Setting up colorManager in other classes
+            this.colorPanelBase.colorManager = this.colorModel;
+            this.colorPopupManager.colorManager = this.colorModel;
+            this.colorButtonManager.colorManager = this.colorModel;
+            //Listening for color changes
+            this.colorModel.addEventListener('change', this, false);
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
@@ -90,7 +90,7 @@ exports.ColorController = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     _popupTab: {
-        value: 'wheel'
+        value: 'wheel'
     },
     ////////////////////////////////////////////////////////////////////
     //
@@ -131,7 +131,7 @@ exports.ColorController = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     _fill: {
-        value: null
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
     //
@@ -142,7 +142,7 @@ exports.ColorController = Montage.create(Component, {
     ////////////////////////////////////////////////////////////////////
     //
     _stroke: {
-        value: null
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
     //
@@ -154,16 +154,16 @@ exports.ColorController = Montage.create(Component, {
     //
     getBackground: {
         value: function (element) {
-                //TODO: Return object with all background properties
-                console.log(ElementsMediator.getProperty(element, 'background-color'));
-                console.log(ElementsMediator.getProperty(element, 'background-image'));
+            //TODO: Return object with all background properties
+            console.log(ElementsMediator.getProperty(element, 'background-color'));
+            console.log(ElementsMediator.getProperty(element, 'background-image'));
         }
     },
     ////////////////////////////////////////////////////////////////////
     //
     getBorder: {
         value: function (element) {
-                
+
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -189,14 +189,14 @@ exports.ColorController = Montage.create(Component, {
     //
     handleChange: {
         value: function (e) {
-                //
+            //
             var color, input = e._event.input, panelMode, mode = e._event.mode;
             if (this.colorView) {
-                panelMode = this.colorView.panelMode;
+                panelMode = this.colorView.panelMode;
             }
             //
             if (mode === 'nocolor') {
-                color = {value: null, css: 'none'};
+                color = {value: null, css: 'none'};
             } else if (panelMode === 'rgb' && e._event.rgba && mode !== 'gradient') {
                 color = e._event.rgba;
                 color.webGlColor = e._event.webGlColor;
@@ -206,7 +206,7 @@ exports.ColorController = Montage.create(Component, {
             } else if (mode !== 'gradient'){
                 color = {value: e._event.hex, css: '#'+e._event.hex};
             } else if (mode === 'gradient'){
-                color = e._event.value.value;
+                color = e._event.value.value;
             }
             color.mode = panelMode;
             color.wasSetByCode = true;
@@ -215,15 +215,15 @@ exports.ColorController = Montage.create(Component, {
             ////////////////////////////////////////////////////////////
             //
             if (input === 'fill') {
-                //
-                this.fill = color;
+                //
+                this.fill = color;
                 //
                 if(e._event.wasSetByCode) return;
-                //
+                //
                 this.setColor(mode, color, true);
             } else if (input === 'stroke') {
-                //
-                this.stroke = color;
+                //
+                this.stroke = color;
                 //
                 if(e._event.wasSetByCode) return;
 
@@ -237,93 +237,93 @@ exports.ColorController = Montage.create(Component, {
     //Converts CSS to a color object to be used by the color model
     getColorObjFromCss: {
         value: function (css) {
-                //
-                var color, arr, i, j, temp, c, gradient;
-                //console.log(css.indexOf('-webkit'), css);
-                if (css && css.indexOf('-webkit') >= 0) {
-                        //
-                        gradient = {mode: null, stops: null};
-                        //Checking for gradient type
-                        if (css.indexOf('-webkit-radial-gradient') >= 0) {
-                                //Radial gradient
-                                gradient.stops = [];
-                                gradient.mode = 'radial';
-                                gradient.gradientMode = 'radial';
-                                gradient.css = css;
-                                //
-                                arr = css.split('%,');
-                                //
-                                for (j=1; arr[j]; j++) {
-                                        //TODO: Add HSL support
-                                        if (arr[j].indexOf('rgb') >= 0 && arr[j].indexOf('rgba') < 0) {
-                                        temp = arr[j].split('rgb');
-                                        temp = temp[1].replace(/\(/i, "");
-                                        temp = temp.split(')');
-                                        c = this.parseCssToColor('rgb('+temp[0]+')');
-                                        gradient.stops.push({css: c.css, value: c.value, mode: c.mode, position: parseInt(temp[1].replace(/\%/i, ""))});
-                                } else if (css.indexOf('rgba') >= 0) {
-                                        
-                                        temp = arr[j].split('rgba');
-                                        temp = temp[1].replace(/\(/i, "");
+            //
+            var color, arr, i, j, temp, c, gradient;
+            //console.log(css.indexOf('-webkit'), css);
+            if (css && css.indexOf('-webkit') >= 0) {
+                //
+                gradient = {mode: null, stops: null};
+                //Checking for gradient type
+                if (css.indexOf('-webkit-radial-gradient') >= 0) {
+                    //Radial gradient
+                    gradient.stops = [];
+                    gradient.mode = 'radial';
+                    gradient.gradientMode = 'radial';
+                    gradient.css = css;
+                    //
+                    arr = css.split('%,');
+                    //
+                    for (j=1; arr[j]; j++) {
+                        //TODO: Add HSL support
+                        if (arr[j].indexOf('rgb') >= 0 && arr[j].indexOf('rgba') < 0) {
+                            temp = arr[j].split('rgb');
+                            temp = temp[1].replace(/\(/i, "");
+                            temp = temp.split(')');
+                            c = this.parseCssToColor('rgb('+temp[0]+')');
+                            gradient.stops.push({css: c.css, value: c.value, mode: c.mode, position: parseInt(temp[1].replace(/\%/i, ""))});
+                        } else if (css.indexOf('rgba') >= 0) {
+
+                            temp = arr[j].split('rgba');
+                            temp = temp[1].replace(/\(/i, "");