13 files changed, 102 insertions, 164 deletions

diff --git a/js/clipboard/external-apps-clipboard-agent.js b/js/clipboard/external-apps-clipboard-agent.js
index 65410543..b82784d3 100644
--- a/js/clipboard/external-apps-clipboard-agent.js
+++ b/js/clipboard/external-apps-clipboard-agent.js
@@ -148,16 +148,12 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
             data = htmlData ? htmlData : textData;
 
             if (data && data.length) {
-                //deselect current selections
-                this.application.ninja.selectedElements.length = 0;
-                NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": true} );
-
                 divWrapper = document.application.njUtils.make("div", null, this.application.ninja.currentDocument);
                 this.application.ninja.elementMediator.addElements(divWrapper, {"height": "68px",
                                                                                 "left": "0px",
                                                                                 "position": "absolute",
                                                                                 "top": "0px",
-                                                                                "width": "161px"}, false);
+                                                                                "width": "161px"}, false/*notify*/, false/*callAddDelegate*/);
 
                 divWrapper.innerHTML = data;
 
diff --git a/js/controllers/clipboard-controller.js b/js/controllers/clipboard-controller.js
index c3543c95..3eba1bec 100644
--- a/js/controllers/clipboard-controller.js
+++ b/js/controllers/clipboard-controller.js
@@ -82,16 +82,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused except the copy menu button
             if(document.activeElement.nodeName !== "BODY") {
-                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                if(!(document.activeElement.getAttribute("data-montage-id") === "menuItemButton")) {
                     return;
                 }
             }
 
-            //perform clipboard operations only if selection tool is selected
-            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
-                return;
-            }
-
             if(this.clipboardContext === "stage"){
                 ElementsClipboardAgent.copy(clipboardEvent);
             }
@@ -106,16 +101,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused
             if(document.activeElement.nodeName !== "BODY") {
-                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                if(!(document.activeElement.getAttribute("data-montage-id") === "menuItemButton")) {
                     return;
                 }
             }
 
-            //perform clipboard operations only if selection tool is selected
-            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
-                return;
-            }
-
             if(this.clipboardContext === "stage"){
                 ElementsClipboardAgent.cut(clipboardEvent);
             }
@@ -137,16 +127,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused
             if(document.activeElement.nodeName !== "BODY") {
-                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                if(!(document.activeElement.getAttribute("data-montage-id") === "menuItemButton")) {
                     return;
                 }
             }
 
-            //perform clipboard operations only if selection tool is selected
-            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
-                return;
-            }
-
             //TODO: return if stage is not focussed
 
             if(this.clipboardContext === "stage"){
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 1d945066..6dabff47 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -841,10 +841,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                                         child.strokeMat = "Linear Gradient";
                                     }
                                 }
-                                else if( (child.strokeMat === "Radial Gradient") ||
+                                else if( !child.strokeMat || (child.strokeMat === "Radial Gradient") ||
                                          (child.strokeMat === "Linear Gradient") )
                                 {
-                                    // Set Flat Material for children geometry if color has been changed to solid
+                                    // Set Flat Material for children geometry if no material defined or color has been changed to solid
                                     child.strokeMat = "Flat";
                                 }
                             }
@@ -863,10 +863,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                                         child.fillMat = "Linear Gradient";
                                     }
                                 }
-                                else if( (child.fillMat === "Radial Gradient") ||
+                                else if( !child.fillMat || (child.fillMat === "Radial Gradient") ||
                                          (child.fillMat === "Linear Gradient") )
                                 {
-                                    // Set Flat Material for children geometry if color has been changed to solid
+                                    // Set Flat Material for children geometry if no material defined or color has been changed to solid
                                     child.fillMat = "Flat";
                                 }
                             }
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index ba47603b..4995c2cb 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -83,31 +83,13 @@ exports.Circle = Object.create(GeomObj, {
 
             if(strokeMaterial) {
                 this._strokeMaterial = strokeMaterial.dup();
-            } else {
-                this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
-            }
-
-            if(strokeColor) {
-                if(this._strokeMaterial.hasProperty("color")) {
-                    this._strokeMaterial.setProperty( "color",  this._strokeColor );
-                } else if (this._strokeMaterial && (this._strokeMaterial.gradientType === this._strokeColor.gradientMode)) {
-                    this._strokeMaterial.setGradientData(this._strokeColor.color);
-                }
             }
 
             if(fillMaterial) {
                 this._fillMaterial = fillMaterial.dup();
-            } else {
-                this._fillMaterial = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() ).dup();
             }
 
-            if(fillColor) {
-                if(this._fillMaterial.hasProperty("color")) {
-                    this._fillMaterial.setProperty( "color",  this._fillColor );
-                } else if (this._fillMaterial && (this._fillMaterial.gradientType === this._fillColor.gradientMode)) {
-                    this._fillMaterial.setGradientData(this._fillColor.color);
-        }
-            }
+            this.initColors();
         }
     },
 
@@ -770,8 +752,8 @@ exports.Circle = Object.create(GeomObj, {
                 'fillColor'     : this._fillColor,
                 'innerRadius'   : this._innerRadius,
                 'strokeStyle'   : this._strokeStyle,
-                'strokeMat'     : this._strokeMaterial ? this._strokeMaterial.getName() :  MaterialsModel.getDefaultMaterialName(),
-                'fillMat'       : this._fillMaterial ?  this._fillMaterial.getName() :  MaterialsModel.getDefaultMaterialName(),
+                'strokeMat'     : this._strokeMaterial ? this._strokeMaterial.getName() :  null,
+                'fillMat'       : this._fillMaterial ?  this._fillMaterial.getName() :  null,
                 'materials'     : this.exportMaterialsJSON()
             };
 
@@ -790,27 +772,26 @@ exports.Circle = Object.create(GeomObj, {
             this._fillColor         = jObj.fillColor;
             this._innerRadius       = jObj.innerRadius;
             this._strokeStyle       = jObj.strokeStyle;
-            var strokeMaterialName  = jObj.strokeMat;
-            var fillMaterialName    = jObj.fillMat;
 
-            var strokeMat = MaterialsModel.getMaterial( strokeMaterialName ).dup();
-            if (!strokeMat) {
-                console.log( "object material not found in library: " + strokeMaterialName );
-                strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() ).dup();
+            if(jObj.strokeMat) {
+                var strokeMat = MaterialsModel.getMaterial(jObj.strokeMat).dup();
+                if (!strokeMat) {
+                    console.log("object material not found in library: " + jObj.strokeMat);
+                } else {
+                    this._strokeMaterial = strokeMat;
+