diff --git a/docs/js/cropper.js b/docs/js/cropper.js
index 36881f74..e023f357 100644
--- a/docs/js/cropper.js
+++ b/docs/js/cropper.js
@@ -1,26 +1,132 @@
/*!
- * Cropper v4.0.0
- * https://github.com/fengyuanchen/cropper
+ * Cropper v4.1.0
+ * https://fengyuanchen.github.io/cropper
*
- * Copyright (c) 2014-2018 Chen Fengyuan
+ * Copyright 2014-present Chen Fengyuan
* Released under the MIT license
*
- * Date: 2018-04-01T06:27:27.267Z
+ * Date: 2019-10-12T07:43:51.850Z
*/
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('jquery')) :
typeof define === 'function' && define.amd ? define(['jquery'], factory) :
- (factory(global.jQuery));
-}(this, (function ($) { 'use strict';
+ (global = global || self, factory(global.jQuery));
+}(this, function ($) { 'use strict';
$ = $ && $.hasOwnProperty('default') ? $['default'] : $;
- var IN_BROWSER = typeof window !== 'undefined';
- var WINDOW = IN_BROWSER ? window : {};
- var NAMESPACE = 'cropper';
+ function _typeof(obj) {
+ if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
+ _typeof = function (obj) {
+ return typeof obj;
+ };
+ } else {
+ _typeof = function (obj) {
+ return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+ };
+ }
+
+ return _typeof(obj);
+ }
+
+ function _classCallCheck(instance, Constructor) {
+ if (!(instance instanceof Constructor)) {
+ throw new TypeError("Cannot call a class as a function");
+ }
+ }
+
+ function _defineProperties(target, props) {
+ for (var i = 0; i < props.length; i++) {
+ var descriptor = props[i];
+ descriptor.enumerable = descriptor.enumerable || false;
+ descriptor.configurable = true;
+ if ("value" in descriptor) descriptor.writable = true;
+ Object.defineProperty(target, descriptor.key, descriptor);
+ }
+ }
+
+ function _createClass(Constructor, protoProps, staticProps) {
+ if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+ if (staticProps) _defineProperties(Constructor, staticProps);
+ return Constructor;
+ }
+
+ function _defineProperty(obj, key, value) {
+ if (key in obj) {
+ Object.defineProperty(obj, key, {
+ value: value,
+ enumerable: true,
+ configurable: true,
+ writable: true
+ });
+ } else {
+ obj[key] = value;
+ }
+
+ return obj;
+ }
+
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly) symbols = symbols.filter(function (sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+
+ return keys;
+ }
+
+ function _objectSpread2(target) {
+ for (var i = 1; i < arguments.length; i++) {
+ var source = arguments[i] != null ? arguments[i] : {};
+
+ if (i % 2) {
+ ownKeys(source, true).forEach(function (key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+ } else {
+ ownKeys(source).forEach(function (key) {
+ Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+ });
+ }
+ }
+
+ return target;
+ }
+
+ function _toConsumableArray(arr) {
+ return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread();
+ }
+
+ function _arrayWithoutHoles(arr) {
+ if (Array.isArray(arr)) {
+ for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
+
+ return arr2;
+ }
+ }
+
+ function _iterableToArray(iter) {
+ if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter);
+ }
+
+ function _nonIterableSpread() {
+ throw new TypeError("Invalid attempt to spread non-iterable instance");
+ }
+
+ var IS_BROWSER = typeof window !== 'undefined' && typeof window.document !== 'undefined';
+ var WINDOW = IS_BROWSER ? window : {};
+ var IS_TOUCH_DEVICE = IS_BROWSER ? 'ontouchstart' in WINDOW.document.documentElement : false;
+ var HAS_POINTER_EVENT = IS_BROWSER ? 'PointerEvent' in WINDOW : false;
+ var NAMESPACE = 'cropper'; // Actions
- // Actions
var ACTION_ALL = 'all';
var ACTION_CROP = 'crop';
var ACTION_MOVE = 'move';
@@ -32,126 +138,107 @@
var ACTION_NORTH_EAST = 'ne';
var ACTION_NORTH_WEST = 'nw';
var ACTION_SOUTH_EAST = 'se';
- var ACTION_SOUTH_WEST = 'sw';
-
- // Classes
- var CLASS_CROP = NAMESPACE + '-crop';
- var CLASS_DISABLED = NAMESPACE + '-disabled';
- var CLASS_HIDDEN = NAMESPACE + '-hidden';
- var CLASS_HIDE = NAMESPACE + '-hide';
- var CLASS_INVISIBLE = NAMESPACE + '-invisible';
- var CLASS_MODAL = NAMESPACE + '-modal';
- var CLASS_MOVE = NAMESPACE + '-move';
-
- // Data keys
- var DATA_ACTION = 'action';
- var DATA_PREVIEW = 'preview';
-
- // Drag modes
+ var ACTION_SOUTH_WEST = 'sw'; // Classes
+
+ var CLASS_CROP = "".concat(NAMESPACE, "-crop");
+ var CLASS_DISABLED = "".concat(NAMESPACE, "-disabled");
+ var CLASS_HIDDEN = "".concat(NAMESPACE, "-hidden");
+ var CLASS_HIDE = "".concat(NAMESPACE, "-hide");
+ var CLASS_INVISIBLE = "".concat(NAMESPACE, "-invisible");
+ var CLASS_MODAL = "".concat(NAMESPACE, "-modal");
+ var CLASS_MOVE = "".concat(NAMESPACE, "-move"); // Data keys
+
+ var DATA_ACTION = "".concat(NAMESPACE, "Action");
+ var DATA_PREVIEW = "".concat(NAMESPACE, "Preview"); // Drag modes
+
var DRAG_MODE_CROP = 'crop';
var DRAG_MODE_MOVE = 'move';
- var DRAG_MODE_NONE = 'none';
+ var DRAG_MODE_NONE = 'none'; // Events
- // Events
var EVENT_CROP = 'crop';
var EVENT_CROP_END = 'cropend';
var EVENT_CROP_MOVE = 'cropmove';
var EVENT_CROP_START = 'cropstart';
var EVENT_DBLCLICK = 'dblclick';
- var EVENT_LOAD = 'load';
- var EVENT_POINTER_DOWN = WINDOW.PointerEvent ? 'pointerdown' : 'touchstart mousedown';
- var EVENT_POINTER_MOVE = WINDOW.PointerEvent ? 'pointermove' : 'touchmove mousemove';
- var EVENT_POINTER_UP = WINDOW.PointerEvent ? 'pointerup pointercancel' : 'touchend touchcancel mouseup';
+ var EVENT_TOUCH_START = IS_TOUCH_DEVICE ? 'touchstart' : 'mousedown';
+ var EVENT_TOUCH_MOVE = IS_TOUCH_DEVICE ? 'touchmove' : 'mousemove';
+ var EVENT_TOUCH_END = IS_TOUCH_DEVICE ? 'touchend touchcancel' : 'mouseup';
+ var EVENT_POINTER_DOWN = HAS_POINTER_EVENT ? 'pointerdown' : EVENT_TOUCH_START;
+ var EVENT_POINTER_MOVE = HAS_POINTER_EVENT ? 'pointermove' : EVENT_TOUCH_MOVE;
+ var EVENT_POINTER_UP = HAS_POINTER_EVENT ? 'pointerup pointercancel' : EVENT_TOUCH_END;
var EVENT_READY = 'ready';
var EVENT_RESIZE = 'resize';
- var EVENT_WHEEL = 'wheel mousewheel DOMMouseScroll';
- var EVENT_ZOOM = 'zoom';
+ var EVENT_WHEEL = 'wheel';
+ var EVENT_ZOOM = 'zoom'; // Mime types
- // RegExps
- var REGEXP_ACTIONS = /^(?:e|w|s|n|se|sw|ne|nw|all|crop|move|zoom)$/;
+ var MIME_TYPE_JPEG = 'image/jpeg'; // RegExps
+
+ var REGEXP_ACTIONS = /^e|w|s|n|se|sw|ne|nw|all|crop|move|zoom$/;
var REGEXP_DATA_URL = /^data:/;
var REGEXP_DATA_URL_JPEG = /^data:image\/jpeg;base64,/;
- var REGEXP_TAG_NAME = /^(?:img|canvas)$/i;
+ var REGEXP_TAG_NAME = /^img|canvas$/i; // Misc
+ // Inspired by the default width and height of a canvas element.
+
+ var MIN_CONTAINER_WIDTH = 200;
+ var MIN_CONTAINER_HEIGHT = 100;
var DEFAULTS = {
// Define the view mode of the cropper
- viewMode: 0, // 0, 1, 2, 3
-
+ viewMode: 0,
+ // 0, 1, 2, 3
// Define the dragging mode of the cropper
- dragMode: DRAG_MODE_CROP, // 'crop', 'move' or 'none'
-
+ dragMode: DRAG_MODE_CROP,
+ // 'crop', 'move' or 'none'
+ // Define the initial aspect ratio of the crop box
+ initialAspectRatio: NaN,
// Define the aspect ratio of the crop box
aspectRatio: NaN,
-
// An object with the previous cropping result data
data: null,
-
// A selector for adding extra containers to preview
preview: '',
-
// Re-render the cropper when resize the window
responsive: true,
-
// Restore the cropped area after resize the window
restore: true,
-
// Check if the current image is a cross-origin image
checkCrossOrigin: true,
-
// Check the current image's Exif Orientation information
checkOrientation: true,
-
// Show the black modal
modal: true,
-
// Show the dashed lines for guiding
guides: true,
-
// Show the center indicator for guiding
center: true,
-
// Show the white modal to highlight the crop box
highlight: true,
-
// Show the grid background
background: true,
-
// Enable to crop the image automatically when initialize
autoCrop: true,
-
// Define the percentage of automatic cropping area when initializes
autoCropArea: 0.8,
-
// Enable to move the image
movable: true,
-
// Enable to rotate the image
rotatable: true,
-
// Enable to scale the image
scalable: true,
-
// Enable to zoom the image
zoomable: true,
-
// Enable to zoom the image by dragging touch
zoomOnTouch: true,
-
// Enable to zoom the image by wheeling mouse
zoomOnWheel: true,
-
// Define zoom ratio when zoom the image by wheeling mouse
wheelZoomRatio: 0.1,
-
// Enable to move the crop box
cropBoxMovable: true,
-
// Enable to resize the crop box
cropBoxResizable: true,
-
// Toggle drag mode between "crop" and "move" when click twice on the cropper
toggleDragModeOnDblclick: true,
-
// Size limitation
minCanvasWidth: 0,
minCanvasHeight: 0,
@@ -159,7 +246,6 @@
minCropBoxHeight: 0,
minContainerWidth: 200,
minContainerHeight: 100,
-
// Shortcuts of events
ready: null,
cropstart: null,
@@ -169,82 +255,50 @@
zoom: null
};
- var TEMPLATE = '
' + '
' + '
' + '
' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '
' + '
';
-
- var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
- return typeof obj;
- } : function (obj) {
- return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
- };
-
- var classCallCheck = function (instance, Constructor) {
- if (!(instance instanceof Constructor)) {
- throw new TypeError("Cannot call a class as a function");
- }
- };
-
- var createClass = function () {
- function defineProperties(target, props) {
- for (var i = 0; i < props.length; i++) {
- var descriptor = props[i];
- descriptor.enumerable = descriptor.enumerable || false;
- descriptor.configurable = true;
- if ("value" in descriptor) descriptor.writable = true;
- Object.defineProperty(target, descriptor.key, descriptor);
- }
- }
-
- return function (Constructor, protoProps, staticProps) {
- if (protoProps) defineProperties(Constructor.prototype, protoProps);
- if (staticProps) defineProperties(Constructor, staticProps);
- return Constructor;
- };
- }();
-
- var toConsumableArray = function (arr) {
- if (Array.isArray(arr)) {
- for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
-
- return arr2;
- } else {
- return Array.from(arr);
- }
- };
+ var TEMPLATE = '
' + '
' + '
' + '
' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '' + '
' + '
';
/**
* Check if the given value is not a number.
*/
- var isNaN = Number.isNaN || WINDOW.isNaN;
+ var isNaN = Number.isNaN || WINDOW.isNaN;
/**
* Check if the given value is a number.
* @param {*} value - The value to check.
* @returns {boolean} Returns `true` if the given value is a number, else `false`.
*/
+
function isNumber(value) {
return typeof value === 'number' && !isNaN(value);
}
+ /**
+ * Check if the given value is a positive number.
+ * @param {*} value - The value to check.
+ * @returns {boolean} Returns `true` if the given value is a positive number, else `false`.
+ */
+ var isPositiveNumber = function isPositiveNumber(value) {
+ return value > 0 && value < Infinity;
+ };
/**
* Check if the given value is undefined.
* @param {*} value - The value to check.
* @returns {boolean} Returns `true` if the given value is undefined, else `false`.
*/
+
function isUndefined(value) {
return typeof value === 'undefined';
}
-
/**
* Check if the given value is an object.
* @param {*} value - The value to check.
* @returns {boolean} Returns `true` if the given value is an object, else `false`.
*/
+
function isObject(value) {
- return (typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object' && value !== null;
+ return _typeof(value) === 'object' && value !== null;
}
-
var hasOwnProperty = Object.prototype.hasOwnProperty;
-
/**
* Check if the given value is a plain object.
* @param {*} value - The value to check.
@@ -259,41 +313,45 @@
try {
var _constructor = value.constructor;
var prototype = _constructor.prototype;
-
-
return _constructor && prototype && hasOwnProperty.call(prototype, 'isPrototypeOf');
- } catch (e) {
+ } catch (error) {
return false;
}
}
-
/**
* Check if the given value is a function.
* @param {*} value - The value to check.
* @returns {boolean} Returns `true` if the given value is a function, else `false`.
*/
+
function isFunction(value) {
return typeof value === 'function';
}
+ var slice = Array.prototype.slice;
+ /**
+ * Convert array-like or iterable object to an array.
+ * @param {*} value - The value to convert.
+ * @returns {Array} Returns a new array.
+ */
+ function toArray(value) {
+ return Array.from ? Array.from(value) : slice.call(value);
+ }
/**
* Iterate the given data.
* @param {*} data - The data to iterate.
* @param {Function} callback - The process function for each element.
* @returns {*} The original data.
*/
+
function forEach(data, callback) {
if (data && isFunction(callback)) {
- if (Array.isArray(data) || isNumber(data.length) /* array-like */) {
- var length = data.length;
-
- var i = void 0;
-
- for (i = 0; i < length; i += 1) {
- if (callback.call(data, data[i], i, data) === false) {
- break;
- }
- }
+ if (Array.isArray(data) || isNumber(data.length)
+ /* array-like */
+ ) {
+ toArray(data).forEach(function (value, key) {
+ callback.call(data, value, key, data);
+ });
} else if (isObject(data)) {
Object.keys(data).forEach(function (key) {
callback.call(data, data[key], key, data);
@@ -303,33 +361,31 @@
return data;
}
-
/**
* Extend the given object.
- * @param {*} obj - The object to be extended.
- * @param {*} args - The rest objects which will be merged to the first object.
+ * @param {*} target - The target object to extend.
+ * @param {*} args - The rest objects for merging to the target object.
* @returns {Object} The extended object.
*/
- var assign = Object.assign || function assign(obj) {
- for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+
+ var assign = Object.assign || function assign(target) {
+ for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
args[_key - 1] = arguments[_key];
}
- if (isObject(obj) && args.length > 0) {
+ if (isObject(target) && args.length > 0) {
args.forEach(function (arg) {
if (isObject(arg)) {
Object.keys(arg).forEach(function (key) {
- obj[key] = arg[key];
+ target[key] = arg[key];
});
}
});
}
- return obj;
+ return target;
};
-
- var REGEXP_DECIMALS = /\.\d*(?:0|9){12}\d*$/i;
-
+ var REGEXP_DECIMALS = /\.\d*(?:0|9){12}\d*$/;
/**
* Normalize decimal number.
* Check out {@link http://0.30000000000000004.com/}
@@ -337,47 +393,44 @@
* @param {number} [times=100000000000] - The times for normalizing.
* @returns {number} Returns the normalized number.
*/
+
function normalizeDecimalNumber(value) {
var times = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 100000000000;
-
return REGEXP_DECIMALS.test(value) ? Math.round(value * times) / times : value;
}
-
- var REGEXP_SUFFIX = /^(?:width|height|left|top|marginLeft|marginTop)$/;
-
+ var REGEXP_SUFFIX = /^width|height|left|top|marginLeft|marginTop$/;
/**
* Apply styles to the given element.
* @param {Element} element - The target element.
* @param {Object} styles - The styles for applying.
*/
+
function setStyle(element, styles) {
var style = element.style;
-
-
forEach(styles, function (value, property) {
if (REGEXP_SUFFIX.test(property) && isNumber(value)) {
- value += 'px';
+ value = "".concat(value, "px");
}
style[property] = value;
});
}
-
/**
* Check if the given element has a special class.
* @param {Element} element - The element to check.
* @param {string} value - The class to search.
* @returns {boolean} Returns `true` if the special class was found.
*/
+
function hasClass(element, value) {
return element.classList ? element.classList.contains(value) : element.className.indexOf(value) > -1;
}
-
/**
* Add classes to the given element.
* @param {Element} element - The target element.
* @param {string} value - The classes to be added.
*/
+
function addClass(element, value) {
if (!value) {
return;
@@ -400,15 +453,15 @@
if (!className) {
element.className = value;
} else if (className.indexOf(value) < 0) {
- element.className = className + ' ' + value;
+ element.className = "".concat(className, " ").concat(value);
}
}
-
/**
* Remove classes from the given element.
* @param {Element} element - The target element.
* @param {string} value - The classes to be removed.
*/
+
function removeClass(element, value) {
if (!value) {
return;
@@ -430,13 +483,13 @@
element.className = element.className.replace(value, '');
}
}
-
/**
* Add or remove classes from the given element.
* @param {Element} element - The target element.
* @param {string} value - The classes to be toggled.
* @param {boolean} added - Add only.
*/
+
function toggleClass(element, value, added) {
if (!value) {
return;
@@ -447,114 +500,114 @@
toggleClass(elem, value, added);
});
return;
- }
+ } // IE10-11 doesn't support the second parameter of `classList.toggle`
+
- // IE10-11 doesn't support the second parameter of `classList.toggle`
if (added) {
addClass(element, value);
} else {
removeClass(element, value);
}
}
-
- var REGEXP_HYPHENATE = /([a-z\d])([A-Z])/g;
-
+ var REGEXP_CAMEL_CASE = /([a-z\d])([A-Z])/g;
/**
* Transform the given string from camelCase to kebab-case
* @param {string} value - The value to transform.
* @returns {string} The transformed value.
*/
- function hyphenate(value) {
- return value.replace(REGEXP_HYPHENATE, '$1-$2').toLowerCase();
- }
+ function toParamCase(value) {
+ return value.replace(REGEXP_CAMEL_CASE, '$1-$2').toLowerCase();
+ }
/**
* Get data from the given element.
* @param {Element} element - The target element.
* @param {string} name - The data key to get.
* @returns {string} The data value.
*/
+
function getData(element, name) {
if (isObject(element[name])) {
return element[name];
- } else if (element.dataset) {
+ }
+
+ if (element.dataset) {
return element.dataset[name];
}
- return element.getAttribute('data-' + hyphenate(name));
+ return element.getAttribute("data-".concat(toParamCase(name)));
}
-
/**
* Set data to the given element.
* @param {Element} element - The target element.
* @param {string} name - The data key to set.
* @param {string} data - The data value.
*/
+
function setData(element, name, data) {
if (isObject(data)) {
element[name] = data;
} else if (element.dataset) {
element.dataset[name] = data;
} else {
- element.setAttribute('data-' + hyphenate(name), data);
+ element.setAttribute("data-".concat(toParamCase(name)), data);
}
}
-
/**
* Remove data from the given element.
* @param {Element} element - The target element.
* @param {string} name - The data key to remove.
*/
+
function removeData(element, name) {
if (isObject(element[name])) {
try {
delete element[name];
- } catch (e) {
+ } catch (error) {
element[name] = undefined;
}
} else if (element.dataset) {
// #128 Safari not allows to delete dataset property
try {
delete element.dataset[name];
- } catch (e) {
+ } catch (error) {
element.dataset[name] = undefined;
}
} else {
- element.removeAttribute('data-' + hyphenate(name));
+ element.removeAttribute("data-".concat(toParamCase(name)));
}
}
-
var REGEXP_SPACES = /\s\s*/;
+
var onceSupported = function () {
var supported = false;
- if (IN_BROWSER) {
+ if (IS_BROWSER) {
var once = false;
+
var listener = function listener() {};
+
var options = Object.defineProperty({}, 'once', {
- get: function get$$1() {
+ get: function get() {
supported = true;
return once;
},
-
/**
* This setter can fix a `TypeError` in strict mode
* {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Getter_only}
* @param {boolean} value - The value to set
*/
- set: function set$$1(value) {
+ set: function set(value) {
once = value;
}
});
-
WINDOW.addEventListener('test', listener, options);
WINDOW.removeEventListener('test', listener, options);
}
return supported;
}();
-
/**
* Remove event listener from the target element.
* @param {Element} element - The event target.
@@ -562,16 +615,15 @@
* @param {Function} listener - The event listener.
* @param {Object} options - The event options.
*/
+
+
function removeListener(element, type, listener) {
var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-
var handler = listener;
-
type.trim().split(REGEXP_SPACES).forEach(function (event) {
if (!onceSupported) {
var listeners = element.listeners;
-
if (listeners && listeners[event] && listeners[event][listener]) {
handler = listeners[event][listener];
delete listeners[event][listener];
@@ -589,7 +641,6 @@
element.removeEventListener(event, handler, options);
});
}
-
/**
* Add event listener to the target element.
* @param {Element} element - The event target.
@@ -597,24 +648,23 @@
* @param {Function} listener - The event listener.
* @param {Object} options - The event options.
*/
+
function addListener(element, type, listener) {
var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-
var _handler = listener;
-
type.trim().split(REGEXP_SPACES).forEach(function (event) {
if (options.once && !onceSupported) {
var _element$listeners = element.listeners,
- listeners = _element$listeners === undefined ? {} : _element$listeners;
-
+ listeners = _element$listeners === void 0 ? {} : _element$listeners;
_handler = function handler() {
- for (var _len2 = arguments.length, args = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+ delete listeners[event][listener];
+ element.removeEventListener(event, _handler, options);
+
+ for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
args[_key2] = arguments[_key2];
}
- delete listeners[event][listener];
- element.removeEventListener(event, _handler, options);
listener.apply(element, args);
};
@@ -633,7 +683,6 @@
element.addEventListener(event, _handler, options);
});
}
-
/**
* Dispatch event on the target element.
* @param {Element} element - The event target.
@@ -641,10 +690,10 @@
* @param {Object} data - The additional event data.
* @returns {boolean} Indicate if the event is default prevented or not.
*/
+
function dispatchEvent(element, type, data) {
- var event = void 0;
+ var event; // Event and CustomEvent on IE9-11 are global objects, not constructors
- // Event and CustomEvent on IE9-11 are global objects, not constructors
if (isFunction(Event) && isFunction(CustomEvent)) {
event = new CustomEvent(type, {
detail: data,
@@ -658,103 +707,95 @@
return element.dispatchEvent(event);
}
-
/**
* Get the offset base on the document.
* @param {Element} element - The target element.
* @returns {Object} The offset data.
*/
+
function getOffset(element) {
var box = element.getBoundingClientRect();
-
return {
left: box.left + (window.pageXOffset - document.documentElement.clientLeft),
top: box.top + (window.pageYOffset - document.documentElement.clientTop)
};
}
-
var location = WINDOW.location;
-
- var REGEXP_ORIGINS = /^(https?:)\/\/([^:/?#]+):?(\d*)/i;
-
+ var REGEXP_ORIGINS = /^(\w+:)\/\/([^:/?#]*):?(\d*)/i;
/**
* Check if the given URL is a cross origin URL.
* @param {string} url - The target URL.
* @returns {boolean} Returns `true` if the given URL is a cross origin URL, else `false`.
*/
+
function isCrossOriginURL(url) {
var parts = url.match(REGEXP_ORIGINS);
-
- return parts && (parts[1] !== location.protocol || parts[2] !== location.hostname || parts[3] !== location.port);
+ return parts !== null && (parts[1] !== location.protocol || parts[2] !== location.hostname || parts[3] !== location.port);
}
-
/**
* Add timestamp to the given URL.
* @param {string} url - The target URL.
* @returns {string} The result URL.
*/
- function addTimestamp(url) {
- var timestamp = 'timestamp=' + new Date().getTime();
+ function addTimestamp(url) {
+ var timestamp = "timestamp=".concat(new Date().getTime());
return url + (url.indexOf('?') === -1 ? '?' : '&') + timestamp;
}
-
/**
* Get transforms base on the given object.
* @param {Object} obj - The target object.
* @returns {string} A string contains transform values.
*/
+
function getTransforms(_ref) {
var rotate = _ref.rotate,
scaleX = _ref.scaleX,
scaleY = _ref.scaleY,
translateX = _ref.translateX,
translateY = _ref.translateY;
-
var values = [];
if (isNumber(translateX) && translateX !== 0) {
- values.push('translateX(' + translateX + 'px)');
+ values.push("translateX(".concat(translateX, "px)"));
}
if (isNumber(translateY) && translateY !== 0) {
- values.push('translateY(' + translateY + 'px)');
- }
+ values.push("translateY(".concat(translateY, "px)"));
+ } // Rotate should come first before scale to match orientation transform
+
- // Rotate should come first before scale to match orientation transform
if (isNumber(rotate) && rotate !== 0) {
- values.push('rotate(' + rotate + 'deg)');
+ values.push("rotate(".concat(rotate, "deg)"));
}
if (isNumber(scaleX) && scaleX !== 1) {
- values.push('scaleX(' + scaleX + ')');
+ values.push("scaleX(".concat(scaleX, ")"));
}
if (isNumber(scaleY) && scaleY !== 1) {
- values.push('scaleY(' + scaleY + ')');
+ values.push("scaleY(".concat(scaleY, ")"));
}
var transform = values.length ? values.join(' ') : 'none';
-
return {
WebkitTransform: transform,
msTransform: transform,
transform: transform
};
}
-
/**
* Get the max ratio of a group of pointers.
* @param {string} pointers - The target pointers.
* @returns {number} The result ratio.
*/
+
function getMaxZoomRatio(pointers) {
- var pointers2 = assign({}, pointers);
- var ratios = [];
+ var pointers2 = _objectSpread2({}, pointers);
+ var ratios = [];
forEach(pointers, function (pointer, pointerId) {
delete pointers2[pointerId];
-
forEach(pointers2, function (pointer2) {
var x1 = Math.abs(pointer.startX - pointer2.startX);
var y1 = Math.abs(pointer.startY - pointer2.startY);
@@ -763,90 +804,74 @@
var z1 = Math.sqrt(x1 * x1 + y1 * y1);
var z2 = Math.sqrt(x2 * x2 + y2 * y2);
var ratio = (z2 - z1) / z1;
-
ratios.push(ratio);
});
});
-
ratios.sort(function (a, b) {
return Math.abs(a) < Math.abs(b);
});
-
return ratios[0];
}
-
/**
* Get a pointer from an event object.
* @param {Object} event - The target event object.
* @param {boolean} endOnly - Indicates if only returns the end point coordinate or not.
* @returns {Object} The result pointer contains start and/or end point coordinates.
*/
+
function getPointer(_ref2, endOnly) {
var pageX = _ref2.pageX,
pageY = _ref2.pageY;
-
var end = {
endX: pageX,
endY: pageY
};
-
- return endOnly ? end : assign({
+ return endOnly ? end : _objectSpread2({
startX: pageX,
startY: pageY
}, end);
}
-
/**
* Get the center point coordinate of a group of pointers.
* @param {Object} pointers - The target pointers.
* @returns {Object} The center point coordinate.
*/
+
function getPointersCenter(pointers) {
var pageX = 0;
var pageY = 0;
var count = 0;
-
forEach(pointers, function (_ref3) {
var startX = _ref3.startX,
startY = _ref3.startY;
-
pageX += startX;
pageY += startY;
count += 1;
});
-
pageX /= count;
pageY /= count;
-
return {
pageX: pageX,
pageY: pageY
};
}
-
- /**
- * Check if the given value is a finite number.
- */
- var isFinite = Number.isFinite || WINDOW.isFinite;
-
/**
* Get the max sizes in a rectangle under the given aspect ratio.
* @param {Object} data - The original sizes.
* @param {string} [type='contain'] - The adjust type.
* @returns {Object} The result sizes.
*/
+
function getAdjustedSizes(_ref4) // or 'cover'
{
var aspectRatio = _ref4.aspectRatio,
height = _ref4.height,
width = _ref4.width;
var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'contain';
+ var isValidWidth = isPositiveNumber(width);
+ var isValidHeight = isPositiveNumber(height);
- var isValidNumber = function isValidNumber(value) {
- return isFinite(value) && value > 0;
- };
-
- if (isValidNumber(width) && isValidNumber(height)) {
+ if (isValidWidth && isValidHeight) {
var adjustedWidth = height * aspectRatio;
if (type === 'contain' && adjustedWidth > width || type === 'cover' && adjustedWidth < width) {
@@ -854,9 +879,9 @@
} else {
width = height * aspectRatio;
}
- } else if (isValidNumber(width)) {
+ } else if (isValidWidth) {
height = width / aspectRatio;
- } else if (isValidNumber(height)) {
+ } else if (isValidHeight) {
width = height * aspectRatio;
}
@@ -865,17 +890,16 @@
height: height
};
}
-
/**
* Get the new sizes of a rectangle after rotated.
* @param {Object} data - The original sizes.
* @returns {Object} The result sizes.
*/
+
function getRotatedSizes(_ref5) {
var width = _ref5.width,
height = _ref5.height,
degree = _ref5.degree;
-
degree = Math.abs(degree) % 180;
if (degree === 90) {
@@ -890,7 +914,6 @@
var cosArc = Math.cos(arc);
var newWidth = width * cosArc + height * sinArc;
var newHeight = width * sinArc + height * cosArc;
-
return degree > 90 ? {
width: newHeight,
height: newWidth
@@ -899,7 +922,6 @@
height: newHeight
};
}
-
/**
* Get a canvas which drew the given image.
* @param {HTMLImageElement} image - The image for drawing.
@@ -908,34 +930,34 @@
* @param {Object} options - The options.
* @returns {HTMLCanvasElement} The result canvas.
*/
+
function getSourceCanvas(image, _ref6, _ref7, _ref8) {
var imageAspectRatio = _ref6.aspectRatio,
imageNaturalWidth = _ref6.naturalWidth,
imageNaturalHeight = _ref6.naturalHeight,
_ref6$rotate = _ref6.rotate,
- rotate = _ref6$rotate === undefined ? 0 : _ref6$rotate,
+ rotate = _ref6$rotate === void 0 ? 0 : _ref6$rotate,
_ref6$scaleX = _ref6.scaleX,
- scaleX = _ref6$scaleX === undefined ? 1 : _ref6$scaleX,
+ scaleX = _ref6$scaleX === void 0 ? 1 : _ref6$scaleX,
_ref6$scaleY = _ref6.scaleY,
- scaleY = _ref6$scaleY === undefined ? 1 : _ref6$scaleY;
+ scaleY = _ref6$scaleY === void 0 ? 1 : _ref6$scaleY;
var aspectRatio = _ref7.aspectRatio,
naturalWidth = _ref7.naturalWidth,
naturalHeight = _ref7.naturalHeight;
var _ref8$fillColor = _ref8.fillColor,
- fillColor = _ref8$fillColor === undefined ? 'transparent' : _ref8$fillColor,
+ fillColor = _ref8$fillColor === void 0 ? 'transparent' : _ref8$fillColor,
_ref8$imageSmoothingE = _ref8.imageSmoothingEnabled,
- imageSmoothingEnabled = _ref8$imageSmoothingE === undefined ? true : _ref8$imageSmoothingE,
+ imageSmoothingEnabled = _ref8$imageSmoothingE === void 0 ? true : _ref8$imageSmoothingE,
_ref8$imageSmoothingQ = _ref8.imageSmoothingQuality,
- imageSmoothingQuality = _ref8$imageSmoothingQ === undefined ? 'low' : _ref8$imageSmoothingQ,
+ imageSmoothingQuality = _ref8$imageSmoothingQ === void 0 ? 'low' : _ref8$imageSmoothingQ,
_ref8$maxWidth = _ref8.maxWidth,
- maxWidth = _ref8$maxWidth === undefined ? Infinity : _ref8$maxWidth,
+ maxWidth = _ref8$maxWidth === void 0 ? Infinity : _ref8$maxWidth,
_ref8$maxHeight = _ref8.maxHeight,
- maxHeight = _ref8$maxHeight === undefined ? Infinity : _ref8$maxHeight,
+ maxHeight = _ref8$maxHeight === void 0 ? Infinity : _ref8$maxHeight,
_ref8$minWidth = _ref8.minWidth,
- minWidth = _ref8$minWidth === undefined ? 0 : _ref8$minWidth,
+ minWidth = _ref8$minWidth === void 0 ? 0 : _ref8$minWidth,
_ref8$minHeight = _ref8.minHeight,
- minHeight = _ref8$minHeight === undefined ? 0 : _ref8$minHeight;
-
+ minHeight = _ref8$minHeight === void 0 ? 0 : _ref8$minHeight;
var canvas = document.createElement('canvas');
var context = canvas.getContext('2d');
var maxSizes = getAdjustedSizes({
@@ -949,10 +971,9 @@
height: minHeight
}, 'cover');
var width = Math.min(maxSizes.width, Math.max(minSizes.width, naturalWidth));
- var height = Math.min(maxSizes.height, Math.max(minSizes.height, naturalHeight));
-
- // Note: should always use image's natural sizes for drawing as
+ var height = Math.min(maxSizes.height, Math.max(minSizes.height, naturalHeight)); // Note: should always use image's natural sizes for drawing as
// imageData.naturalWidth === canvasData.naturalHeight when rotate % 180 === 90
+
var destMaxSizes = getAdjustedSizes({
aspectRatio: imageAspectRatio,
width: maxWidth,
@@ -966,7 +987,6 @@
var destWidth = Math.min(destMaxSizes.width, Math.max(destMinSizes.width, imageNaturalWidth));
var destHeight = Math.min(destMaxSizes.height, Math.max(destMinSizes.height, imageNaturalHeight));
var params = [-destWidth / 2, -destHeight / 2, destWidth, destHeight];
-
canvas.width = normalizeDecimalNumber(width);
canvas.height = normalizeDecimalNumber(height);
context.fillStyle = fillColor;
@@ -977,15 +997,13 @@
context.scale(scaleX, scaleY);
context.imageSmoothingEnabled = imageSmoothingEnabled;
context.imageSmoothingQuality = imageSmoothingQuality;
- context.drawImage.apply(context, [image].concat(toConsumableArray(params.map(function (param) {
+ context.drawImage.apply(context, [image].concat(_toConsumableArray(params.map(function (param) {
return Math.floor(normalizeDecimalNumber(param));
}))));
context.restore();
return canvas;
}
-
var fromCharCode = String.fromCharCode;
-
/**
* Get string from char code in data view.
* @param {DataView} dataView - The data view for read.
@@ -996,133 +1014,139 @@
function getStringFromCharCode(dataView, start, length) {
var str = '';
- var i = void 0;
-
length += start;
- for (i = start; i < length; i += 1) {
+ for (var i = start; i < length; i += 1) {
str += fromCharCode(dataView.getUint8(i));
}
return str;
}
-
var REGEXP_DATA_URL_HEAD = /^data:.*,/;
-
/**
* Transform Data URL to array buffer.
* @param {string} dataURL - The Data URL to transform.
* @returns {ArrayBuffer} The result array buffer.
*/
+
function dataURLToArrayBuffer(dataURL) {
var base64 = dataURL.replace(REGEXP_DATA_URL_HEAD, '');
var binary = atob(base64);
var arrayBuffer = new ArrayBuffer(binary.length);
var uint8 = new Uint8Array(arrayBuffer);
-
forEach(uint8, function (value, i) {
uint8[i] = binary.charCodeAt(i);
});
-
return arrayBuffer;
}
-
/**
* Transform array buffer to Data URL.
* @param {ArrayBuffer} arrayBuffer - The array buffer to transform.
* @param {string} mimeType - The mime type of the Data URL.
* @returns {string} The result Data URL.
*/
+
function arrayBufferToDataURL(arrayBuffer, mimeType) {
+ var chunks = []; // Chunk Typed Array for better performance (#435)
+
+ var chunkSize = 8192;
var uint8 = new Uint8Array(arrayBuffer);
- var data = '';
- // TypedArray.prototype.forEach is not supported in some browsers.
- forEach(uint8, function (value) {
- data += fromCharCode(value);
- });
+ while (uint8.length > 0) {
+ // XXX: Babel's `toConsumableArray` helper will throw error in IE or Safari 9
+ // eslint-disable-next-line prefer-spread
+ chunks.push(fromCharCode.apply(null, toArray(uint8.subarray(0, chunkSize))));
+ uint8 = uint8.subarray(chunkSize);
+ }
- return 'data:' + mimeType + ';base64,' + btoa(data);
+ return "data:".concat(mimeType, ";base64,").concat(btoa(chunks.join('')));
}
-
/**
* Get orientation value from given array buffer.
* @param {ArrayBuffer} arrayBuffer - The array buffer to read.
* @returns {number} The read orientation value.
*/
- function getOrientation(arrayBuffer) {
+
+ function resetAndGetOrientation(arrayBuffer) {
var dataView = new DataView(arrayBuffer);
- var orientation = void 0;
- var littleEndian = void 0;
- var app1Start = void 0;
- var ifdStart = void 0;
-
- // Only handle JPEG image (start by 0xFFD8)
- if (dataView.getUint8(0) === 0xFF && dataView.getUint8(1) === 0xD8) {
- var length = dataView.byteLength;
- var offset = 2;
-
- while (offset < length) {
- if (dataView.getUint8(offset) === 0xFF && dataView.getUint8(offset + 1) === 0xE1) {
- app1Start = offset;
- break;
- }
+ var orientation; // Ignores range error when the image does not have correct Exif information
- offset += 1;
- }
- }
+ try {
+ var littleEndian;
+ var app1Start;
+ var ifdStart; // Only handle JPEG image (start by 0xFFD8)
- if (app1Start) {
- var exifIDCode = app1Start + 4;
- var tiffOffset = app1Start + 10;
+ if (dataView.getUint8(0) === 0xFF && dataView.getUint8(1) === 0xD8) {
+ var length = dataView.byteLength;
+ var offset = 2;
- if (getStringFromCharCode(dataView, exifIDCode, 4) === 'Exif') {
- var endianness = dataView.getUint16(tiffOffset);
+ while (offset + 1 < length) {
+ if (dataView.getUint8(offset) === 0xFF && dataView.getUint8(offset + 1) === 0xE1) {
+ app1Start = offset;
+ break;
+ }
+
+ offset += 1;
+ }
+ }
- littleEndian = endianness === 0x4949;
+ if (app1Start) {
+ var exifIDCode = app1Start + 4;
+ var tiffOffset = app1Start + 10;
- if (littleEndian || endianness === 0x4D4D /* bigEndian */) {
- if (dataView.getUint16(tiffOffset + 2, littleEndian) === 0x002A) {
- var firstIFDOffset = dataView.getUint32(tiffOffset + 4, littleEndian);
+ if (getStringFromCharCode(dataView, exifIDCode, 4) === 'Exif') {
+ var endianness = dataView.getUint16(tiffOffset);
+ littleEndian = endianness === 0x4949;
- if (firstIFDOffset >= 0x00000008) {
- ifdStart = tiffOffset + firstIFDOffset;
+ if (littleEndian || endianness === 0x4D4D
+ /* bigEndian */
+ ) {
+ if (dataView.getUint16(tiffOffset + 2, littleEndian) === 0x002A) {
+ var firstIFDOffset = dataView.getUint32(tiffOffset + 4, littleEndian);
+
+ if (firstIFDOffset >= 0x00000008) {
+ ifdStart = tiffOffset + firstIFDOffset;
+ }
}
}
- }
+ }
}
- }
- if (ifdStart) {
- var _length = dataView.getUint16(ifdStart, littleEndian);
- var _offset = void 0;
- var i = void 0;
+ if (ifdStart) {
+ var _length = dataView.getUint16(ifdStart, littleEndian);
- for (i = 0; i < _length; i += 1) {
- _offset = ifdStart + i * 12 + 2;
+ var _offset;
- if (dataView.getUint16(_offset, littleEndian) === 0x0112 /* Orientation */) {
- // 8 is the offset of the current tag's value
- _offset += 8;
+ var i;
- // Get the original orientation value
- orientation = dataView.getUint16(_offset, littleEndian);
+ for (i = 0; i < _length; i += 1) {
+ _offset = ifdStart + i * 12 + 2;
- // Override the orientation with its default value
- dataView.setUint16(_offset, 1, littleEndian);
- break;
- }
+ if (dataView.getUint16(_offset, littleEndian) === 0x0112
+ /* Orientation */
+ ) {
+ // 8 is the offset of the current tag's value
+ _offset += 8; // Get the original orientation value
+
+ orientation = dataView.getUint16(_offset, littleEndian); // Override the orientation with its default value
+
+ dataView.setUint16(_offset, 1, littleEndian);
+ break;
+ }
+ }
}
+ } catch (error) {
+ orientation = 1;
}
return orientation;
}
-
/**
* Parse Exif Orientation value.
* @param {number} orientation - The orientation to parse.
* @returns {Object} The parsed result.
*/
+
function parseOrientation(orientation) {
var rotate = 0;
var scaleX = 1;
@@ -1133,35 +1157,35 @@
case 2:
scaleX = -1;
break;
-
// Rotate left 180°
+
case 3:
rotate = -180;
break;
-
// Flip vertical
+
case 4:
scaleY = -1;
break;
-
// Flip vertical and rotate right 90°
+
case 5:
rotate = 90;
scaleY = -1;
break;
-
// Rotate right 90°
+
case 6:
rotate = 90;
break;
-
// Flip horizontal and rotate right 90°
+
case 7:
rotate = 90;
scaleX = -1;
break;
-
// Rotate left 90°
+
case 8:
rotate = -90;
break;
@@ -1192,34 +1216,25 @@
options = this.options,
container = this.container,
cropper = this.cropper;
-
-
addClass(cropper, CLASS_HIDDEN);
removeClass(element, CLASS_HIDDEN);
-
var containerData = {
width: Math.max(container.offsetWidth, Number(options.minContainerWidth) || 200),
height: Math.max(container.offsetHeight, Number(options.minContainerHeight) || 100)
};
-
this.containerData = containerData;
-
setStyle(cropper, {
width: containerData.width,
height: containerData.height
});
-
addClass(element, CLASS_HIDDEN);
removeClass(cropper, CLASS_HIDDEN);
},
-
-
// Canvas (image wrapper)
initCanvas: function initCanvas() {
var containerData = this.containerData,
imageData = this.imageData;
var viewMode = this.options.viewMode;
-
var rotated = Math.abs(imageData.rotate) % 180 === 90;
var naturalWidth = rotated ? imageData.naturalHeight : imageData.naturalWidth;
var naturalHeight = rotated ? imageData.naturalWidth : imageData.naturalHeight;
@@ -1246,12 +1261,10 @@
width: canvasWidth,
height: canvasHeight
};
-
canvasData.left = (containerData.width - canvasWidth) / 2;
canvasData.top = (containerData.height - canvasHeight) / 2;
canvasData.oldLeft = canvasData.left;
canvasData.oldTop = canvasData.top;
-
this.canvasData = canvasData;
this.limited = viewMode === 1 || viewMode === 2;
this.limitCanvas(true, true);
@@ -1265,7 +1278,6 @@
cropBoxData = this.cropBoxData;
var viewMode = options.viewMode;
var aspectRatio = canvasData.aspectRatio;
-
var cropped = this.cropped && cropBoxData;
if (sizeLimited) {
@@ -1308,8 +1320,6 @@
minCanvasWidth = _getAdjustedSizes.width;
minCanvasHeight = _getAdjustedSizes.height;
-
-
canvasData.minWidth = minCanvasWidth;
canvasData.minHeight = minCanvasHeight;
canvasData.maxWidth = Infinity;
@@ -1317,10 +1327,9 @@
}
if (positionLimited) {
- if (viewMode) {
+ if (viewMode > (cropped ? 0 : 1)) {
var newCanvasLeft = containerData.width - canvasData.width;
var newCanvasTop = containerData.height - canvasData.height;
-
canvasData.minLeft = Math.min(0, newCanvasLeft);
canvasData.minTop = Math.min(0, newCanvasTop);
canvasData.maxLeft = Math.max(0, newCanvasLeft);
@@ -1356,7 +1365,6 @@
var canvasData = this.canvasData,
imageData = this.imageData;
-
if (transformed) {
var _getRotatedSizes = getRotatedSizes({
width: imageData.naturalWidth * Math.abs(imageData.scaleX || 1),
@@ -1368,7 +1376,6 @@
var width = canvasData.width * (naturalWidth / canvasData.naturalWidth);
var height = canvasData.height * (naturalHeight / canvasData.naturalHeight);
-
canvasData.left -= (width - canvasData.width) / 2;
canvasData.top -= (height - canvasData.height) / 2;
canvasData.width = width;
@@ -1389,14 +1396,11 @@
canvasData.width = Math.min(Math.max(canvasData.width, canvasData.minWidth), canvasData.maxWidth);
canvasData.height = Math.min(Math.max(canvasData.height, canvasData.minHeight), canvasData.maxHeight);
-
this.limitCanvas(false, true);
-
canvasData.left = Math.min(Math.max(canvasData.left, canvasData.minLeft), canvasData.maxLeft);
canvasData.top = Math.min(Math.max(canvasData.top, canvasData.minTop), canvasData.maxTop);
canvasData.oldLeft = canvasData.left;
canvasData.oldTop = canvasData.top;
-
setStyle(this.canvas, assign({
width: canvasData.width,
height: canvasData.height
@@ -1404,7 +1408,6 @@
translateX: canvasData.left,
translateY: canvasData.top
})));
-
this.renderImage(changed);
if (this.cropped && this.limited) {
@@ -1414,10 +1417,8 @@
renderImage: function renderImage(changed) {
var canvasData = this.canvasData,
imageData = this.imageData;
-
var width = imageData.naturalWidth * (canvasData.width / canvasData.naturalWidth);
var height = imageData.naturalHeight * (canvasData.height / canvasData.naturalHeight);
-
assign(imageData, {
width: width,
height: height,
@@ -1439,8 +1440,7 @@
initCropBox: function initCropBox() {
var options = this.options,
canvasData = this.canvasData;
- var aspectRatio = options.aspectRatio;
-
+ var aspectRatio = options.aspectRatio || options.initialAspectRatio;
var autoCropArea = Number(options.autoCropArea) || 0.8;
var cropBoxData = {
width: canvasData.width,
@@ -1456,20 +1456,17 @@
}
this.cropBoxData = cropBoxData;
- this.limitCropBox(true, true);
+ this.limitCropBox(true, true); // Initialize auto crop area
- // Initialize auto crop area
cropBoxData.width = Math.min(Math.max(cropBoxData.width, cropBoxData.minWidth), cropBoxData.maxWidth);
- cropBoxData.height = Math.min(Math.max(cropBoxData.height, cropBoxData.minHeight), cropBoxData.maxHeight);
+ cropBoxData.height = Math.min(Math.max(cropBoxData.height, cropBoxData.minHeight), cropBoxData.maxHeight); // The width/height of auto crop area must large than "minWidth/Height"
- // The width/height of auto crop area must large than "minWidth/Height"
cropBoxData.width = Math.max(cropBoxData.minWidth, cropBoxData.width * autoCropArea);
cropBoxData.height = Math.max(cropBoxData.minHeight, cropBoxData.height * autoCropArea);
cropBoxData.left = canvasData.left + (canvasData.width - cropBoxData.width) / 2;
cropBoxData.top = canvasData.top + (canvasData.height - cropBoxData.height) / 2;
cropBoxData.oldLeft = cropBoxData.left;
cropBoxData.oldTop = cropBoxData.top;
-
this.initialCropBoxData = assign({}, cropBoxData);
},
limitCropBox: function limitCropBox(sizeLimited, positionLimited) {
@@ -1480,14 +1477,12 @@
limited = this.limited;
var aspectRatio = options.aspectRatio;
-
if (sizeLimited) {
var minCropBoxWidth = Number(options.minCropBoxWidth) || 0;
var minCropBoxHeight = Number(options.minCropBoxHeight) || 0;
- var maxCropBoxWidth = Math.min(containerData.width, limited ? canvasData.width : containerData.width);
- var maxCropBoxHeight = Math.min(containerData.height, limited ? canvasData.height : containerData.height);
+ var maxCropBoxWidth = limited ? Math.min(containerData.width, canvasData.width, canvasData.width + canvasData.left, containerData.width - canvasData.left) : containerData.width;
+ var maxCropBoxHeight = limited ? Math.min(containerData.height, canvasData.height, canvasData.height + canvasData.top, containerData.height - canvasData.top) : containerData.height; // The min/maxCropBoxWidth/Height must be less than container's width/height
- // The min/maxCropBoxWidth/Height must be less than container's width/height
minCropBoxWidth = Math.min(minCropBoxWidth, containerData.width);
minCropBoxHeight = Math.min(minCropBoxHeight, containerData.height);
@@ -1509,9 +1504,9 @@
} else {
maxCropBoxWidth = maxCropBoxHeight * aspectRatio;
}
- }
+ } // The minWidth/Height must be less than maxWidth/Height
+
- // The minWidth/Height must be less than maxWidth/Height
cropBoxData.minWidth = Math.min(minCropBoxWidth, maxCropBoxWidth);
cropBoxData.minHeight = Math.min(minCropBoxHeight, maxCropBoxHeight);
cropBoxData.maxWidth = maxCropBoxWidth;
@@ -1537,7 +1532,6 @@
containerData = this.containerData,
cropBoxData = this.cropBoxData;
-
if (cropBoxData.width > cropBoxData.maxWidth || cropBoxData.width < cropBoxData.minWidth) {
cropBoxData.left = cropBoxData.oldLeft;
}
@@ -1548,9 +1542,7 @@
cropBoxData.width = Math.min(Math.max(cropBoxData.width, cropBoxData.minWidth), cropBoxData.maxWidth);
cropBoxData.height = Math.min(Math.max(cropBoxData.height, cropBoxData.minHeight), cropBoxData.maxHeight);
-
this.limitCropBox(false, true);
-
cropBoxData.left = Math.min(Math.max(cropBoxData.left, cropBoxData.minLeft), cropBoxData.maxLeft);
cropBoxData.top = Math.min(Math.max(cropBoxData.top, cropBoxData.minTop), cropBoxData.maxTop);
cropBoxData.oldLeft = cropBoxData.left;
@@ -1585,10 +1577,11 @@
var preview = {
initPreview: function initPreview() {
- var crossOrigin = this.crossOrigin;
+ var element = this.element,
+ crossOrigin = this.crossOrigin;
var preview = this.options.preview;
-
var url = crossOrigin ? this.crossOriginUrl : this.url;
+ var alt = element.alt || 'The image to preview';
var image = document.createElement('img');
if (crossOrigin) {
@@ -1596,6 +1589,7 @@
}
image.src = url;
+ image.alt = alt;
this.viewBox.appendChild(image);
this.viewBoxImage = image;
@@ -1606,17 +1600,15 @@
var previews = preview;
if (typeof preview === 'string') {
- previews = this.element.ownerDocument.querySelectorAll(preview);
+ previews = element.ownerDocument.querySelectorAll(preview);
} else if (preview.querySelector) {
previews = [preview];
}
this.previews = previews;
-
forEach(previews, function (el) {
- var img = document.createElement('img');
+ var img = document.createElement('img'); // Save the original size for recover
- // Save the original size for recover
setData(el, DATA_PREVIEW, {
width: el.offsetWidth,
height: el.offsetHeight,
@@ -1628,15 +1620,15 @@
}
img.src = url;
-
+ img.alt = alt;
/**
* Override img element styles
* Add `display:block` to avoid margin top issue
* Add `height:auto` to override `height` attribute on IE8
* (Occur only when margin-top <= -height)
*/
- img.style.cssText = 'display:block;' + 'width:100%;' + 'height:auto;' + 'min-width:0!important;' + 'min-height:0!important;' + 'max-width:none!important;' + 'max-height:none!important;' + 'image-orientation:0deg!important;"';
+ img.style.cssText = 'display:block;' + 'width:100%;' + 'height:auto;' + 'min-width:0!important;' + 'min-height:0!important;' + 'max-width:none!important;' + 'max-height:none!important;' + 'image-orientation:0deg!important;"';
el.innerHTML = '';
el.appendChild(img);
});
@@ -1644,12 +1636,10 @@
resetPreview: function resetPreview() {
forEach(this.previews, function (element) {
var data = getData(element, DATA_PREVIEW);
-
setStyle(element, {
width: data.width,
height: data.height
});
-
element.innerHTML = data.html;
removeData(element, DATA_PREVIEW);
});
@@ -1662,7 +1652,6 @@
cropBoxHeight = cropBoxData.height;
var width = imageData.width,
height = imageData.height;
-
var left = cropBoxData.left - canvasData.left - imageData.left;
var top = cropBoxData.top - canvasData.top - imageData.top;
@@ -1677,7 +1666,6 @@
translateX: -left,
translateY: -top
}, imageData))));
-
forEach(this.previews, function (element) {
var data = getData(element, DATA_PREVIEW);
var originalWidth = data.width;
@@ -1701,7 +1689,6 @@
width: newWidth,
height: newHeight
});
-
setStyle(element.getElementsByTagName('img')[0], assign({
width: width * ratio,
height: height * ratio
@@ -1719,7 +1706,6 @@
options = this.options,
cropper = this.cropper;
-
if (isFunction(options.cropstart)) {
addListener(element, EVENT_CROP_START, options.cropstart);
}
@@ -1743,7 +1729,10 @@
addListener(cropper, EVENT_POINTER_DOWN, this.onCropStart = this.cropStart.bind(this));
if (options.zoomable && options.zoomOnWheel) {
- addListener(cropper, EVENT_WHEEL, this.onWheel = this.wheel.bind(this));
+ addListener(cropper, EVENT_WHEEL, this.onWheel = this.wheel.bind(this), {
+ passive: false,
+ capture: true
+ });
}
if (options.toggleDragModeOnDblclick) {
@@ -1762,7 +1751,6 @@
options = this.options,
cropper = this.cropper;
-
if (isFunction(options.cropstart)) {
removeListener(element, EVENT_CROP_START, options.cropstart);
}
@@ -1786,7 +1774,10 @@
removeListener(cropper, EVENT_POINTER_DOWN, this.onCropStart);
if (options.zoomable && options.zoomOnWheel) {
- removeListener(cropper, EVENT_WHEEL, this.onWheel);
+ removeListener(cropper, EVENT_WHEEL, this.onWheel, {
+ passive: false,
+ capture: true
+ });
}
if (options.toggleDragModeOnDblclick) {
@@ -1807,20 +1798,18 @@
var options = this.options,
container = this.container,
containerData = this.containerData;
-
- var minContainerWidth = Number(options.minContainerWidth) || 200;
- var minContainerHeight = Number(options.minContainerHeight) || 100;
+ var minContainerWidth = Number(options.minContainerWidth) || MIN_CONTAINER_WIDTH;
+ var minContainerHeight = Number(options.minContainerHeight) || MIN_CONTAINER_HEIGHT;
if (this.disabled || containerData.width <= minContainerWidth || containerData.height <= minContainerHeight) {
return;
}
- var ratio = container.offsetWidth / containerData.width;
+ var ratio = container.offsetWidth / containerData.width; // Resize when width changed or height changed
- // Resize when width changed or height changed
if (ratio !== 1 || container.offsetHeight !== containerData.height) {
- var canvasData = void 0;
- var cropBoxData = void 0;
+ var canvasData;
+ var cropBoxData;
if (options.restore) {
canvasData = this.getCanvasData();
@@ -1846,7 +1835,7 @@
this.setDragMode(hasClass(this.dragBox, CLASS_CROP) ? DRAG_MODE_MOVE : DRAG_MODE_CROP);
},
- wheel: function wheel(e) {
+ wheel: function wheel(event) {
var _this = this;
var ratio = Number(this.options.wheelZoomRatio) || 0.1;
@@ -1856,53 +1845,56 @@
return;
}
- e.preventDefault();
+ event.preventDefault(); // Limit wheel speed to prevent zoom too fast (#21)
- // Limit wheel speed to prevent zoom too fast (#21)
if (this.wheeling) {
return;
}
this.wheeling = true;
-
setTimeout(function () {
_this.wheeling = false;
}, 50);
- if (e.deltaY) {
- delta = e.deltaY > 0 ? 1 : -1;
- } else if (e.wheelDelta) {
- delta = -e.wheelDelta / 120;
- } else if (e.detail) {
- delta = e.detail > 0 ? 1 : -1;
+ if (event.deltaY) {
+ delta = event.deltaY > 0 ? 1 : -1;
+ } else if (event.wheelDelta) {
+ delta = -event.wheelDelta / 120;
+ } else if (event.detail) {
+ delta = event.detail > 0 ? 1 : -1;
}
- this.zoom(-delta * ratio, e);
+ this.zoom(-delta * ratio, event);
},
- cropStart: function cropStart(e) {
- if (this.disabled) {
+ cropStart: function cropStart(event) {
+ var buttons = event.buttons,
+ button = event.button;
+
+ if (this.disabled // Handle mouse event and pointer event and ignore touch event
+ || (event.type === 'mousedown' || event.type === 'pointerdown' && event.pointerType === 'mouse') && ( // No primary button (Usually the left button)
+ isNumber(buttons) && buttons !== 1 || isNumber(button) && button !== 0 // Open context menu
+ || event.ctrlKey)) {
return;
}
var options = this.options,
pointers = this.pointers;
+ var action;
- var action = void 0;
-
- if (e.changedTouches) {
+ if (event.changedTouches) {
// Handle touch event
- forEach(e.changedTouches, function (touch) {
+ forEach(event.changedTouches, function (touch) {
pointers[touch.identifier] = getPointer(touch);
});
} else {
// Handle mouse event and pointer event
- pointers[e.pointerId || 0] = getPointer(e);
+ pointers[event.pointerId || 0] = getPointer(event);
}
if (Object.keys(pointers).length > 1 && options.zoomable && options.zoomOnTouch) {
action = ACTION_ZOOM;
} else {
- action = getData(e.target, DATA_ACTION);
+ action = getData(event.target, DATA_ACTION);
}
if (!REGEXP_ACTIONS.test(action)) {
@@ -1910,14 +1902,14 @@
}
if (dispatchEvent(this.element, EVENT_CROP_START, {
- originalEvent: e,
+ originalEvent: event,
action: action
}) === false) {
return;
- }
+ } // This line is required for preventing page zooming in iOS browsers
- e.preventDefault();
+ event.preventDefault();
this.action = action;
this.cropping = false;
@@ -1926,37 +1918,35 @@
addClass(this.dragBox, CLASS_MODAL);
}
},
- cropMove: function cropMove(e) {
+ cropMove: function cropMove(event) {
var action = this.action;
-
if (this.disabled || !action) {
return;
}
var pointers = this.pointers;
-
-
- e.preventDefault();
+ event.preventDefault();
if (dispatchEvent(this.element, EVENT_CROP_MOVE, {
- originalEvent: e,
+ originalEvent: event,
action: action
}) === false) {
return;
}
- if (e.changedTouches) {
- forEach(e.changedTouches, function (touch) {
- assign(pointers[touch.identifier], getPointer(touch, true));
+ if (event.changedTouches) {
+ forEach(event.changedTouches, function (touch) {
+ // The first parameter should not be undefined (#432)
+ assign(pointers[touch.identifier] || {}, getPointer(touch, true));
});
} else {
- assign(pointers[e.pointerId || 0], getPointer(e, true));
+ assign(pointers[event.pointerId || 0] || {}, getPointer(event, true));
}
- this.change(e);
+ this.change(event);
},
- cropEnd: function cropEnd(e) {
+ cropEnd: function cropEnd(event) {
if (this.disabled) {
return;
}
@@ -1964,20 +1954,19 @@
var action = this.action,
pointers = this.pointers;
-
- if (e.changedTouches) {
- forEach(e.changedTouches, function (touch) {
+ if (event.changedTouches) {
+ forEach(event.changedTouches, function (touch) {
delete pointers[touch.identifier];
});
} else {
- delete pointers[e.pointerId || 0];
+ delete pointers[event.pointerId || 0];
}
if (!action) {
return;
}
- e.preventDefault();
+ event.preventDefault();
if (!Object.keys(pointers).length) {
this.action = '';
@@ -1989,14 +1978,14 @@
}
dispatchEvent(this.element, EVENT_CROP_END, {
- originalEvent: e,
+ originalEvent: event,
action: action
});
}
};
var change = {
- change: function change(e) {
+ change: function change(event) {
var options = this.options,
canvasData = this.canvasData,
containerData = this.containerData,
@@ -2008,7 +1997,6 @@
top = cropBoxData.top,
width = cropBoxData.width,
height = cropBoxData.height;
-
var right = left + width;
var bottom = top + height;
var minLeft = 0;
@@ -2016,17 +2004,15 @@
var maxWidth = containerData.width;
var maxHeight = containerData.height;
var renderable = true;
- var offset = void 0;
+ var offset; // Locking aspect ratio in "free mode" by holding shift key
- // Locking aspect ratio in "free mode" by holding shift key
- if (!aspectRatio && e.shiftKey) {
+ if (!aspectRatio && event.shiftKey) {
aspectRatio = width && height ? width / height : 1;
}
if (this.limited) {
minLeft = cropBoxData.minLeft;
minTop = cropBoxData.minTop;
-
maxWidth = minLeft + Math.min(containerData.width, canvasData.width, canvasData.left + canvasData.width);
maxHeight = minTop + Math.min(containerData.height, canvasData.height, canvasData.top + canvasData.height);
}
@@ -2036,6 +2022,7 @@
x: pointer.endX - pointer.startX,
y: pointer.endY - pointer.startY
};
+
var check = function check(side) {
switch (side) {
case ACTION_EAST:
@@ -2076,8 +2063,8 @@
left += range.x;
top += range.y;
break;
-
// Resize crop box
+
case ACTION_EAST:
if (range.x >= 0 && (right >= maxWidth || aspectRatio && (top <= minTop || bottom >= maxHeight))) {
renderable = false;
@@ -2087,14 +2074,15 @@
check(ACTION_EAST);
width += range.x;
- if (aspectRatio) {
- height = width / aspectRatio;
- top -= range.x / aspectRatio / 2;
- }
-
if (width < 0) {
action = ACTION_WEST;
- width = 0;
+ width = -width;
+ left -= width;
+ }
+
+ if (aspectRatio) {
+ height = width / aspectRatio;
+ top += (cropBoxData.height - height) / 2;
}
break;
@@ -2109,14 +2097,15 @@
height -= range.y;
top += range.y;
- if (aspectRatio) {
- width = height * aspectRatio;
- left += range.y * aspectRatio / 2;
- }
-
if (height < 0) {
action = ACTION_SOUTH;
- height = 0;
+ height = -height;
+ top -= height;
+ }
+
+ if (aspectRatio) {
+ width = height * aspectRatio;
+ left += (cropBoxData.width - width) / 2;
}
break;
@@ -2131,14 +2120,15 @@
width -= range.x;
left += range.x;
- if (aspectRatio) {
- height = width / aspectRatio;
- top += range.x / aspectRatio / 2;
- }
-
if (width < 0) {
action = ACTION_EAST;
- width = 0;
+ width = -width;
+ left -= width;
+ }
+
+ if (aspectRatio) {
+ height = width / aspectRatio;
+ top += (cropBoxData.height - height) / 2;
}
break;
@@ -2152,14 +2142,15 @@
check(ACTION_SOUTH);
height += range.y;
- if (aspectRatio) {
- width = height * aspectRatio;
- left -= range.y * aspectRatio / 2;
- }
-
if (height < 0) {
action = ACTION_NORTH;
- height = 0;
+ height = -height;
+ top -= height;
+ }
+
+ if (aspectRatio) {
+ width = height * aspectRatio;
+ left += (cropBoxData.width - width) / 2;
}
break;
@@ -2202,14 +2193,18 @@
if (width < 0 && height < 0) {
action = ACTION_SOUTH_WEST;
- height = 0;
- width = 0;
+ height = -height;
+ width = -width;
+ top -= height;
+ left -= width;
} else if (width < 0) {
action = ACTION_NORTH_WEST;
- width = 0;
+ width = -width;
+ left -= width;
} else if (height < 0) {
action = ACTION_SOUTH_EAST;
- height = 0;
+ height = -height;
+ top -= height;
}
break;
@@ -2225,7 +2220,7 @@
height -= range.y;
top += range.y;
width = height * aspectRatio;
- left += range.y * aspectRatio;
+ left += cropBoxData.width - width;
} else {
check(ACTION_NORTH);
check(ACTION_WEST);
@@ -2255,14 +2250,18 @@
if (width < 0 && height < 0) {
action = ACTION_SOUTH_EAST;
- height = 0;
- width = 0;
+ height = -height;
+ width = -width;
+ top -= height;
+ left -= width;
} else if (width < 0) {
action = ACTION_NORTH_EAST;
- width = 0;
+ width = -width;
+ left -= width;
} else if (height < 0) {
action = ACTION_SOUTH_WEST;
- height = 0;
+ height = -height;
+ top -= height;
}
break;
@@ -2305,14 +2304,18 @@
if (width < 0 && height < 0) {
action = ACTION_NORTH_EAST;
- height = 0;
- width = 0;
+ height = -height;
+ width = -width;
+ top -= height;
+ left -= width;
} else if (width < 0) {
action = ACTION_SOUTH_EAST;
- width = 0;
+ width = -width;
+ left -= width;
} else if (height < 0) {
action = ACTION_NORTH_WEST;
- height = 0;
+ height = -height;
+ top -= height;
}
break;
@@ -2352,31 +2355,35 @@
if (width < 0 && height < 0) {
action = ACTION_NORTH_WEST;
- height = 0;
- width = 0;
+ height = -height;
+ width = -width;
+ top -= height;
+ left -= width;
} else if (width < 0) {
action = ACTION_SOUTH_WEST;
- width = 0;
+ width = -width;
+ left -= width;
} else if (height < 0) {
action = ACTION_NORTH_EAST;
- height = 0;
+ height = -height;
+ top -= height;
}
break;
-
// Move canvas
+
case ACTION_MOVE:
this.move(range.x, range.y);
renderable = false;
break;
-
// Zoom canvas
+
case ACTION_ZOOM:
- this.zoom(getMaxZoomRatio(pointers), e);
+ this.zoom(getMaxZoomRatio(pointers), event);
renderable = false;
break;
-
// Create crop box
+
case ACTION_CROP:
if (!range.x || !range.y) {
renderable = false;
@@ -2398,9 +2405,9 @@
if (range.y < 0) {
top -= height;
- }
+ } // Show the crop box if is hidden
+
- // Show the crop box if is hidden
if (!this.cropped) {
removeClass(this.cropBox, CLASS_HIDDEN);
this.cropped = true;
@@ -2422,9 +2429,9 @@
cropBoxData.top = top;
this.action = action;
this.renderCropBox();
- }
+ } // Override
+
- // Override
forEach(pointers, function (p) {
p.startX = p.endX;
p.startY = p.endY;
@@ -2449,8 +2456,6 @@
return this;
},
-
-
// Reset the image and crop box to their initial states
reset: function reset() {
if (this.ready && !this.disabled) {
@@ -2466,8 +2471,6 @@
return this;
},
-
-
// Clear the crop box
clear: function clear() {
if (this.cropped && !this.disabled) {
@@ -2477,12 +2480,10 @@
width: 0,
height: 0
});
-
this.cropped = false;
this.renderCropBox();
- this.limitCanvas(true, true);
+ this.limitCanvas(true, true); // Render canvas after crop box rendered
- // Render canvas after crop box rendered
this.renderCanvas();
removeClass(this.dragBox, CLASS_MODAL);
addClass(this.cropBox, CLASS_HIDDEN);
@@ -2491,7 +2492,6 @@
return this;
},
-
/**
* Replace the image's src and rebuild the cropper
* @param {string} url - The new URL.
@@ -2512,7 +2512,6 @@
if (this.ready) {
this.viewBoxImage.src = url;
-
forEach(this.previews, function (element) {
element.getElementsByTagName('img')[0].src = url;
});
@@ -2530,8 +2529,6 @@
return this;
},
-
-
// Enable (unfreeze) the cropper
enable: function enable() {
if (this.ready && this.disabled) {
@@ -2541,8 +2538,6 @@
return this;
},
-
-
// Disable (freeze) the cropper
disable: function disable() {
if (this.ready && !this.disabled) {
@@ -2553,7 +2548,6 @@
return this;
},
-
/**
* Destroy the cropper and remove the instance from the image
* @returns {Cropper} this
@@ -2561,22 +2555,20 @@
destroy: function destroy() {
var element = this.element;
-
- if (!getData(element, NAMESPACE)) {
+ if (!element[NAMESPACE]) {
return this;
}
+ element[NAMESPACE] = undefined;
+
if (this.isImg && this.replaced) {
element.src = this.originalUrl;
}
this.uncreate();
- removeData(element, NAMESPACE);
-
return this;
},
-
/**
* Move the canvas with relative offsets
* @param {number} offsetX - The relative offset distance on the x-axis.
@@ -2585,15 +2577,12 @@
*/
move: function move(offsetX) {
var offsetY = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : offsetX;
- var _canvasData = this.canvasData,
- left = _canvasData.left,
- top = _canvasData.top;
-
-
+ var _this$canvasData = this.canvasData,
+ left = _this$canvasData.left,
+ top = _this$canvasData.top;
return this.moveTo(isUndefined(offsetX) ? offsetX : left + Number(offsetX), isUndefined(offsetY) ? offsetY : top + Number(offsetY));
},
-
/**
* Move the canvas to an absolute point
* @param {number} x - The x-axis coordinate.
@@ -2603,9 +2592,7 @@
moveTo: function moveTo(x) {
var y = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : x;
var canvasData = this.canvasData;
-
var changed = false;
-
x = Number(x);
y = Number(y);
@@ -2628,7 +2615,6 @@
return this;
},
-
/**
* Zoom the canvas with a relative ratio
* @param {number} ratio - The target ratio.
@@ -2637,8 +2623,6 @@
*/
zoom: function zoom(ratio, _originalEvent) {
var canvasData = this.canvasData;
-
-
ratio = Number(ratio);
if (ratio < 0) {
@@ -2650,7 +2634,6 @@
return this.zoomTo(canvasData.width * ratio / canvasData.naturalWidth, null, _originalEvent);
},
-
/**
* Zoom the canvas to an absolute ratio
* @param {number} ratio - The target ratio.
@@ -2665,8 +2648,6 @@
height = canvasData.height,
naturalWidth = canvasData.naturalWidth,
naturalHeight = canvasData.naturalHeight;
-
-
ratio = Number(ratio);
if (ratio >= 0 && this.ready && !this.disabled && options.zoomable) {
@@ -2674,23 +2655,21 @@
var newHeight = naturalHeight * ratio;
if (dispatchEvent(this.element, EVENT_ZOOM, {
- originalEvent: _originalEvent,
+ ratio: ratio,
oldRatio: width / naturalWidth,
- ratio: newWidth / naturalWidth
+ originalEvent: _originalEvent
}) === false) {
return this;
}
if (_originalEvent) {
var pointers = this.pointers;
-
var offset = getOffset(this.cropper);
var center = pointers && Object.keys(pointers).length ? getPointersCenter(pointers) : {
pageX: _originalEvent.pageX,
pageY: _originalEvent.pageY
- };
+ }; // Zoom from the triggering point of the event
- // Zoom from the triggering point of the event
canvasData.left -= (newWidth - width) * ((center.pageX - offset.left - canvasData.left) / width);
canvasData.top -= (newHeight - height) * ((center.pageY - offset.top - canvasData.top) / height);
} else if (isPlainObject(pivot) && isNumber(pivot.x) && isNumber(pivot.y)) {
@@ -2710,7 +2689,6 @@
return this;
},
-
/**
* Rotate the canvas with a relative degree
* @param {number} degree - The rotate degree.
@@ -2720,7 +2698,6 @@
return this.rotateTo((this.imageData.rotate || 0) + Number(degree));
},
-
/**
* Rotate the canvas to an absolute degree
* @param {number} degree - The rotate degree.
@@ -2737,7 +2714,6 @@
return this;
},
-
/**
* Scale the image on the x-axis.
* @param {number} scaleX - The scale ratio on the x-axis.
@@ -2745,12 +2721,9 @@
*/
scaleX: function scaleX(_scaleX) {
var scaleY = this.imageData.scaleY;
-
-
return this.scale(_scaleX, isNumber(scaleY) ? scaleY : 1);
},
-
/**
* Scale the image on the y-axis.
* @param {number} scaleY - The scale ratio on the y-axis.
@@ -2758,12 +2731,9 @@
*/
scaleY: function scaleY(_scaleY) {
var scaleX = this.imageData.scaleX;
-
-
return this.scale(isNumber(scaleX) ? scaleX : 1, _scaleY);
},
-
/**
* Scale the image
* @param {number} scaleX - The scale ratio on the x-axis.
@@ -2773,9 +2743,7 @@
scale: function scale(scaleX) {
var scaleY = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : scaleX;
var imageData = this.imageData;
-
var transformed = false;
-
scaleX = Number(scaleX);
scaleY = Number(scaleY);
@@ -2798,20 +2766,18 @@
return this;
},
-
/**
* Get the cropped area position and size data (base on the original image)
* @param {boolean} [rounded=false] - Indicate if round the data values or not.
* @returns {Object} The result cropped data.
*/
- getData: function getData$$1() {
+ getData: function getData() {
var rounded = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
var options = this.options,
imageData = this.imageData,
canvasData = this.canvasData,
cropBoxData = this.cropBoxData;
-
- var data = void 0;
+ var data;
if (this.ready && this.cropped) {
data = {
@@ -2820,13 +2786,21 @@
width: cropBoxData.width,
height: cropBoxData.height
};
-
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,
@@ -2848,17 +2822,15 @@
return data;
},
-
/**
* Set the cropped area position and size with new data
* @param {Object} data - The new data.
* @returns {Cropper} this
*/
- setData: function setData$$1(data) {
+ setData: function setData(data) {
var options = this.options,
imageData = this.imageData,
canvasData = this.canvasData;
-
var cropBoxData = {};
if (this.ready && !this.disabled && isPlainObject(data)) {
@@ -2911,7 +2883,6 @@
return this;
},
-
/**
* Get the container size data.
* @returns {Object} The result container data.
@@ -2920,7 +2891,6 @@
return this.ready ? assign({}, this.containerData) : {};
},
-
/**
* Get the image position and size data.
* @returns {Object} The result image data.
@@ -2929,14 +2899,12 @@
return this.sized ? assign({}, this.imageData) : {};
},
-
/**
* Get the canvas position and size data.
* @returns {Object} The result canvas data.
*/
getCanvasData: function getCanvasData() {
var canvasData = this.canvasData;
-
var data = {};
if (this.ready) {
@@ -2948,7 +2916,6 @@
return data;
},
-
/**
* Set the canvas position and size with new data.
* @param {Object} data - The new canvas data.
@@ -2958,7 +2925,6 @@
var canvasData = this.canvasData;
var aspectRatio = canvasData.aspectRatio;
-
if (this.ready && !this.disabled && isPlainObject(data)) {
if (isNumber(data.left)) {
canvasData.left = data.left;
@@ -2982,15 +2948,13 @@
return this;
},
-
/**
* Get the crop box position and size data.
* @returns {Object} The result crop box data.
*/
getCropBoxData: function getCropBoxData() {
var cropBoxData = this.cropBoxData;
-
- var data = void 0;
+ var data;
if (this.ready && this.cropped) {
data = {
@@ -3004,7 +2968,6 @@
return data || {};
},
-
/**
* Set the crop box position and size with new data.
* @param {Object} data - The new crop box data.
@@ -3013,9 +2976,8 @@
setCropBoxData: function setCropBoxData(data) {
var cropBoxData = this.cropBoxData;
var aspectRatio = this.options.aspectRatio;
-
- var widthChanged = void 0;
- var heightChanged = void 0;
+ var widthChanged;
+ var heightChanged;
if (this.ready && this.cropped && !this.disabled && isPlainObject(data)) {
if (isNumber(data.left)) {
@@ -3050,7 +3012,6 @@
return this;
},
-
/**
* Get a canvas drawn the cropped image.
* @param {Object} [options={}] - The config options.
@@ -3064,19 +3025,17 @@
}
var canvasData = this.canvasData;
+ var source = getSourceCanvas(this.image, this.imageData, canvasData, options); // Returns the source canvas if it is not cropped.
- var source = getSourceCanvas(this.image, this.imageData, canvasData, options);
-
- // Returns the source canvas if it is not cropped.
if (!this.cropped) {
return source;
}
- var _getData = this.getData(),
- initialX = _getData.x,
- initialY = _getData.y,
- initialWidth = _getData.width,
- initialHeight = _getData.height;
+ var _this$getData = this.getData(),
+ initialX = _this$getData.x,
+ initialY = _this$getData.y,
+ initialWidth = _this$getData.width,
+ initialHeight = _this$getData.height;
var ratio = source.width / Math.floor(canvasData.naturalWidth);
@@ -3109,42 +3068,34 @@
width = Math.min(maxSizes.width, Math.max(minSizes.width, width));
height = Math.min(maxSizes.height, Math.max(minSizes.height, height));
-
var canvas = document.createElement('canvas');
var context = canvas.getContext('2d');
-
canvas.width = normalizeDecimalNumber(width);
canvas.height = normalizeDecimalNumber(height);
-
context.fillStyle = options.fillColor || 'transparent';
context.fillRect(0, 0, width, height);
-
var _options$imageSmoothi = options.imageSmoothingEnabled,
- imageSmoothingEnabled = _options$imageSmoothi === undefined ? true : _options$imageSmoothi,
+ imageSmoothingEnabled = _options$imageSmoothi === void 0 ? true : _options$imageSmoothi,
imageSmoothingQuality = options.imageSmoothingQuality;
-
-
context.imageSmoothingEnabled = imageSmoothingEnabled;
if (imageSmoothingQuality) {
context.imageSmoothingQuality = imageSmoothingQuality;
- }
+ } // https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D.drawImage
+
- // https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D.drawImage
var sourceWidth = source.width;
- var sourceHeight = source.height;
+ var sourceHeight = source.height; // Source canvas parameters
- // Source canvas parameters
var srcX = initialX;
var srcY = initialY;
- var srcWidth = void 0;
- var srcHeight = void 0;
+ var srcWidth;
+ var srcHeight; // Destination canvas parameters
- // Destination canvas parameters
- var dstX = void 0;
- var dstY = void 0;
- var dstWidth = void 0;
- var dstHeight = void 0;
+ var dstX;
+ var dstY;
+ var dstWidth;
+ var dstHeight;
if (srcX <= -initialWidth || srcX > sourceWidth) {
srcX = 0;
@@ -3178,25 +3129,21 @@
dstHeight = srcHeight;
}
- var params = [srcX, srcY, srcWidth, srcHeight];
+ var params = [srcX, srcY, srcWidth, srcHeight]; // Avoid "IndexSizeError"
- // Avoid "IndexSizeError"
if (dstWidth > 0 && dstHeight > 0) {
var scale = width / initialWidth;
-
params.push(dstX * scale, dstY * scale, dstWidth * scale, dstHeight * scale);
- }
-
- // All the numerical parameters should be integer for `drawImage`
+ } // All the numerical parameters should be integer for `drawImage`
// https://github.com/fengyuanchen/cropper/issues/476
- context.drawImage.apply(context, [source].concat(toConsumableArray(params.map(function (param) {
+
+
+ context.drawImage.apply(context, [source].concat(_toConsumableArray(params.map(function (param) {
return Math.floor(normalizeDecimalNumber(param));
}))));
-
return canvas;
},
-
/**
* Change the aspect ratio of the crop box.
* @param {number} aspectRatio - The new aspect ratio.
@@ -3205,7 +3152,6 @@
setAspectRatio: function setAspectRatio(aspectRatio) {
var options = this.options;
-
if (!this.disabled && !isUndefined(aspectRatio)) {
// 0 -> NaN
options.aspectRatio = Math.max(0, aspectRatio) || NaN;
@@ -3222,7 +3168,6 @@
return this;
},
-
/**
* Change the drag mode.
* @param {string} mode - The new drag mode.
@@ -3233,13 +3178,10 @@
dragBox = this.dragBox,
face = this.face;
-
if (this.ready && !this.disabled) {
var croppable = mode === DRAG_MODE_CROP;
var movable = options.movable && mode === DRAG_MODE_MOVE;
-
mode = croppable || movable ? mode : DRAG_MODE_NONE;
-
options.dragMode = mode;
setData(dragBox, DATA_ACTION, mode);
toggleClass(dragBox, CLASS_CROP, croppable);
@@ -3259,7 +3201,9 @@
var AnotherCropper = WINDOW.Cropper;
- var Cropper = function () {
+ var Cropper =
+ /*#__PURE__*/
+ function () {
/**
* Create a new Cropper.
* @param {Element} element - The target element for cropping.
@@ -3267,7 +3211,8 @@
*/
function Cropper(element) {
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
- classCallCheck(this, Cropper);
+
+ _classCallCheck(this, Cropper);
if (!element || !REGEXP_TAG_NAME.test(element.tagName)) {
throw new Error('The first argument is required and must be an
![]()
or