Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	js/document/html-document.js
	js/helper-classes/3D/snap-manager.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 13 insertions, 1 deletions

diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index e3b15f1c..a6e41dd3 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -322,7 +322,19 @@ exports.ColorController = Montage.create(Component, {
                         //Simple solid color
                         color = this.parseCssToColor(css);
                 }
-                //Returning color object (or null if none)
+            // TODO - Hack for inconsistent color object -- some workflows set color.color and some color.value
+            if(color)
+            {
+                if(color.value && !color.color)
+                {
+                    color.color = color.value;
+                }
+                else if(color.color && !color.value)
+                {
+                    color.value = color.color;
+                }
+            }
+            //Returning color object (or null if none)
                 return color;
         }
     },