2 files changed, 102 insertions, 69 deletions

diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
index 596580b4..d3b6fed7 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
@@ -52,7 +52,7 @@
                                 
                                 </div>
                         
-                        <div data-montage-id="input_hex" class="cp_pu_hex">#<input class="cp_pu_hottext_hex" maxlength="6" /></div>
+                        <div class="cp_pu_hex">#<input data-montage-id="input_hex" class="cp_pu_hottext_hex" maxlength="6" /></div>
                         
                         <button data-montage-id="btn_wheel" class="cp_pu_wheel" title="Color Wheel">Color Wheel</button>
                         <button data-montage-id="btn_images" class="cp_pu_images" title="Background Image">Images</button>
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
index 192c62fb..b8261f26 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
@@ -32,17 +32,6 @@ exports.ColorPanelPopup = Montage.create(Component, {
         set: function(value) {if (value !== this._colorManager) this._colorManager = value;}
     },
     ////////////////////////////////////////////////////////////////////
-    //Storing color panel
-    _colorPanel: {
-        value: false
-    },
-    ////////////////////////////////////////////////////////////////////
-    //Color panel
-    colorPanel: {
-        get: function() {return this._colorPanel;},
-        set: function(value) {this._colorPanel = value;}
-    },
-    ////////////////////////////////////////////////////////////////////
     //
     _components: {
                 value: null  
@@ -52,6 +41,10 @@ exports.ColorPanelPopup = Montage.create(Component, {
     setNoColor: {
         value: function (code) {
                 if (this.colorManager) this.colorManager.applyNoColor(code);
+                //
+                if (!code && !this.props.panel) {
+                        this.dispatchEvent({type: 'change', wasSetByCode: code, mode: 'nocolor', value: null});
+                }
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -60,7 +53,7 @@ exports.ColorPanelPopup = Montage.create(Component, {
         value: function () {
                 //
                 this._components = null;
-                this._components = {wheel: null, combo: null};
+                this._components = {wheel: null, combo: null, gradient: null, hex: null};
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -85,7 +78,7 @@ exports.ColorPanelPopup = Montage.create(Component, {
                 }
                         });
                         //
-                        if (this.application.ninja.colorController.colorView) {
+                        if (this.application.ninja.colorController.colorView && this.props.panel) {
                         Object.defineBinding(this._components.combo.slider, "value", {
                                 boundObject: this.application.ninja.colorController.colorView._combo[3].slider,
                             boundObjectPropertyPath: "value",
@@ -129,44 +122,73 @@ exports.ColorPanelPopup = Montage.create(Component, {
     draw: {
         value: function() {
                 //
-                this.drawPalette(this.defaultPalette);
+                if (!this.props || (this.props && this.props.palette)) {
+                        //
+                        this.btnPalette.addEventListener('click', function () {
+                                        this.popupSwitchInputTo(this.palettes);
+                                }.bind(this), true);
+                        //
+                        this.drawPalette(this.defaultPalette, this.colorManager);
+                } else {
+                        this.btnPalette.style.display = 'none';
+                }
                 //
-                if (!this.colorManager.gradient) {
-                        this.drawGradient(this.defaultGradient);
+                if (!this.props || (this.props && this.props.gradient)) {
+                        //
+                        this.btnGradient.addEventListener('click', function () {
+                                        this.popupSwitchInputTo(this.gradients);
+                                }.bind(this), true);
+                        //
+                        if (!this.colorManager.gradient) {
+                                this.drawGradient(this.defaultGradient);
+                        }
+                } else {
+                        this.btnGradient.style.display = 'none';
                 }
                 //
-                this.application.ninja.colorController.colorView.addButton('hexinput', this.element.getElementsByClassName('cp_pu_hottext_hex')[0]);
+                this._components.hex = this.application.ninja.colorController.colorView.addButton('hexinput', this.inputHex, this.colorManager);
                 //
                 this._components.combo.slider.needsDraw = true;
                 this._components.combo.hottext.needsDraw = true;
-                        //
-                        this.element.getElementsByClassName('cp_pu_nocolor')[0].addEventListener('click', function () {
-                                this.setNoColor();
-                }.bind(this), true);
-                //
-                this.element.getElementsByClassName('cp_pu_palettes')[0].addEventListener('click', function () {
-                                this.popupSwitchInputTo(this.palettes);
-                }.bind(this), true);
-                //
-                this.element.getElementsByClassName('cp_pu_wheel')[0].addEventListener('click', function () {
-                                this.popupSwitchInputTo(this.wheel);
-                }.bind(this), true);
-                //
-                this.element.getElementsByClassName('cp_pu_gradients')[0].addEventListener('click', function () {
-                                this.popupSwitchInputTo(this.gradients);
-                }.bind(this), true);
-                //
-                this.element.getElementsByClassName('cp_pu_images')[0].style.opacity = .2;//TODO: Remove, visual feedback for disable button
-                this.element.getElementsByClassName('cp_pu_images')[0].addEventListener('click', function () {
-                                //this.popupSwitchInputTo(this.images);
-                }.bind(this), true);
+                //
+                if (!this.props || (this.props && this.props.nocolor)) {
+                                //
+                                this.btnNocolor.addEventListener('click', function () {
+                                        this.setNoColor(false);
+                                }.bind(this), true);
+                } else {
+                        this.btnNocolor.style.display = 'none';
+                }
                 //
-                this.application.ninja.colorController.colorView.addButton('current', this.element.getElementsByClassName('cp_pu_color_current')[0]);
-                this.application.ninja.colorController.colorView.addButton('previous', this.element.getElementsByClassName('cp_pu_color_previous')[0]);
+                if (!this.props || (this.props && this.props.wheel)) {
+                        //
+                        this.btnWheel.addEventListener('click', function () {
+                                        this.popupSwitchInputTo(this.wheel);
+                                }.bind(this), true);
+                                //
+                                this._components.wheel.addEventListener('firstDraw', this, false);
+                                this._components.wheel.needsDraw = true;
+                } else {
+                        this.btnWheel.style.display = 'none';
+                }
                 //
-                this._components.wheel.addEventListener('firstDraw', this, false);
+                if (!this.props || (this.props && this.props.image)) {
+                        //
+                        this.btnImage.style.opacity = .2;//TODO: Remove, visual feedback for disable button
+                        this.btnImage.addEventListener('click', function () {
+                                        //this.popupSwitchInputTo(this.images);
+                                }.bind(this), true);
+                } else {
+                        this.btnImage.style.display = 'none';
+                }
                 //
-                this._components.wheel.needsDraw = true;
+                if (!this.props || (this.props && this.props.history)) {
+                        this.application.ninja.colorController.colorView.addButton('current', this.btnCurrent);
+                        this.application.ninja.colorController.colorView.addButton('previous', this.btnPrevious);
+                } else {
+                        this.btnCurrent.style.display = 'none';
+                        this.btnPrevious.style.display = 'none';
+                }
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -202,7 +224,7 @@ exports.ColorPanelPopup = Montage.create(Component, {
                                 break
                 }
                 //Checking for a gradient to be current color
-                if (this.colorManager.gradient) {
+                if (this.colorManager.gradient && (!this.props || (this.props && this.props.gradient))) {
                         if (this.colorManager.colorHistory[this.colorManager.input] && this.colorManager.colorHistory[this.colorManager.input][this.colorManager.colorHistory[this.colorManager.input].length-1].m !== 'gradient') {
                                 //If no gradient set, using default
                                 this.drawGradient(this.defaultGradient);
@@ -253,11 +275,13 @@ exports.ColorPanelPopup = Montage.create(Component, {
                 if (tab !== this.gradients) {
                         this.gradients.style.display = 'none';
                         //
-                        if (this._components.wheel._value) {
+                        /*
+if (this._components.wheel._value) {
                                 this._components.wheel.value = {h: this._components.wheel._value.h, s: this._components.wheel._value.s, v: this._components.wheel._value.v, wasSetByCode: false};