Merge branch 'refs/heads/master' into stage-document-architecture

2 files changed, 21 insertions, 13 deletions

diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js
index 95c2e71d..960c19fa 100755
--- a/js/tools/InkBottleTool.js
+++ b/js/tools/InkBottleTool.js
@@ -84,14 +84,22 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, {
                                 };
                 }
 
-                colorInfo.borderInfo = { borderStyle:this.options._borderStyle.value,
-                                         borderWidth:this.options._borderWidth.value,
-                                         borderUnits:this.options._borderWidth.units
-                                       };
+                if(this.options.useBorderWidth.checked || this.options.useBorderStyle.checked) {
+                    colorInfo.borderInfo = {};
+                    if(this.options.useBorderWidth.checked) {
+                        colorInfo.borderInfo.borderWidth = this.options._borderWidth.value;
+                        colorInfo.borderInfo.borderUnits = this.options._borderWidth.units;
+                    }
+                    if(this.options.useBorderStyle.checked) {
+                        colorInfo.borderInfo.borderStyle = this.options._borderStyle.value;
+                    }
+                }
 
-                colorInfo.strokeInfo = { strokeSize:this.options._strokeSize.value,
-                                         strokeUnits:this.options._strokeSize.units
-                                       };
+                if(this.options.useStrokeSize.checked) {
+                    colorInfo.strokeInfo = {};
+                    colorInfo.strokeInfo.strokeSize = this.options._strokeSize.value;
+                    colorInfo.strokeInfo.strokeUnits = this.options._strokeSize.units;
+                }
 
                 ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, false, "Change", "inkBottleTool");
             }
diff --git a/js/tools/ToolBase.js b/js/tools/ToolBase.js
index 678d03ac..69ac5727 100755
--- a/js/tools/ToolBase.js
+++ b/js/tools/ToolBase.js
@@ -109,13 +109,13 @@ exports.toolBase = Montage.create(Component, {
         value:function(event){
             var upperBoundary ,previousZoomValue;
 
-            previousZoomValue = this.application.Ninja._documentBarRef.zoomFactor ;
+            previousZoomValue = this.application.ninja.documentBar.zoomFactor;
             upperBoundary = previousZoomValue *1.2 ;
             
             if(upperBoundary > 2000)
-                this.application.Ninja._documentBarRef.zoomFactor = 2000;
+                this.application.ninja.documentBar.zoomFactor = 2000;
             else
-                this.application.Ninja._documentBarRef.zoomFactor*= 1.2;
+                this.application.ninja.documentBar.zoomFactor*= 1.2;
 
         }
     },
@@ -124,13 +124,13 @@ exports.toolBase = Montage.create(Component, {
         value:function(){
             var lowerBoundary ,previousZoomValue;
             
-            previousZoomValue = this.application.Ninja._documentBarRef.zoomFactor ;
+            previousZoomValue = this.application.ninja.documentBar.zoomFactor ;
             lowerBoundary = previousZoomValue/1.2 ;
 
             if(lowerBoundary < 25)
-                this.application.Ninja._documentBarRef.zoomFactor = 25;
+                this.application.ninja.documentBar.zoomFactor = 25;
             else
-                this.application.Ninja._documentBarRef.zoomFactor/= 1.2;
+                this.application.ninja.documentBar.zoomFactor/= 1.2;
         }
     },