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, 0 deletions

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index d6f2bc56..ec0335b4 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -122,6 +122,7 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
             }
             else
             {
+                // TODO - Need to update border style and width also
                 el.elementModel.stroke = colorObj;
             }
 
@@ -166,10 +167,22 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
                         case 'gradient':
                             this.setProperty(el, "border-image", color.color.css);
                             this.setProperty(el, "border-color", "none");
+                            if(color.borderInfo)
+                            {
+                                this.setProperty(el, "border-width", color.borderInfo.borderWidth +
+                                                                        color.borderInfo.borderUnits);
+                                this.setProperty(el, "border-style", color.borderInfo.borderStyle);
+                            }
                             break;
                         default:
                             this.setProperty(el, "border-image", "none");
                             this.setProperty(el, "border-color", color.color.css);
+                            if(color.borderInfo)
+                            {
+                                this.setProperty(el, "border-width", color.borderInfo.borderWidth +
+                                                                        color.borderInfo.borderUnits);
+                                this.setProperty(el, "border-style", color.borderInfo.borderStyle);
+                            }
                     }
                 }
                 el.elementModel.stroke = color;