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>

2 files changed, 11 insertions, 7 deletions

diff --git a/js/models/color-model.js b/js/models/color-model.js
index 764feeb5..a2eab2e1 100755
--- a/js/models/color-model.js
+++ b/js/models/color-model.js
@@ -231,10 +231,10 @@ exports.ColorModel = Montage.create(Component, {
     //
     applyNoColor: {
         enumerable: true,
-        value: function () {
+        value: function (code) {
                 //
                 var nocolor = {};
-                nocolor.wasSetByCode = true;
+                nocolor.wasSetByCode = code;
                 nocolor.type = 'change';
                 this.updateColorSelected('nocolor', nocolor);
         }
@@ -310,29 +310,29 @@ exports.ColorModel = Montage.create(Component, {
                         case 'hex':
                                 switch (color.length) {
                                         case 1:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                         case 2:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                         case 3:
                                                 color = color[0]+color[0]+color[1]+color[1]+color[2]+color[2];
                                                 break;
                                         case 4:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                         case 5:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                         case 6:
                                                 //Nothing
                                                 break;
                                         default:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                 }
diff --git a/js/models/element-model.js b/js/models/element-model.js
index 76f15b21..e5a0f33a 100755
--- a/js/models/element-model.js
+++ b/js/models/element-model.js
@@ -91,6 +91,8 @@ var elementNameToController = function(name) {
         return "block";
     } else if(name === "img") {
         return "image";
+    } else if(name === "embed") {
+        return "image";
     } else {
         return name;
     }
@@ -174,6 +176,8 @@ var elmo = exports.ElementModel = Montage.create(Montage, {
                 return "block";
             } else if(name === "img") {
                 return "image";
+            } else if(name === "embed") {
+                return "image";
             } else {
                 return name;
             }