Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 452 insertions, 187 deletions

diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index 4667f2b4..eb026aac 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -8,8 +8,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 //
 var Montage =                   require("montage/core/core").Montage,
         Component =                     require("montage/ui/component").Component,
-        ColorChipPopup =        require("js/panels/Color/colorchippopup.reel").ColorChipPopup,
-        ColorPanelPopup =       require("js/panels/Color/colorpanelpopup.reel").ColorPanelPopup;
+        ColorPanelPopup =       require("js/panels/Color/colorpanelpopup.reel").ColorPanelPopup,
+        ColorModel =        require("js/models/color-model").ColorModel;
 ////////////////////////////////////////////////////////////////////////
 //Exporting as ColorPopupManager
 exports.ColorPopupManager = Montage.create(Component, {
@@ -20,138 +20,195 @@ exports.ColorPopupManager = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
     //
-    _hasInit: {
-        value: false
+    _hasCloseEvents: {
+                value: false  
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    addCloseEvents: {
+        value: function () {
+                //
+                this._hasCloseEvents = true;
+                ////////////////////////////////////////////////////////////
+            //Closing popups on resize
+            window.addEventListener('resize', this, false);
+            //Closing popups if outside limits
+            document.addEventListener('mousedown', this, false);
+            ////////////////////////////////////////////////////////////
+        }
     },
     ////////////////////////////////////////////////////////////////////
     //
-    init: {
-        enumerable: false,
+    removeCloseEvents: {
         value: function () {
+                //
+                this._hasCloseEvents = false;
                 ////////////////////////////////////////////////////////////
             //Closing popups on resize
-            window.addEventListener('resize', function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //Storing limits of popup
-            var top, bottom, left, right; 
+            window.removeEventListener('resize', this, false);
             //Closing popups if outside limits
-            document.addEventListener('mousedown', function (e) {
-                //Checking for popup to be opened otherwise nothing happens
-                if (this._popupPanel.opened && this._popupPanel.popup && this._popupPanel.popup.element && !e._event.srcElement.inputType) {
-                        //Getting horizontal limits     
-                        left = parseInt(this._popupPanel.popup.element.style.left) + parseInt(this._popupPanel.popup.element.style.marginLeft);
-                        right = left + parseInt(this._popupPanel.popup.element.offsetWidth);
-                        //Getting vertical limits
-                        top = parseInt(this._popupPanel.popup.element.style.top) + parseInt(this._popupPanel.popup.element.style.marginTop);
-                        bottom = left + parseInt(this._popupPanel.popup.element.offsetHeight);
-                        //Checking click position in relation to limits
-                        if ((e._event.clientX < left || e._event.clientX > right) || (e._event.clientY < top || e._event.clientY > bottom)) {
-                                //Hides popups since click is outside limits
-                                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-                        }
-                }
-            }.bind(this));
+            document.removeEventListener('mousedown', this, false);
             ////////////////////////////////////////////////////////////
         }
     },
     ////////////////////////////////////////////////////////////////////
     //
-    _popupPanel: {
-        enumerable: false,
-        value: {}
+    handleMousedown: {
+                value: function (e) {
+                        //
+                        this.closeAllPopups(e);
+                }  
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    handleResize: {
+                value: function (e) {
+                        //
+                        this.hideColorPopup();
+                }  
     },
     ////////////////////////////////////////////////////////////////////
     //
-    _popupChip: {
-        enumerable: false,
-        value: {}
+    closeAllPopups: {
+                value: function (e) {
+                        //
+                if (this._popupBase && !this._popupChipBase && !this._popupGradientChipBase) {
+                        if(!this.popupHitCheck(this._popupBase, e)) {
+                        this.hideColorPopup();
+                        }
+                } else if (!this._popupBase && this._popupChipBase && !this._popupGradientChipBase) {
+                if(!this.popupHitCheck(this._popupChipBase, e)) {
+                        this.hideColorChipPopup();
+                        }
+                } else if (this._popupBase && this._popupChipBase && !this._popupGradientChipBase) {
+                if(!this.popupHitCheck(this._popupBase, e) && !this.popupHitCheck(this._popupChipBase, e)) {
+                        this.hideColorPopup();
+                        }
+                } else if (this._popupBase && this._popupChipBase && this._popupGradientChipBase) {
+                if(!this.popupHitCheck(this._popupBase, e) && !this.popupHitCheck(this._popupChipBase, e) && !this.popupHitCheck(this._popupGradientChipBase, e)) {
+                        this.hideColorPopup();
+                        }
+                } else if (!this._popupBase && this._popupChipBase && this._popupGradientChipBase) {
+                if(!this.popupHitCheck(this._popupChipBase, e) && !this.popupHitCheck(this._popupGradientChipBase, e)) {
+                        this.hideColorChipPopup();
+                        }
+                } else if (this._popupBase && !this._popupChipBase && this._popupGradientChipBase) {
+                if(!this.popupHitCheck(this._popupBase, e) && !this.popupHitCheck(this._popupGradientChipBase, e)) {
+                        this.hideColorPopup();
+                        }
+                }
+                }  
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    popupHitCheck: {
+                value: function (element, e) {
+                        //Prevent any action for button to handle toggling
+                        if (e._event.target.inputType || e._event.target.colorMode) return true;
+                        //Storing limits of popup 
+                        var top, bottom, left, right;
+                        //Checking for popup to be opened otherwise nothing happens
+                        if (element && element.opened && element.popup && element.popup.element) {
+                //Getting horizontal limits     
+                left = parseInt(element.popup.element.style.left) + parseInt(element.popup.element.style.marginLeft);
+                right = left + parseInt(element.popup.element.offsetWidth);
+                //Getting vertical limits
+                top = parseInt(element.popup.element.style.top) + parseInt(element.popup.element.style.marginTop);
+                bottom = top + parseInt(element.popup.element.offsetHeight);
+                //Checking click position in relation to limits
+                if ((e._event.clientX < left || e._event.clientX > right) || (e._event.clientY < top || e._event.clientY > bottom)) {
+                        //Hides popups since click is outside limits
+                        return false;
+                } else {
+                        //Keeps popup open since click inside area
+                        return true;
+                }
+            } else {
+                //Hides popups since element not detected
+                    return false;
+            }
+                }  
     },
     ////////////////////////////////////////////////////////////////////
     //
     _popupBase: {
-        enumerable: false,
         value: null
     },
     ////////////////////////////////////////////////////////////////////
     //
     _popupChipBase: {
-        enumerable: false,
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _popupChipBtn: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _popupGradientChipBase: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    _popupGradientChipBtn: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
     //Storing color manager
     _colorManager: {
-        enumerable: false,
         value: null
     },
     ////////////////////////////////////////////////////////////////////
     //
     colorManager: {
-        enumerable: true,
+        get: function() {return this._colorManager;},