Release v0.7.1

fengyuanchen · May 28, 2016 · af85df2 · af85df2
1 parent e9d3c9f
commit af85df2
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 59 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 
 
+## 0.7.1 (May 28, 2016)
+
+- Improved the rotate and scale transform behaviour.
+- Improved the `getCroppedCanvas` method (returns the whole canvas if it is not cropped).
+- Check cross origin setting when load image by XMLHTTPRequest.
+
+
 ## 0.7.0 (Mar 20, 2016)
 
 - Supports 7 custom events: `build`, `built`, `cropstart`, `cropmove`, `cropend`, `crop` and `zoom`.

diff --git a/README.md b/README.md
@@ -853,7 +853,7 @@ Change the crop box position and size with new data.
   - Rotated image: requires [CSS3 2D Transforms](https://developer.mozilla.org/en-US/docs/Web/CSS/transform) support ([IE 9+](http://caniuse.com/transforms2d)).
   - Cross-origin image: requires HTML5 [CORS settings attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes) support ([IE 11+](http://caniuse.com/cors)).
 
-Get a canvas drawn the cropped image.
+Get a canvas drawn the cropped image. If it is not cropped, then returns the whole canvas.
 
 > After then, you can display the canvas as an image directly, or use [HTMLCanvasElement.toDataURL](https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toDataURL) to get a Data URL, or use [HTMLCanvasElement.toBlob](https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toBlob) to get a blob and upload it to server with [FormData](https://developer.mozilla.org/en-US/docs/Web/API/FormData) if the browser supports these APIs.
 

diff --git a/demo/js/main.js b/demo/js/main.js
@@ -15,6 +15,9 @@ window.onload = function () {
   var dataRotate = document.getElementById('dataRotate');
   var dataScaleX = document.getElementById('dataScaleX');
   var dataScaleY = document.getElementById('dataScaleY');
+  var isUndefined = function (obj) {
+    return typeof obj === 'undefined';
+  };
   var options = {
         aspectRatio: 16 / 9,
         preview: '.img-preview',
@@ -51,10 +54,6 @@ window.onload = function () {
       };
   var cropper = new Cropper(image, options);
 
-  function isUndefined(obj) {
-    return typeof obj === 'undefined';
-  }
-
   function preventDefault(e) {
     if (e) {
       if (e.preventDefault) {

diff --git a/dist/cropper.css b/dist/cropper.css
@@ -1,11 +1,11 @@
 /*!
- * Cropper.js v0.7.0
+ * Cropper.js v0.7.1
  * https://github.com/fengyuanchen/cropperjs
  *
  * Copyright (c) 2015-2016 Fengyuan Chen
  * Released under the MIT license
  *
- * Date: 2016-03-20T06:15:36.234Z
+ * Date: 2016-05-28T14:59:00.132Z
  */
 .cropper-container {
   font-size: 0;

diff --git a/dist/cropper.js b/dist/cropper.js
@@ -1,11 +1,11 @@
 /*!
- * Cropper.js v0.7.0
+ * Cropper.js v0.7.1
  * https://github.com/fengyuanchen/cropperjs
  *
  * Copyright (c) 2015-2016 Fengyuan Chen
  * Released under the MIT license
  *
- * Date: 2016-03-20T06:15:36.234Z
+ * Date: 2016-05-28T14:59:00.132Z
  */
 
 (function (global, factory) {
@@ -330,6 +330,22 @@
     }
   }
 
+  function removeListener(element, type, handler) {
+    var types = trim(type).split(REGEXP_SPACES);
+
+    if (types.length > 1) {
+      return each(types, function (type) {
+        removeListener(element, type, handler);
+      });
+    }
+
+    if (element.removeEventListener) {
+      element.removeEventListener(type, handler, false);
+    } else if (element.detachEvent) {
+      element.detachEvent('on' + type, handler);
+    }
+  }
+
   function addListener(element, type, handler, once) {
     var types = trim(type).split(REGEXP_SPACES);
     var originalHandler = handler;
@@ -355,22 +371,6 @@
     }
   }
 
-  function removeListener(element, type, handler) {
-    var types = trim(type).split(REGEXP_SPACES);
-
-    if (types.length > 1) {
-      return each(types, function (type) {
-        removeListener(element, type, handler);
-      });
-    }
-
-    if (element.removeEventListener) {
-      element.removeEventListener(type, handler, false);
-    } else if (element.detachEvent) {
-      element.detachEvent('on' + type, handler);
-    }
-  }
-
   function dispatchEvent(element, type, data) {
     var event;
 
@@ -537,14 +537,15 @@
     var scaleX = data.scaleX;
     var scaleY = data.scaleY;
 
-    if (isNumber(rotate)) {
-      transforms.push('rotate(' + rotate + 'deg)');
-    }
-
+    // Scale should come first before rotate
     if (isNumber(scaleX) && isNumber(scaleY)) {
       transforms.push('scale(' + scaleX + ',' + scaleY + ')');
     }
 
+    if (isNumber(rotate)) {
+      transforms.push('rotate(' + rotate + 'deg)');
+    }
+
     return transforms.length ? transforms.join(' ') : 'none';
   }
 
@@ -853,6 +854,10 @@
         _this.read(this.response);
       };
 
+      if (options.checkCrossOrigin && isCrossOriginURL(url) && element.crossOrigin) {
+        url = addTimestamp(url);
+      }
+
       xhr.open('get', url);
       xhr.responseType = 'arraybuffer';
       xhr.send();
@@ -3215,10 +3220,15 @@
       var context;
       var data;
 
-      if (!_this.built || !_this.cropped || !SUPPORT_CANVAS) {
+      if (!_this.built || !SUPPORT_CANVAS) {
         return;
       }
 
+      // Return the whole canvas if not cropped
+      if (!_this.cropped) {
+        return getSourceCanvas(_this.image, _this.imageData);
+      }
+
       if (!isPlainObject(options)) {
         options = {};
       }

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/index.html b/docs/index.html
@@ -32,7 +32,7 @@
       </div>
       <nav class="collapse navbar-collapse" id="navbar-collapse" role="navigation">
         <ul class="nav navbar-nav navbar-right">
-          <li><a href="https://github.com/fengyuanchen/cropperjs/tree/v0.7.0/README.md">Docs</a></li>
+          <li><a href="https://github.com/fengyuanchen/cropperjs/tree/v0.7.1/README.md">Docs</a></li>
           <li><a href="https://fengyuanchen.github.io/photo-editor" title="An advanced example of Cropper.js">Photo Editor</a></li>
           <li><a href="https://github.com/fengyuanchen/cropperjs">GitHub</a></li>
           <li><a href="https://fengyuanchen.github.io">More</a></li>
@@ -45,7 +45,7 @@
   <!-- Jumbotron -->
   <div class="jumbotron docs-jumbotron">
     <div class="container">
-      <h1>Cropper.js <small class="version">v0.7.0</small></h1>
+      <h1>Cropper.js <small class="version">v0.7.1</small></h1>
       <p class="lead">JavaScript image cropper.</p>
       <div class="docs-carbonads-container">
         <div class="docs-carbonads">

diff --git a/docs/js/main.js b/docs/js/main.js
@@ -15,6 +15,9 @@ window.onload = function () {
   var dataRotate = document.getElementById('dataRotate');
   var dataScaleX = document.getElementById('dataScaleX');
   var dataScaleY = document.getElementById('dataScaleY');
+  var isUndefined = function (obj) {
+    return typeof obj === 'undefined';
+  };
   var options = {
         aspectRatio: 16 / 9,
         preview: '.img-preview',
@@ -51,10 +54,6 @@ window.onload = function () {
       };
   var cropper = new Cropper(image, options);
 
-  function isUndefined(obj) {
-    return typeof obj === 'undefined';
-  }
-
   function preventDefault(e) {
     if (e) {
       if (e.preventDefault) {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cropperjs",
   "description": "JavaScript image cropper.",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "main": "dist/cropper.js",
   "license": "MIT",
   "repository": "fengyuanchen/cropperjs",
@@ -33,7 +33,7 @@
     "gulp-autoprefixer": "^3.1.0",
     "gulp-concat": "^2.6.0",
     "gulp-csscomb": "^3.0.6",
-    "gulp-csslint": "^0.2.2",
+    "gulp-csslint": "^0.3.0",
     "gulp-htmlcomb": "^0.1.0",
     "gulp-jscs": "^3.0.2",
     "gulp-jshint": "^1.12.0",

diff --git a/src/js/utilities.js b/src/js/utilities.js
@@ -212,6 +212,22 @@
     }
   }
 
+  function removeListener(element, type, handler) {
+    var types = trim(type).split(REGEXP_SPACES);
+
+    if (types.length > 1) {
+      return each(types, function (type) {
+        removeListener(element, type, handler);
+      });
+    }
+
+    if (element.removeEventListener) {
+      element.removeEventListener(type, handler, false);
+    } else if (element.detachEvent) {
+      element.detachEvent('on' + type, handler);
+    }
+  }
+
   function addListener(element, type, handler, once) {
     var types = trim(type).split(REGEXP_SPACES);
     var originalHandler = handler;
@@ -237,22 +253,6 @@
     }
   }
 
-  function removeListener(element, type, handler) {
-    var types = trim(type).split(REGEXP_SPACES);
-
-    if (types.length > 1) {
-      return each(types, function (type) {
-        removeListener(element, type, handler);
-      });
-    }
-
-    if (element.removeEventListener) {
-      element.removeEventListener(type, handler, false);
-    } else if (element.detachEvent) {
-      element.detachEvent('on' + type, handler);
-    }
-  }
-
   function dispatchEvent(element, type, data) {
     var event;