v0.9.1

fengyuanchen · Mar 21, 2015 · f07d01b · f07d01b
1 parent 22411f9
commit f07d01b
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.9.1 (Mar 20, 2015)
+
+- Fix the touch zoom issue (#206)
+- Fix the reset issue (#246)
+
 
 ## 0.9.0 (Mar 15, 2015)
 

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "cropper",
   "description": "A simple jQuery image cropping plugin.",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "main": [
     "dist/cropper.js",
     "dist/cropper.css"

diff --git a/dist/cropper.css b/dist/cropper.css
@@ -1,11 +1,11 @@
 /*!
- * Cropper v0.9.0
+ * Cropper v0.9.1
  * https://github.com/fengyuanchen/cropper
  *
  * Copyright (c) 2014-2015 Fengyuan Chen and contributors
  * Released under the MIT license
  *
- * Date: 2015-03-15T06:29:30.388Z
+ * Date: 2015-03-21T04:58:27.265Z
  */
 .cropper-container {
   position: relative;

diff --git a/dist/cropper.js b/dist/cropper.js
@@ -1,11 +1,11 @@
 /*!
- * Cropper v0.9.0
+ * Cropper v0.9.1
  * https://github.com/fengyuanchen/cropper
  *
  * Copyright (c) 2014-2015 Fengyuan Chen and contributors
  * Released under the MIT license
  *
- * Date: 2015-03-15T06:29:30.388Z
+ * Date: 2015-03-21T04:58:27.265Z
  */
 
 (function (factory) {
@@ -405,6 +405,7 @@
       this.canvas = canvas;
       this.limitCanvas();
 
+      this.initialImage = $.extend({}, image);
       this.initialCanvas = $.extend({}, this.canvas);
       this.renderCanvas();
     },
@@ -958,6 +959,7 @@
         return;
       }
 
+      this.image = $.extend({}, this.initialImage);
       this.canvas = $.extend({}, this.initialCanvas);
       this.renderCanvas();
 
@@ -1682,8 +1684,8 @@
           abs(this.endY - this.endY2)
         ));
 
-        this.endX2 = this.startX2;
-        this.endY2 = this.startY2;
+        this.startX2 = this.endX2;
+        this.startY2 = this.endY2;
         renderable = false;
         break;
 

diff --git a/dist/cropper.min.css b/dist/cropper.min.css
diff --git a/dist/cropper.min.js b/dist/cropper.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cropper",
   "description": "A simple jQuery image cropping plugin.",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "main": "dist/cropper.js",
   "keywords": [
     "image",