Release v1.0.0-rc.3

fengyuanchen · Jul 7, 2017 · ddd2c2c · ddd2c2c
1 parent b8cd3bb
commit ddd2c2c
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 52 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 
 
+## 1.0.0-rc.3 (Jul 7, 2017)
+
+- Added two new options (`imageSmoothingEnabled` and `imageSmoothingQuality`) to `getCroppedCanvas` method.
+- Fixed a bug of RegExp using (#195 by @arusakov).
+
+
 ## 1.0.0-rc.2 (May 30, 2017)
 
 - Fixed the issue of canvas box initialization (#179).

diff --git a/dist/cropper.common.js b/dist/cropper.common.js
@@ -1,11 +1,11 @@
 /*!
- * Cropper.js v1.0.0-rc.2
+ * Cropper.js v1.0.0-rc.3
  * https://github.com/fengyuanchen/cropperjs
  *
  * Copyright (c) 2017 Fengyuan Chen
  * Released under the MIT license
  *
- * Date: 2017-05-30T05:02:48.005Z
+ * Date: 2017-07-07T12:56:42.462Z
  */
 
 'use strict';
@@ -722,7 +722,7 @@ function getRotatedSizes(data, reversed) {
  };
 }
 
-function getSourceCanvas(image, data) {
+function getSourceCanvas(image, data, options) {
  var canvas = createElement('canvas');
  var context = canvas.getContext('2d');
  var dstX = 0;
@@ -762,6 +762,11 @@ function getSourceCanvas(image, data) {
  canvas.width = canvasWidth;
  canvas.height = canvasHeight;
 
+ if (options.fillColor) {
+ context.fillStyle = options.fillColor;
+ context.fillRect(0, 0, canvasWidth, canvasHeight);
+ }
+
  if (advanced) {
  dstX = -dstWidth / 2;
  dstY = -dstHeight / 2;
@@ -779,6 +784,12 @@ function getSourceCanvas(image, data) {
  context.scale(scaleX, scaleY);
  }
 
+ context.imageSmoothingEnabled = !!options.imageSmoothingEnabled;
+
+ if (options.imageSmoothingQuality) {
+ context.imageSmoothingQuality = options.imageSmoothingQuality;
+ }
+
  context.drawImage(image, Math.floor(dstX), Math.floor(dstY), Math.floor(dstWidth), Math.floor(dstHeight));
 
  if (advanced) {
@@ -2937,15 +2948,15 @@ var methods = {
  return null;
  }
 
- // Return the whole canvas if not cropped
- if (!self.cropped) {
- return getSourceCanvas(self.image, self.imageData);
- }
-
  if (!isPlainObject(options)) {
  options = {};
  }
 
+ // Return the whole canvas if not cropped
+ if (!self.cropped) {
+ return getSourceCanvas(self.image, self.imageData, options);
+ }
+
  var data = self.getData();
  var originalWidth = data.width;
  var originalHeight = data.height;
@@ -2984,7 +2995,7 @@ var methods = {
 
  // https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D.drawImage
  var parameters = function () {
- var source = getSourceCanvas(self.image, self.imageData);
+ var source = getSourceCanvas(self.image, self.imageData, options);
  var sourceWidth = source.width;
  var sourceHeight = source.height;
  var canvasData = self.canvasData;
@@ -3042,6 +3053,12 @@ var methods = {
  return params;
  }();
 
+ context.imageSmoothingEnabled = !!options.imageSmoothingEnabled;
+
+ if (options.imageSmoothingQuality) {
+ context.imageSmoothingQuality = options.imageSmoothingQuality;
+ }
+
  context.drawImage.apply(context, toConsumableArray(parameters));
 
  return canvas;
@@ -3206,7 +3223,7 @@ var Cropper = function () {
 
  // XMLHttpRequest disallows to open a Data URL in some browsers like IE11 and Safari
  if (REGEXP_DATA_URL.test(url)) {
- if (REGEXP_DATA_URL_JPEG) {
+ if (REGEXP_DATA_URL_JPEG.test(url)) {
  self.read(dataURLToArrayBuffer(url));
  } else {
  self.clone();

diff --git a/dist/cropper.css b/dist/cropper.css
@@ -1,11 +1,11 @@
 /*!
- * Cropper.js v1.0.0-rc.2
+ * Cropper.js v1.0.0-rc.3
  * https://github.com/fengyuanchen/cropperjs
  *
  * Copyright (c) 2017 Fengyuan Chen
  * Released under the MIT license
  *
- * Date: 2017-05-30T05:02:48.005Z
+ * Date: 2017-07-07T12:56:42.462Z
  */
 
 .cropper-container {

diff --git a/dist/cropper.esm.js b/dist/cropper.esm.js
@@ -1,11 +1,11 @@
 /*!
- * Cropper.js v1.0.0-rc.2
+ * Cropper.js v1.0.0-rc.3
  * https://github.com/fengyuanchen/cropperjs
  *
  * Copyright (c) 2017 Fengyuan Chen
  * Released under the MIT license
  *
- * Date: 2017-05-30T05:02:48.005Z
+ * Date: 2017-07-07T12:56:42.462Z
  */
 
 var DEFAULTS = {
@@ -720,7 +720,7 @@ function getRotatedSizes(data, reversed) {
  };
 }
 
-function getSourceCanvas(image, data) {
+function getSourceCanvas(image, data, options) {
  var canvas = createElement('canvas');
  var context = canvas.getContext('2d');
  var dstX = 0;
@@ -760,6 +760,11 @@ function getSourceCanvas(image, data) {
  canvas.width = canvasWidth;
  canvas.height = canvasHeight;
 
+ if (options.fillColor) {
+ context.fillStyle = options.fillColor;
+ context.fillRect(0, 0, canvasWidth, canvasHeight);
+ }
+
  if (advanced) {
  dstX = -dstWidth / 2;
  dstY = -dstHeight / 2;
@@ -777,6 +782,12 @@ function getSourceCanvas(image, data) {
  context.scale(scaleX, scaleY);
  }
 
+ context.imageSmoothingEnabled = !!options.imageSmoothingEnabled;
+
+ if (options.imageSmoothingQuality) {
+ context.imageSmoothingQuality = options.imageSmoothingQuality;
+ }
+
  context.drawImage(image, Math.floor(dstX), Math.floor(dstY), Math.floor(dstWidth), Math.floor(dstHeight));
 
  if (advanced) {
@@ -2935,15 +2946,15 @@ var methods = {
  return null;
  }
 
- // Return the whole canvas if not cropped
- if (!self.cropped) {
- return getSourceCanvas(self.image, self.imageData);
- }
-
  if (!isPlainObject(options)) {
  options = {};
  }
 
+ // Return the whole canvas if not cropped
+ if (!self.cropped) {
+ return getSourceCanvas(self.image, self.imageData, options);
+ }
+
  var data = self.getData();
  var originalWidth = data.width;
  var originalHeight = data.height;
@@ -2982,7 +2993,7 @@ var methods = {
 
  // https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D.drawImage
  var parameters = function () {
- var source = getSourceCanvas(self.image, self.imageData);
+ var source = getSourceCanvas(self.image, self.imageData, options);
  var sourceWidth = source.width;
  var sourceHeight = source.height;
  var canvasData = self.canvasData;
@@ -3040,6 +3051,12 @@ var methods = {
  return params;
  }();
 
+ context.imageSmoothingEnabled = !!options.imageSmoothingEnabled;
+
+ if (options.imageSmoothingQuality) {
+ context.imageSmoothingQuality = options.imageSmoothingQuality;
+ }
+
  context.drawImage.apply(context, toConsumableArray(parameters));
 
  return canvas;
@@ -3204,7 +3221,7 @@ var Cropper = function () {
 
  // XMLHttpRequest disallows to open a Data URL in some browsers like IE11 and Safari
  if (REGEXP_DATA_URL.test(url)) {
- if (REGEXP_DATA_URL_JPEG) {
+ if (REGEXP_DATA_URL_JPEG.test(url)) {
  self.read(dataURLToArrayBuffer(url));
  } else {
  self.clone();

diff --git a/dist/cropper.js b/dist/cropper.js
@@ -1,11 +1,11 @@
 /*!
- * Cropper.js v1.0.0-rc.2
+ * Cropper.js v1.0.0-rc.3
  * https://github.com/fengyuanchen/cropperjs
  *
  * Copyright (c) 2017 Fengyuan Chen
  * Released under the MIT license
  *
- * Date: 2017-05-30T05:02:48.005Z
+ * Date: 2017-07-07T12:56:42.462Z
  */
 
 (function (global, factory) {
@@ -726,7 +726,7 @@ function getRotatedSizes(data, reversed) {
  };
 }
 
-function getSourceCanvas(image, data) {
+function getSourceCanvas(image, data, options) {
  var canvas = createElement('canvas');
  var context = canvas.getContext('2d');
  var dstX = 0;
@@ -766,6 +766,11 @@ function getSourceCanvas(image, data) {
  canvas.width = canvasWidth;
  canvas.height = canvasHeight;
 
+ if (options.fillColor) {
+ context.fillStyle = options.fillColor;
+ context.fillRect(0, 0, canvasWidth, canvasHeight);
+ }
+
  if (advanced) {
  dstX = -dstWidth / 2;
  dstY = -dstHeight / 2;
@@ -783,6 +788,12 @@ function getSourceCanvas(image, data) {
  context.scale(scaleX, scaleY);
  }
 
+ context.imageSmoothingEnabled = !!options.imageSmoothingEnabled;
+
+ if (options.imageSmoothingQuality) {
+ context.imageSmoothingQuality = options.imageSmoothingQuality;
+ }
+
  context.drawImage(image, Math.floor(dstX), Math.floor(dstY), Math.floor(dstWidth), Math.floor(dstHeight));
 
  if (advanced) {
@@ -2941,15 +2952,15 @@ var methods = {
  return null;
  }
 
- // Return the whole canvas if not cropped
- if (!self.cropped) {
- return getSourceCanvas(self.image, self.imageData);
- }
-
  if (!isPlainObject(options)) {
  options = {};
  }
 
+ // Return the whole canvas if not cropped
+ if (!self.cropped) {
+ return getSourceCanvas(self.image, self.imageData, options);
+ }
+
  var data = self.getData();
  var originalWidth = data.width;
  var originalHeight = data.height;
@@ -2988,7 +2999,7 @@ var methods = {
 
  // https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D.drawImage
  var parameters = function () {
- var source = getSourceCanvas(self.image, self.imageData);
+ var source = getSourceCanvas(self.image, self.imageData, options);
  var sourceWidth = source.width;
  var sourceHeight = source.height;
  var canvasData = self.canvasData;
@@ -3046,6 +3057,12 @@ var methods = {
  return params;
  }();
 
+ context.imageSmoothingEnabled = !!options.imageSmoothingEnabled;
+
+ if (options.imageSmoothingQuality) {
+ context.imageSmoothingQuality = options.imageSmoothingQuality;
+ }
+
  context.drawImage.apply(context, toConsumableArray(parameters));
 
  return canvas;
@@ -3210,7 +3227,7 @@ var Cropper = function () {
 
  // XMLHttpRequest disallows to open a Data URL in some browsers like IE11 and Safari
  if (REGEXP_DATA_URL.test(url)) {
- if (REGEXP_DATA_URL_JPEG) {
+ if (REGEXP_DATA_URL_JPEG.test(url)) {
  self.read(dataURLToArrayBuffer(url));
  } else {
  self.clone();

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.0.0-rc.2
+ * Cropper.js v1.0.0-rc.3
  * https://github.com/fengyuanchen/cropperjs
  *
  * Copyright (c) 2017 Fengyuan Chen
  * Released under the MIT license
  *
- * Date: 2017-05-30T05:02:48.005Z
+ * Date: 2017-07-07T12:56:42.462Z
  */
 
 .cropper-container {

diff --git a/docs/index.html b/docs/index.html
@@ -41,7 +41,7 @@
  <!-- Jumbotron -->
  <div class="jumbotron docs-jumbotron">
  <div class="container">
- <h1>Cropper.js <small class="version">v1.0.0-rc.2</small></h1>
+ <h1>Cropper.js <small class="version">v1.0.0-rc.3</small></h1>
  <p class="lead">JavaScript image cropper.</p>
  <div class="docs-carbonads-container">
  <div class="docs-carbonads">