v0.11.1

adotpeng · Jul 20, 2018 · 527446e · 527446e
1 parent 1210e84
commit 527446e
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 11 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -5,6 +5,7 @@
 		<title>Hanzi Writer</title>
 		<!-- <link href='http://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'> -->
 		<link rel="stylesheet" href="styles.css" />
+		<script src="https://cdn.polyfill.io/v2/polyfill.min.js"></script>
 	</head>
 	<body>
 
@@ -30,6 +31,6 @@ <h1 class="title">Hanzi Writer</h1>
 		<!-- <script src="https://cdn.polyfill.io/v2/polyfill.min.js"></script> -->
 		<script type="application/javascript" src="../dist/hanzi-writer.js"></script>
 		<script type="application/javascript" src="test.js"></script>
-		
+
 	</body>
-</html>
+</html>
diff --git a/dist/hanzi-writer-lib.js b/dist/hanzi-writer-lib.js
@@ -1,5 +1,5 @@
 /*!
- * Hanzi Writer v0.11.0
+ * Hanzi Writer v0.11.1
  * https://chanind.github.io/hanzi-writer
  */
 module.exports =
@@ -753,6 +753,9 @@ function HanziWriter(element, character) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
 
   this._canvas = svg.Canvas.init(element);
+  if (this._canvas.svg.createSVGPoint) {
+    this._pt = this._canvas.svg.createSVGPoint();
+  }
   this._options = this._assignOptions(options);
   this._loadingManager = new LoadingManager(this._options);
   this.setCharacter(character);
@@ -973,11 +976,27 @@ HanziWriter.prototype._forwardToQuiz = function (method) {
 };
 
 HanziWriter.prototype._getMousePoint = function (evt) {
+  if (this._pt) {
+    this._pt.x = evt.clientX;
+    this._pt.y = evt.clientY;
+    var localPt = this._pt.matrixTransform(this._canvas.svg.getScreenCTM().inverse());
+    return { x: localPt.x, y: localPt.y };
+  }
+  // fallback in case SVG matrix transforms aren't supported
   var box = this._canvas.svg.getBoundingClientRect();
-  return { x: evt.clientX - box.left, y: evt.clientY - box.top };
+  var x = evt.clientX - box.left;
+  var y = evt.clientY - box.top;
+  return { x: x, y: y };
 };
 
 HanziWriter.prototype._getTouchPoint = function (evt) {
+  if (this._pt) {
+    this._pt.x = evt.touches[0].clientX;
+    this._pt.y = evt.touches[0].clientY;
+    var localPt = this._pt.matrixTransform(this._canvas.svg.getScreenCTM().inverse());
+    return { x: localPt.x, y: localPt.y };
+  }
+  // fallback in case SVG matrix transforms aren't supported
   var box = this._canvas.svg.getBoundingClientRect();
   var x = evt.touches[0].clientX - box.left;
   var y = evt.touches[0].clientY - box.top;

diff --git a/dist/hanzi-writer-lib.min.js b/dist/hanzi-writer-lib.min.js
diff --git a/dist/hanzi-writer.js b/dist/hanzi-writer.js
@@ -1,5 +1,5 @@
 /*!
- * Hanzi Writer v0.11.0
+ * Hanzi Writer v0.11.1
  * https://chanind.github.io/hanzi-writer
  */
 /******/ (function(modules) { // webpackBootstrap
@@ -752,6 +752,9 @@ function HanziWriter(element, character) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
 
   this._canvas = svg.Canvas.init(element);
+  if (this._canvas.svg.createSVGPoint) {
+    this._pt = this._canvas.svg.createSVGPoint();
+  }
   this._options = this._assignOptions(options);
   this._loadingManager = new LoadingManager(this._options);
   this.setCharacter(character);
@@ -972,11 +975,27 @@ HanziWriter.prototype._forwardToQuiz = function (method) {
 };
 
 HanziWriter.prototype._getMousePoint = function (evt) {
+  if (this._pt) {
+    this._pt.x = evt.clientX;
+    this._pt.y = evt.clientY;
+    var localPt = this._pt.matrixTransform(this._canvas.svg.getScreenCTM().inverse());
+    return { x: localPt.x, y: localPt.y };
+  }
+  // fallback in case SVG matrix transforms aren't supported
   var box = this._canvas.svg.getBoundingClientRect();
-  return { x: evt.clientX - box.left, y: evt.clientY - box.top };
+  var x = evt.clientX - box.left;
+  var y = evt.clientY - box.top;
+  return { x: x, y: y };
 };
 
 HanziWriter.prototype._getTouchPoint = function (evt) {
+  if (this._pt) {
+    this._pt.x = evt.touches[0].clientX;
+    this._pt.y = evt.touches[0].clientY;
+    var localPt = this._pt.matrixTransform(this._canvas.svg.getScreenCTM().inverse());
+    return { x: localPt.x, y: localPt.y };
+  }
+  // fallback in case SVG matrix transforms aren't supported
   var box = this._canvas.svg.getBoundingClientRect();
   var x = evt.touches[0].clientX - box.left;
   var y = evt.touches[0].clientY - box.top;

diff --git a/dist/hanzi-writer.min.js b/dist/hanzi-writer.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hanzi-writer",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "author": "David Chanin <[email protected]> (http://chanind.github.io/hanzi-writer/)",
   "description": "Hanzi Writer is a free and open-source javascript library for both animating simplified Chinese characters and quizzing users on character stroke order.",
   "repository": "chanind/hanzi-writer",