build: release 1.3.6

fengyuanchen · May 20, 2018 · 1b1a0c0 · 1b1a0c0
1 parent 665cc77
commit 1b1a0c0
Show file tree

Hide file tree

Showing 12 changed files with 4,713 additions and 5,362 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.3.6 (May 20, 2018)
+
+- Check orientation only when both the `rotatable` and `scalable` options are set to `true`.
+- In case rounding off leads to extra 1px in right or bottom border we should round the top-left corner and the dimension (#343).
+
 ## 1.3.5 (Apr 15, 2018)
 
 - Ensure the cloned image loads completely before trigger the `ready` event to avoid side effect (#303).

diff --git a/dist/cropper.common.js b/dist/cropper.common.js
@@ -1,11 +1,11 @@
 /*!
- * Cropper.js v1.3.5
- * https://github.com/fengyuanchen/cropperjs
+ * Cropper.js v1.3.6
+ * https://fengyuanchen.github.io/cropperjs
  *
- * Copyright (c) 2015-2018 Chen Fengyuan
+ * Copyright 2015-present Chen Fengyuan
  * Released under the MIT license
  *
- * Date: 2018-04-15T06:20:44.574Z
+ * Date: 2018-05-20T07:58:21.682Z
  */
 
 'use strict';
@@ -2817,9 +2817,20 @@ var methods = {
       var ratio = imageData.width / imageData.naturalWidth;
 
       forEach(data, function (n, i) {
-        n /= ratio;
-        data[i] = rounded ? Math.round(n) : n;
+        data[i] = n / ratio;
       });
+
+      if (rounded) {
+        // In case rounding off leads to extra 1px in right or bottom border
+        // we should round the top-left corner and the dimension (#343).
+        var bottom = Math.round(data.y + data.height);
+        var right = Math.round(data.x + data.width);
+
+        data.x = Math.round(data.x);
+        data.y = Math.round(data.y);
+        data.width = right - data.x;
+        data.height = bottom - data.y;
+      }
     } else {
       data = {
         x: 0,
@@ -3329,6 +3340,10 @@ var Cropper = function () {
           options = this.options;
 
 
+      if (!options.rotatable && !options.scalable) {
+        options.checkOrientation = false;
+      }
+
       if (!options.checkOrientation || !window.ArrayBuffer) {
         this.clone();
         return;

diff --git a/dist/cropper.css b/dist/cropper.css
@@ -1,11 +1,11 @@
 /*!
- * Cropper.js v1.3.5
- * https://github.com/fengyuanchen/cropperjs
+ * Cropper.js v1.3.6
+ * https://fengyuanchen.github.io/cropperjs
  *
- * Copyright (c) 2015-2018 Chen Fengyuan
+ * Copyright 2015-present Chen Fengyuan
  * Released under the MIT license
  *
- * Date: 2018-04-15T06:19:56.029Z
+ * Date: 2018-05-20T07:56:44.346Z
  */
 
 .cropper-container {

diff --git a/dist/cropper.esm.js b/dist/cropper.esm.js
@@ -1,11 +1,11 @@
 /*!
- * Cropper.js v1.3.5
- * https://github.com/fengyuanchen/cropperjs
+ * Cropper.js v1.3.6
+ * https://fengyuanchen.github.io/cropperjs
  *
- * Copyright (c) 2015-2018 Chen Fengyuan
+ * Copyright 2015-present Chen Fengyuan
  * Released under the MIT license
  *
- * Date: 2018-04-15T06:20:44.574Z
+ * Date: 2018-05-20T07:58:21.682Z
  */
 
 var IN_BROWSER = typeof window !== 'undefined';
@@ -2815,9 +2815,20 @@ var methods = {
       var ratio = imageData.width / imageData.naturalWidth;
 
       forEach(data, function (n, i) {
-        n /= ratio;
-        data[i] = rounded ? Math.round(n) : n;
+        data[i] = n / ratio;
       });
+
+      if (rounded) {
+        // In case rounding off leads to extra 1px in right or bottom border
+        // we should round the top-left corner and the dimension (#343).
+        var bottom = Math.round(data.y + data.height);
+        var right = Math.round(data.x + data.width);
+
+        data.x = Math.round(data.x);
+        data.y = Math.round(data.y);
+        data.width = right - data.x;
+        data.height = bottom - data.y;
+      }
     } else {
       data = {
         x: 0,
@@ -3327,6 +3338,10 @@ var Cropper = function () {
           options = this.options;
 
 
+      if (!options.rotatable && !options.scalable) {
+        options.checkOrientation = false;
+      }
+
       if (!options.checkOrientation || !window.ArrayBuffer) {
         this.clone();
         return;

diff --git a/dist/cropper.js b/dist/cropper.js
@@ -1,11 +1,11 @@
 /*!
- * Cropper.js v1.3.5
- * https://github.com/fengyuanchen/cropperjs
+ * Cropper.js v1.3.6
+ * https://fengyuanchen.github.io/cropperjs
  *
- * Copyright (c) 2015-2018 Chen Fengyuan
+ * Copyright 2015-present Chen Fengyuan
  * Released under the MIT license
  *
- * Date: 2018-04-15T06:20:44.574Z
+ * Date: 2018-05-20T07:58:21.682Z
  */
 
 (function (global, factory) {
@@ -2821,9 +2821,20 @@
         var ratio = imageData.width / imageData.naturalWidth;
 
         forEach(data, function (n, i) {
-          n /= ratio;
-          data[i] = rounded ? Math.round(n) : n;
+          data[i] = n / ratio;
         });
+
+        if (rounded) {
+          // In case rounding off leads to extra 1px in right or bottom border
+          // we should round the top-left corner and the dimension (#343).
+          var bottom = Math.round(data.y + data.height);
+          var right = Math.round(data.x + data.width);
+
+          data.x = Math.round(data.x);
+          data.y = Math.round(data.y);
+          data.width = right - data.x;
+          data.height = bottom - data.y;
+        }
       } else {
         data = {
           x: 0,
@@ -3333,6 +3344,10 @@
             options = this.options;
 
 
+        if (!options.rotatable && !options.scalable) {
+          options.checkOrientation = false;
+        }
+
         if (!options.checkOrientation || !window.ArrayBuffer) {
           this.clone();
           return;

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/docs/css/cropper.css b/docs/css/cropper.css
@@ -1,11 +1,11 @@
 /*!
- * Cropper.js v1.3.5
- * https://github.com/fengyuanchen/cropperjs
+ * Cropper.js v1.3.6
+ * https://fengyuanchen.github.io/cropperjs
  *
- * Copyright (c) 2015-2018 Chen Fengyuan
+ * Copyright 2015-present Chen Fengyuan
  * Released under the MIT license
  *
- * Date: 2018-04-15T06:19:56.029Z
+ * Date: 2018-05-20T07:56:44.346Z
  */
 
 .cropper-container {

diff --git a/docs/index.html b/docs/index.html
@@ -8,7 +8,7 @@
   <meta name="author" content="Chen Fengyuan">
   <title>Cropper.js</title>
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css">
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css">
   <link rel="stylesheet" href="css/cropper.css">
   <link rel="stylesheet" href="css/main.css">
 </head>
@@ -46,7 +46,7 @@
     <div class="container">
       <div class="row">
         <div class="col-md">
-          <h1>Cropper.js <small class="h6">v1.3.5</small></h1>
+          <h1>Cropper.js <small class="h6">v1.3.6</small></h1>
           <p class="lead">JavaScript image cropper.</p>
         </div>
         <div class="col-md">
@@ -569,7 +569,7 @@ <h5 class="modal-title" id="getCroppedCanvasTitle">Cropped</h5>
 
   <!-- Scripts -->
   <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.bundle.min.js"></script>
+  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.bundle.min.js"></script>
   <script src="https://fengyuanchen.github.io/js/common.js"></script>
   <script src="js/cropper.js"></script>
   <script src="js/main.js"></script>

diff --git a/docs/js/cropper.js b/docs/js/cropper.js
@@ -1,11 +1,11 @@
 /*!
- * Cropper.js v1.3.5
- * https://github.com/fengyuanchen/cropperjs
+ * Cropper.js v1.3.6
+ * https://fengyuanchen.github.io/cropperjs
  *
- * Copyright (c) 2015-2018 Chen Fengyuan
+ * Copyright 2015-present Chen Fengyuan
  * Released under the MIT license
  *
- * Date: 2018-04-15T06:20:44.574Z
+ * Date: 2018-05-20T07:58:21.682Z
  */
 
 (function (global, factory) {
@@ -2821,9 +2821,20 @@
         var ratio = imageData.width / imageData.naturalWidth;
 
         forEach(data, function (n, i) {
-          n /= ratio;
-          data[i] = rounded ? Math.round(n) : n;
+          data[i] = n / ratio;
         });
+
+        if (rounded) {
+          // In case rounding off leads to extra 1px in right or bottom border
+          // we should round the top-left corner and the dimension (#343).
+          var bottom = Math.round(data.y + data.height);
+          var right = Math.round(data.x + data.width);
+
+          data.x = Math.round(data.x);
+          data.y = Math.round(data.y);
+          data.width = right - data.x;
+          data.height = bottom - data.y;
+        }
       } else {
         data = {
           x: 0,
@@ -3333,6 +3344,10 @@
             options = this.options;
 
 
+        if (!options.rotatable && !options.scalable) {
+          options.checkOrientation = false;
+        }
+
         if (!options.checkOrientation || !window.ArrayBuffer) {
           this.clone();
           return;