From 58b07496e616fe1c05c7f8e47ba97a7368b0ea88 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 12 Jun 2012 16:30:43 -0700
Subject: IKNINJA-1675 - Cannot resize SVG using free transform tool.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/models/element-model.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'js/models')

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;
             }
-- 
cgit v1.2.3


From fbd9d2492aeaef392ad59792825b8757d6c363fc Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 15 Jun 2012 15:14:34 -0700
Subject: Fixing apply 'no color'

This should fix canvas and standard DOM elements including the root (body or template wrapper).
---
 js/models/color-model.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'js/models')

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;
     				}
-- 
cgit v1.2.3