handle state when no viewbox on svg

bumbu · Apr 15, 2014 · 66524f6 · 66524f6
1 parent e03cbcc
commit 66524f6
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/svg-pan-zoom.js b/svg-pan-zoom.js
@@ -49,18 +49,27 @@ var svgPanZoom = {
         svgPanZoomInstance.setCTM(svg.__viewportElement, newCTM);
         svgPanZoomInstance.initialCTM = newCTM;
       }
+      else {
+        svgPanZoomInstance.initialCTM = viewport.getCTM();
+      }
 
 
       if (args.hasOwnProperty('panEnabled')) {
         svgPanZoomInstance.panEnabled = args.panEnabled;
       }
+      if (args.hasOwnProperty('controlIconsEnabled')) {
+        svgPanZoomInstance.controlIconsEnabled = args.controlIconsEnabled;
+      }
       if (args.hasOwnProperty('zoomEnabled')) {
         svgPanZoomInstance.zoomEnabled = args.zoomEnabled;
+        /*
         if (svgPanZoomInstance.zoomEnabled && args.hasOwnProperty('controlIconsEnabled')) {
           svgPanZoomInstance.controlIconsEnabled = args.controlIconsEnabled;
         }
+        //*/
       }
-      if (svgPanZoomInstance.zoomEnabled && svgPanZoomInstance.controlIconsEnabled) {
+      //if (svgPanZoomInstance.zoomEnabled && svgPanZoomInstance.controlIconsEnabled) {
+      if (svgPanZoomInstance.controlIconsEnabled) {
         args.svg = svg;
         args.svgWidth = svgWidth;
         args.svgHeight = svgHeight;