Build and bump

bumbu · Mar 15, 2017 · 94873df · 94873df
1 parent 1be71ca
commit 94873df
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 13 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "svg-pan-zoom",
-  "version": "3.4.1",
+  "version": "3.5.0",
   "homepage": "https://github.com/ariutta/svg-pan-zoom",
   "authors": [
     "Andrea Leofreddi <a.leofreddi@itcharm.com>",

diff --git a/dist/svg-pan-zoom.d.ts b/dist/svg-pan-zoom.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for svg-pan-zoom v3.4.1
+// Type definitions for svg-pan-zoom v3.5.0
 // Project: https://github.com/ariutta/svg-pan-zoom
 // Definitions by: César Vidril <https://github.com/Yimiprod>
 // Definitions: https://github.com/ariutta/svg-pan-zoom

diff --git a/dist/svg-pan-zoom.js b/dist/svg-pan-zoom.js
@@ -1,4 +1,4 @@
-// svg-pan-zoom v3.4.1
+// svg-pan-zoom v3.5.0
 // https://github.com/ariutta/svg-pan-zoom
 (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 var svgPanZoom = require('./svg-pan-zoom.js');
@@ -371,6 +371,9 @@ ShadowViewport.prototype.setCTM = function(newCTM) {
       if (this.options.beforeZoom(this.getRelativeZoom(), this.computeRelativeZoom(newCTM.a)) === false) {
         newCTM.a = newCTM.d = this.activeState.zoom
         willZoom = false
+      } else {
+        this.updateCache(newCTM);
+        this.options.onZoom(this.getRelativeZoom())
       }
     }
 
@@ -413,18 +416,15 @@ ShadowViewport.prototype.setCTM = function(newCTM) {
       // Update willPan flag
       if (preventPanX && preventPanY) {
         willPan = false
+      } else {
+        this.updateCache(newCTM);
+        this.options.onPan(this.getPan());
       }
     }
 
     // Check again if should zoom or pan
     if (willZoom || willPan) {
-      this.updateCache(newCTM)
-
       this.updateCTMOnNextFrame()
-
-      // After callbacks
-      if (willZoom) {this.options.onZoom(this.getRelativeZoom())}
-      if (willPan) {this.options.onPan(this.getPan())}
     }
   }
 }
@@ -468,11 +468,18 @@ ShadowViewport.prototype.updateCTMOnNextFrame = function() {
  * Update viewport CTM with cached CTM
  */
 ShadowViewport.prototype.updateCTM = function() {
+  var ctm = this.getCTM()
+
   // Updates SVG element
-  SvgUtils.setCTM(this.viewport, this.getCTM(), this.defs)
+  SvgUtils.setCTM(this.viewport, ctm, this.defs)
 
   // Free the lock
   this.pendingUpdate = false
+
+  // Notify about the update
+  if(this.options.onUpdatedCTM) {
+    this.options.onUpdatedCTM(ctm)
+  }
 }
 
 module.exports = function(viewport, options){
@@ -511,6 +518,7 @@ var optionsDefaults = {
 , onPan: null
 , customEventsHandler: null
 , eventsListenerElement: null
+, onUpdatedCTM: null
 }
 
 SvgPanZoom.prototype.init = function(svg, options) {
@@ -555,6 +563,9 @@ SvgPanZoom.prototype.init = function(svg, options) {
   , onPan: function(point) {
       if (that.viewport && that.options.onPan) {return that.options.onPan(point)}
     }
+  , onUpdatedCTM: function(ctm) {
+      if (that.viewport && that.options.onUpdatedCTM) {return that.options.onUpdatedCTM(ctm)}
+    }
   })
 
   // Wrap callbacks into public API context
@@ -563,6 +574,7 @@ SvgPanZoom.prototype.init = function(svg, options) {
   publicInstance.setOnZoom(this.options.onZoom)
   publicInstance.setBeforePan(this.options.beforePan)
   publicInstance.setOnPan(this.options.onPan)
+  publicInstance.setOnUpdatedCTM(this.options.onUpdatedCTM)
 
   if (this.options.controlIconsEnabled) {
     ControlIcons.enable(this)
@@ -1075,6 +1087,7 @@ SvgPanZoom.prototype.destroy = function() {
   this.onZoom = null
   this.beforePan = null
   this.onPan = null
+  this.onUpdatedCTM = null
 
   // Destroy custom event handlers
   if (this.options.customEventsHandler != null) { // jshint ignore:line
@@ -1108,6 +1121,9 @@ SvgPanZoom.prototype.destroy = function() {
   // Delete options and its contents
   delete this.options
 
+  // Delete viewport to make public shadow viewport functions uncallable
+  delete this.viewport
+
   // Destroy public instance and rewrite getPublicInstance
   delete this.publicInstance
   delete this.pi
@@ -1179,6 +1195,8 @@ SvgPanZoom.prototype.getPublicInstance = function() {
     , zoomIn: function() {this.zoomBy(1 + that.options.zoomScaleSensitivity); return that.pi}
     , zoomOut: function() {this.zoomBy(1 / (1 + that.options.zoomScaleSensitivity)); return that.pi}
     , getZoom: function() {return that.getRelativeZoom()}
+      // CTM update
+    , setOnUpdatedCTM: function(fn) {that.options.onUpdatedCTM = fn === null ? null : Utils.proxy(fn, that.publicInstance); return that.pi}
       // Reset
     , resetZoom: function() {that.resetZoom(); return that.pi}
     , resetPan: function() {that.resetPan(); return that.pi}

diff --git a/dist/svg-pan-zoom.min.js b/dist/svg-pan-zoom.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svg-pan-zoom",
-  "version": "3.4.1",
+  "version": "3.5.0",
   "main": "dist/svg-pan-zoom.js",
   "types": "dist/svg-pan-zoom.d.ts",
   "browser": "src/browserify.js",