Skip to content

Commit

Permalink
chore: Build Project
Browse files Browse the repository at this point in the history
  • Loading branch information
berviantoleo committed Nov 28, 2020
1 parent bf41c59 commit 0d1ed12
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 12 deletions.
30 changes: 24 additions & 6 deletions packages/react-multi-crop/dist/index.cjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ var ReactMultiCrop = /*#__PURE__*/function (_Component) {
canvas: null,
initial: true
};
_this.REGEXP_ORIGINS = /^(\w+:)\/\/([^:/?#]*):?(\d*)/i;
_this.color = props.cropBackgroundColor;
_this.opacity = props.cropBackgroundOpacity;
_this.strokeColor = props.cropOutlineColor;
Expand Down Expand Up @@ -210,6 +211,12 @@ var ReactMultiCrop = /*#__PURE__*/function (_Component) {
}, this.initialObjects.bind(this));
}
}
}, {
key: "isCrossOriginURL",
value: function isCrossOriginURL(url) {
var parts = url.match(this.REGEXP_ORIGINS);
return parts !== null && (parts[1] !== location.protocol || parts[2] !== location.hostname || parts[3] !== location.port);
}
}, {
key: "initialImage",
value: function initialImage() {
Expand All @@ -219,13 +226,24 @@ var ReactMultiCrop = /*#__PURE__*/function (_Component) {
var loadImageNow = this.loadImage.bind(this);

if (_typeof(record) === "object" && record.image) {
fabric.fabric.Image.fromURL(record.image, loadImageNow, {
crossOrigin: "Anonymous"
});
var isCrossOrigin = this.isCrossOriginURL(record.image);
var options = {};

if (isCrossOrigin) {
options.crossOrigin = "Anonymous";
}

fabric.fabric.Image.fromURL(record.image, loadImageNow, options);
} else if (typeof image === "string") {
fabric.fabric.Image.fromURL(image, loadImageNow, {
crossOrigin: "Anonymous"
});
var _isCrossOrigin = this.isCrossOriginURL(image);

var _options = {};

if (_isCrossOrigin) {
_options.crossOrigin = "Anonymous";
}

fabric.fabric.Image.fromURL(image, loadImageNow, _options);
}
}
}, {
Expand Down
30 changes: 24 additions & 6 deletions packages/react-multi-crop/dist/index.esm.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ var ReactMultiCrop = /*#__PURE__*/function (_Component) {
canvas: null,
initial: true
};
_this.REGEXP_ORIGINS = /^(\w+:)\/\/([^:/?#]*):?(\d*)/i;
_this.color = props.cropBackgroundColor;
_this.opacity = props.cropBackgroundOpacity;
_this.strokeColor = props.cropOutlineColor;
Expand Down Expand Up @@ -199,6 +200,12 @@ var ReactMultiCrop = /*#__PURE__*/function (_Component) {
}, this.initialObjects.bind(this));
}
}
}, {
key: "isCrossOriginURL",
value: function isCrossOriginURL(url) {
var parts = url.match(this.REGEXP_ORIGINS);
return parts !== null && (parts[1] !== location.protocol || parts[2] !== location.hostname || parts[3] !== location.port);
}
}, {
key: "initialImage",
value: function initialImage() {
Expand All @@ -208,13 +215,24 @@ var ReactMultiCrop = /*#__PURE__*/function (_Component) {
var loadImageNow = this.loadImage.bind(this);

if (_typeof(record) === "object" && record.image) {
fabric.Image.fromURL(record.image, loadImageNow, {
crossOrigin: "Anonymous"
});
var isCrossOrigin = this.isCrossOriginURL(record.image);
var options = {};

if (isCrossOrigin) {
options.crossOrigin = "Anonymous";
}

fabric.Image.fromURL(record.image, loadImageNow, options);
} else if (typeof image === "string") {
fabric.Image.fromURL(image, loadImageNow, {
crossOrigin: "Anonymous"
});
var _isCrossOrigin = this.isCrossOriginURL(image);

var _options = {};

if (_isCrossOrigin) {
_options.crossOrigin = "Anonymous";
}

fabric.Image.fromURL(image, loadImageNow, _options);
}
}
}, {
Expand Down

0 comments on commit 0d1ed12

Please sign in to comment.