Merge branch 'refs/heads/master' into binding

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/document/document-html.js
	js/document/templates/app/main.js
	js/panels/Panel.reel/Panel.js
	node_modules/montage/ui/native-control.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/js/panels/color/colortoolbar.reel/colortoolbar.js b/js/panels/color/colortoolbar.reel/colortoolbar.js
index 6b8e476b..bf4d307f 100755
--- a/js/panels/color/colortoolbar.reel/colortoolbar.js
+++ b/js/panels/color/colortoolbar.reel/colortoolbar.js
@@ -108,7 +108,7 @@ exports.ColorToolbar = Montage.create(Component, {
                         color.mode = e._event.colorMode;
                         this.application.ninja.colorController.colorModel[e._event.colorMode] = color;
                 } else {
-                        this.application.ninja.colorController.colorModel.applyNoColor();
+                        this.application.ninja.colorController.colorModel.applyNoColor(false);
                 }
                 this.application.ninja.colorController.colorModel.input = 'chip';
                 }.bind(this));
@@ -125,7 +125,7 @@ exports.ColorToolbar = Montage.create(Component, {
                     color.mode = e._event.colorMode;
                         this.application.ninja.colorController.colorModel[e._event.colorMode] = color;
                         } else {
-                                this.application.ninja.colorController.colorModel.applyNoColor();
+                                this.application.ninja.colorController.colorModel.applyNoColor(false);
                         }
                 this.application.ninja.colorController.colorModel.input = 'chip';
             }.bind(this));