@syncfusion/ej2-image-editor 27.1.48 → 27.1.50
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ej2-image-editor.umd.min.js +2 -2
- package/dist/ej2-image-editor.umd.min.js.map +1 -1
- package/dist/es6/ej2-image-editor.es2015.js +77 -11
- package/dist/es6/ej2-image-editor.es2015.js.map +1 -1
- package/dist/es6/ej2-image-editor.es5.js +77 -11
- package/dist/es6/ej2-image-editor.es5.js.map +1 -1
- package/dist/global/ej2-image-editor.min.js +2 -2
- package/dist/global/ej2-image-editor.min.js.map +1 -1
- package/dist/global/index.d.ts +1 -1
- package/package.json +12 -13
- package/src/image-editor/action/draw.js +25 -3
- package/src/image-editor/action/selection.d.ts +3 -0
- package/src/image-editor/action/selection.js +38 -1
- package/src/image-editor/action/shape.js +4 -0
- package/src/image-editor/base/image-editor.js +6 -4
- package/src/image-editor/renderer/toolbar.js +4 -3
package/dist/global/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* filename: index.d.ts
|
|
3
|
-
* version : 27.1.
|
|
3
|
+
* version : 27.1.50
|
|
4
4
|
* Copyright Syncfusion Inc. 2001 - 2023. All rights reserved.
|
|
5
5
|
* Use of this code is subject to the terms of our license.
|
|
6
6
|
* A copy of the current license can be obtained at any time by e-mailing
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"_from": "@syncfusion/ej2-image-editor@*",
|
|
3
|
-
"_id": "@syncfusion/ej2-image-editor@
|
|
3
|
+
"_id": "@syncfusion/ej2-image-editor@27.1.48",
|
|
4
4
|
"_inBundle": false,
|
|
5
|
-
"_integrity": "sha512
|
|
5
|
+
"_integrity": "sha512-hQ/OaazltLroOclcaVb3qFLJxr0+WHINAZ/gJWrvlOQn56aFv72Gmkp9Rp8SEnxxoYLVzMH1M7IwXI2HRQxXRw==",
|
|
6
6
|
"_location": "/@syncfusion/ej2-image-editor",
|
|
7
7
|
"_phantomChildren": {},
|
|
8
8
|
"_requested": {
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"/@syncfusion/ej2-react-image-editor",
|
|
24
24
|
"/@syncfusion/ej2-vue-image-editor"
|
|
25
25
|
],
|
|
26
|
-
"_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-
|
|
27
|
-
"_shasum": "
|
|
26
|
+
"_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-image-editor/-/ej2-image-editor-27.1.48.tgz",
|
|
27
|
+
"_shasum": "e9c055d422f49914b4b0fbcb79ebe1bd8529fdea",
|
|
28
28
|
"_spec": "@syncfusion/ej2-image-editor@*",
|
|
29
29
|
"_where": "/jenkins/workspace/elease-automation_release_27.1.1/packages/included",
|
|
30
30
|
"author": {
|
|
@@ -32,14 +32,13 @@
|
|
|
32
32
|
},
|
|
33
33
|
"bundleDependencies": false,
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@syncfusion/ej2-base": "~27.1.
|
|
36
|
-
"@syncfusion/ej2-buttons": "~27.1.
|
|
37
|
-
"@syncfusion/ej2-dropdowns": "~27.1.
|
|
38
|
-
"@syncfusion/ej2-inputs": "~27.1.
|
|
39
|
-
"@syncfusion/ej2-navigations": "~27.1.
|
|
40
|
-
"@syncfusion/ej2-popups": "~27.1.
|
|
41
|
-
"@syncfusion/ej2-splitbuttons": "~27.1.
|
|
42
|
-
"markdown-spellcheck": "^1.3.1"
|
|
35
|
+
"@syncfusion/ej2-base": "~27.1.50",
|
|
36
|
+
"@syncfusion/ej2-buttons": "~27.1.50",
|
|
37
|
+
"@syncfusion/ej2-dropdowns": "~27.1.50",
|
|
38
|
+
"@syncfusion/ej2-inputs": "~27.1.50",
|
|
39
|
+
"@syncfusion/ej2-navigations": "~27.1.50",
|
|
40
|
+
"@syncfusion/ej2-popups": "~27.1.50",
|
|
41
|
+
"@syncfusion/ej2-splitbuttons": "~27.1.50"
|
|
43
42
|
},
|
|
44
43
|
"deprecated": false,
|
|
45
44
|
"description": "Essential JS 2 ImageEditor",
|
|
@@ -69,7 +68,7 @@
|
|
|
69
68
|
"url": "https://github.com/syncfusion/ej2-javascript-ui-controls/tree/master/controls/imageeditor"
|
|
70
69
|
},
|
|
71
70
|
"typings": "index.d.ts",
|
|
72
|
-
"version": "27.1.
|
|
71
|
+
"version": "27.1.50",
|
|
73
72
|
"sideEffects": false,
|
|
74
73
|
"homepage": "https://www.syncfusion.com/javascript-ui-controls"
|
|
75
74
|
}
|
|
@@ -2540,11 +2540,19 @@ var Draw = /** @class */ (function () {
|
|
|
2540
2540
|
parent.notify('filter', { prop: 'update-finetunes', onPropertyChange: false });
|
|
2541
2541
|
}
|
|
2542
2542
|
proxy.lowerContext.drawImage(parent.baseImg, 0, 0, proxy.parent.lowerCanvas.width, proxy.parent.lowerCanvas.height);
|
|
2543
|
+
var isCropped = false;
|
|
2544
|
+
var isSameDimension = false;
|
|
2545
|
+
if (parent.isImageUpdated) {
|
|
2546
|
+
var _a = parent.img, srcWidth = _a.srcWidth, srcHeight = _a.srcHeight;
|
|
2547
|
+
var _b = parent.baseImgCanvas, width = _b.width, height = _b.height;
|
|
2548
|
+
isCropped = srcWidth !== width || srcHeight !== height;
|
|
2549
|
+
isSameDimension = parent.baseImg.width === width && parent.baseImg.height === height;
|
|
2550
|
+
}
|
|
2543
2551
|
hideSpinner(parent.element);
|
|
2544
2552
|
parent.element.style.opacity = '1';
|
|
2545
2553
|
proxy.updateBaseImgCanvas();
|
|
2546
2554
|
var fileOpened = { fileName: _this.fileName, fileType: _this.fileType, isValidImage: true };
|
|
2547
|
-
proxy.updateCanvas();
|
|
2555
|
+
proxy.updateCanvas(isCropped, isSameDimension);
|
|
2548
2556
|
if (parent.currObjType.isUndoZoom) {
|
|
2549
2557
|
parent.currObjType.isUndoZoom = false;
|
|
2550
2558
|
proxy.parent.lowerCanvas.style.display = 'block';
|
|
@@ -2586,12 +2594,26 @@ var Draw = /** @class */ (function () {
|
|
|
2586
2594
|
parent.baseImgCanvas.height = parent.baseImg.height;
|
|
2587
2595
|
parent.baseImgCanvas.getContext('2d').drawImage(parent.baseImg, 0, 0);
|
|
2588
2596
|
};
|
|
2589
|
-
Draw.prototype.updateCanvas = function () {
|
|
2597
|
+
Draw.prototype.updateCanvas = function (isCropped, isSameDimension) {
|
|
2590
2598
|
var parent = this.parent;
|
|
2591
|
-
if (!parent.isImageUpdated) {
|
|
2599
|
+
if (!parent.isImageUpdated || !isCropped) {
|
|
2592
2600
|
parent.img.srcWidth = parent.baseImgCanvas.width;
|
|
2593
2601
|
parent.img.srcHeight = parent.baseImgCanvas.height;
|
|
2594
2602
|
}
|
|
2603
|
+
else if (!isSameDimension && isCropped) {
|
|
2604
|
+
parent.img.srcLeft = 0;
|
|
2605
|
+
parent.img.srcTop = 0;
|
|
2606
|
+
parent.img.srcWidth = parent.baseImgCanvas.width;
|
|
2607
|
+
parent.img.srcHeight = parent.baseImgCanvas.height;
|
|
2608
|
+
parent.currSelectionPoint = null;
|
|
2609
|
+
parent.cropObj = { cropZoom: 0, defaultZoom: 0, totalPannedPoint: { x: 0, y: 0 }, totalPannedClientPoint: { x: 0, y: 0 },
|
|
2610
|
+
totalPannedInternalPoint: { x: 0, y: 0 }, tempFlipPanPoint: { x: 0, y: 0 }, activeObj: {}, rotateFlipColl: [],
|
|
2611
|
+
degree: 0, currFlipState: '', straighten: 0, destPoints: { startX: 0, startY: 0, width: 0, height: 0 },
|
|
2612
|
+
srcPoints: { startX: 0, startY: 0, width: 0, height: 0 }, filter: '', isBrightAdjust: false,
|
|
2613
|
+
zoomFactor: 0, previousZoomValue: 0, aspectWidth: null, aspectHeight: null, frame: 'none', straightenZoom: 0,
|
|
2614
|
+
adjustmentLevel: { brightness: 0, contrast: 0, hue: 0, opacity: 100, saturation: 0, blur: 0,
|
|
2615
|
+
exposure: 0, transparency: 100, sharpen: false, bw: false }, currentFilter: '' };
|
|
2616
|
+
}
|
|
2595
2617
|
var obj = { width: 0, height: 0 };
|
|
2596
2618
|
parent.notify('transform', { prop: 'calcMaxDimension', onPropertyChange: false,
|
|
2597
2619
|
value: { width: parent.img.srcWidth, height: parent.img.srcHeight, obj: obj, isImgShape: null } });
|
|
@@ -49,6 +49,9 @@ export declare class Selection {
|
|
|
49
49
|
private isPreventShaping;
|
|
50
50
|
private isGrabbing;
|
|
51
51
|
private isTouchDblClick;
|
|
52
|
+
private isMouseDown;
|
|
53
|
+
private isMouseUp;
|
|
54
|
+
private mouseWheel;
|
|
52
55
|
constructor(parent: ImageEditor);
|
|
53
56
|
destroy(): void;
|
|
54
57
|
private addEventListener;
|
|
@@ -39,6 +39,9 @@ var Selection = /** @class */ (function () {
|
|
|
39
39
|
this.isSliderActive = false;
|
|
40
40
|
this.arrowShape = [ArrowheadType.None, ArrowheadType.SolidArrow];
|
|
41
41
|
this.isTouchDblClick = false;
|
|
42
|
+
this.isMouseDown = false;
|
|
43
|
+
this.isMouseUp = false;
|
|
44
|
+
this.mouseWheel = 0;
|
|
42
45
|
this.parent = parent;
|
|
43
46
|
this.addEventListener();
|
|
44
47
|
}
|
|
@@ -349,6 +352,7 @@ var Selection = /** @class */ (function () {
|
|
|
349
352
|
this.isPreventDragging = false;
|
|
350
353
|
this.timer = undefined;
|
|
351
354
|
this.tempObjColl = undefined;
|
|
355
|
+
this.mouseWheel = 0;
|
|
352
356
|
this.textRow = 1;
|
|
353
357
|
this.mouseDownPoint = { x: 0, y: 0 };
|
|
354
358
|
this.previousPoint = { x: 0, y: 0 };
|
|
@@ -369,6 +373,7 @@ var Selection = /** @class */ (function () {
|
|
|
369
373
|
this.mouseDown = '';
|
|
370
374
|
this.isSliderActive = false;
|
|
371
375
|
this.arrowShape = [ArrowheadType.None, ArrowheadType.SolidArrow];
|
|
376
|
+
this.isMouseDown = this.isMouseUp = false;
|
|
372
377
|
};
|
|
373
378
|
Selection.prototype.performTabAction = function () {
|
|
374
379
|
var parent = this.parent;
|
|
@@ -1368,6 +1373,12 @@ var Selection = /** @class */ (function () {
|
|
|
1368
1373
|
parent.notify('shape', { prop: 'updateShapeChangeEventArgs', onPropertyChange: false, value: { shapeSettings: shapeResizingArgs.currentShapeSettings, allowShapeOverflow: shapeResizingArgs.allowShapeOverflow } });
|
|
1369
1374
|
}
|
|
1370
1375
|
else {
|
|
1376
|
+
if (this.isMouseDown) {
|
|
1377
|
+
shapeResizingArgs.action = 'resize-start';
|
|
1378
|
+
}
|
|
1379
|
+
else if (this.isMouseUp) {
|
|
1380
|
+
shapeResizingArgs.action = 'resize-end';
|
|
1381
|
+
}
|
|
1371
1382
|
var selectionResizingArgs = { action: shapeResizingArgs.action,
|
|
1372
1383
|
previousSelectionSettings: { type: parent.getSelectionType(parent.activeObj.shape),
|
|
1373
1384
|
startX: shapeResizingArgs.previousShapeSettings.startX,
|
|
@@ -3161,6 +3172,8 @@ var Selection = /** @class */ (function () {
|
|
|
3161
3172
|
}
|
|
3162
3173
|
var imageEditorClickEventArgs = { point: this.setXYPoints(e) };
|
|
3163
3174
|
parent.trigger('click', imageEditorClickEventArgs);
|
|
3175
|
+
this.isMouseDown = true;
|
|
3176
|
+
this.isMouseUp = false;
|
|
3164
3177
|
this.clickEvent(imageEditorClickEventArgs, e);
|
|
3165
3178
|
};
|
|
3166
3179
|
Selection.prototype.getImagePoints = function (x, y) {
|
|
@@ -3522,6 +3535,7 @@ var Selection = /** @class */ (function () {
|
|
|
3522
3535
|
}
|
|
3523
3536
|
}
|
|
3524
3537
|
if (type !== '') {
|
|
3538
|
+
parent.isZoomBtnClick = true;
|
|
3525
3539
|
parent.notify('draw', { prop: 'performPointZoom', onPropertyChange: false,
|
|
3526
3540
|
value: { x: center.x, y: center.y, type: type, isResize: null } });
|
|
3527
3541
|
}
|
|
@@ -3604,11 +3618,14 @@ var Selection = /** @class */ (function () {
|
|
|
3604
3618
|
this.dragCanvas = parent.togglePan = true;
|
|
3605
3619
|
}
|
|
3606
3620
|
}
|
|
3621
|
+
this.isMouseDown = false;
|
|
3622
|
+
this.isMouseUp = false;
|
|
3607
3623
|
};
|
|
3608
3624
|
Selection.prototype.mouseUpEventHandler = function (e) {
|
|
3609
3625
|
var parent = this.parent;
|
|
3610
3626
|
var id = parent.element.id;
|
|
3611
|
-
parent.isKBDNavigation = false;
|
|
3627
|
+
parent.isKBDNavigation = this.isMouseDown = false;
|
|
3628
|
+
this.isMouseUp = true;
|
|
3612
3629
|
if (!Browser.isDevice && ((parent.element.querySelector('#' + id + '_contextualToolbar') &&
|
|
3613
3630
|
!parent.element.querySelector('#' + id + '_contextualToolbar').parentElement.classList.contains('e-hide')) ||
|
|
3614
3631
|
(parent.element.querySelector('#' + id + '_headWrapper')
|
|
@@ -3778,6 +3795,11 @@ var Selection = /** @class */ (function () {
|
|
|
3778
3795
|
parent.notify('toolbar', { prop: 'destroy-qa-toolbar', onPropertyChange: false });
|
|
3779
3796
|
}
|
|
3780
3797
|
}
|
|
3798
|
+
else if (isCropSelection && this.isMouseUp && parent.cursor.indexOf('resize') > -1) {
|
|
3799
|
+
var previousShapeSettings = this.updatePrevShapeSettings();
|
|
3800
|
+
var shapeResizingArgs = { cancel: false, action: 'resize-end', previousShapeSettings: previousShapeSettings };
|
|
3801
|
+
this.triggerShapeChange(shapeResizingArgs, shapeResizingArgs, 'resize');
|
|
3802
|
+
}
|
|
3781
3803
|
if (parent.activeObj) {
|
|
3782
3804
|
var isCropSelection_1 = false;
|
|
3783
3805
|
var splitWords_1;
|
|
@@ -3897,6 +3919,7 @@ var Selection = /** @class */ (function () {
|
|
|
3897
3919
|
parent.isShapeDrawing = false;
|
|
3898
3920
|
parent.notify('freehand-draw', { prop: 'resetSelPoints', onPropertyChange: false });
|
|
3899
3921
|
}
|
|
3922
|
+
this.isMouseUp = false;
|
|
3900
3923
|
};
|
|
3901
3924
|
Selection.prototype.adjustActObjForLineArrow = function (obj) {
|
|
3902
3925
|
var isAdjusted = false;
|
|
@@ -4352,6 +4375,7 @@ var Selection = /** @class */ (function () {
|
|
|
4352
4375
|
case (e.ctrlKey && '+'):
|
|
4353
4376
|
if ((parent.zoomSettings.zoomTrigger & ZoomTrigger.Commands) === ZoomTrigger.Commands) {
|
|
4354
4377
|
this.zoomType = 'Commands';
|
|
4378
|
+
parent.isZoomBtnClick = true;
|
|
4355
4379
|
parent.notify('transform', { prop: 'zoomAction', onPropertyChange: false,
|
|
4356
4380
|
value: { zoomFactor: .1, zoomPoint: null }, isResize: null });
|
|
4357
4381
|
parent.notify('draw', { prop: 'redrawDownScale' });
|
|
@@ -4368,6 +4392,7 @@ var Selection = /** @class */ (function () {
|
|
|
4368
4392
|
case (e.ctrlKey && '-'):
|
|
4369
4393
|
if ((parent.zoomSettings.zoomTrigger & ZoomTrigger.Commands) === ZoomTrigger.Commands) {
|
|
4370
4394
|
this.zoomType = 'Commands';
|
|
4395
|
+
parent.isZoomBtnClick = true;
|
|
4371
4396
|
parent.notify('transform', { prop: 'zoomAction', onPropertyChange: false,
|
|
4372
4397
|
value: { zoomFactor: -.1, zoomPoint: null }, isResize: null });
|
|
4373
4398
|
parent.notify('draw', { prop: 'redrawDownScale' });
|
|
@@ -4504,6 +4529,11 @@ var Selection = /** @class */ (function () {
|
|
|
4504
4529
|
e.stopImmediatePropagation();
|
|
4505
4530
|
};
|
|
4506
4531
|
Selection.prototype.handleScroll = function (e) {
|
|
4532
|
+
this.mouseWheel++;
|
|
4533
|
+
if (this.mouseWheel === 2) {
|
|
4534
|
+
this.mouseWheel = 0;
|
|
4535
|
+
return;
|
|
4536
|
+
}
|
|
4507
4537
|
var parent = this.parent;
|
|
4508
4538
|
var x;
|
|
4509
4539
|
var y;
|
|
@@ -4539,6 +4569,7 @@ var Selection = /** @class */ (function () {
|
|
|
4539
4569
|
}
|
|
4540
4570
|
}
|
|
4541
4571
|
if (type !== '') {
|
|
4572
|
+
parent.isZoomBtnClick = true;
|
|
4542
4573
|
parent.notify('draw', { prop: 'performPointZoom', onPropertyChange: false,
|
|
4543
4574
|
value: { x: x, y: y, type: type, isResize: null } });
|
|
4544
4575
|
parent.notify('draw', { prop: 'redrawDownScale' });
|
|
@@ -4903,6 +4934,12 @@ var Selection = /** @class */ (function () {
|
|
|
4903
4934
|
parent.editCompleteArgs = shapeChangingArgs;
|
|
4904
4935
|
}
|
|
4905
4936
|
else {
|
|
4937
|
+
if (this.isMouseDown) {
|
|
4938
|
+
shapeChangingArgs.action = 'resize-start';
|
|
4939
|
+
}
|
|
4940
|
+
else if (this.isMouseUp) {
|
|
4941
|
+
shapeChangingArgs.action = 'resize-end';
|
|
4942
|
+
}
|
|
4906
4943
|
var selectionChangingArgs = { action: shapeChangingArgs.action,
|
|
4907
4944
|
previousSelectionSettings: { type: parent.getSelectionType(parent.activeObj.shape),
|
|
4908
4945
|
startX: shapeChangingArgs.previousShapeSettings.startX,
|
|
@@ -404,6 +404,10 @@ var Shape = /** @class */ (function () {
|
|
|
404
404
|
parent.activeObj.opacity = opacity;
|
|
405
405
|
}
|
|
406
406
|
strokeSettings.strokeWidth = strokeWidth ? strokeWidth : strokeSettings.strokeWidth;
|
|
407
|
+
var shape = parent.activeObj.shape;
|
|
408
|
+
if ((shape === 'rectangle' || shape === 'ellipse') && strokeWidth === 0) {
|
|
409
|
+
strokeSettings.strokeWidth = 0;
|
|
410
|
+
}
|
|
407
411
|
strokeSettings.strokeColor = strokeColor ? strokeColor : strokeSettings.strokeColor;
|
|
408
412
|
strokeSettings.fillColor = fillColor ? fillColor : strokeSettings.fillColor;
|
|
409
413
|
strokeSettings.radius = radius ? radius : strokeSettings.radius;
|
|
@@ -736,6 +736,8 @@ var ImageEditor = /** @class */ (function (_super) {
|
|
|
736
736
|
this.notify('toolbar', { prop: 'getLocaleText', onPropertyChange: false, value: { obj: browseObj } });
|
|
737
737
|
var supportObj = { key: 'SupportText' };
|
|
738
738
|
this.notify('toolbar', { prop: 'getLocaleText', onPropertyChange: false, value: { obj: supportObj } });
|
|
739
|
+
var andObj = { key: 'And' };
|
|
740
|
+
this.notify('toolbar', { prop: 'getLocaleText', onPropertyChange: false, value: { obj: andObj } });
|
|
739
741
|
var dropAreaElement = this.createElement('div', { id: this.element.id + '_dropArea', className: 'e-ie-drop-area', attrs: { style: 'position: relative;' } });
|
|
740
742
|
var dropIconElement = this.createElement('span', { className: 'e-ie-drop-icon e-icons e-image', attrs: { style: 'position: absolute;' } });
|
|
741
743
|
var dropContentElement = this.createElement('span', { className: 'e-ie-drop-content', attrs: { style: 'position: absolute; display: none;' } });
|
|
@@ -751,7 +753,7 @@ var ImageEditor = /** @class */ (function (_super) {
|
|
|
751
753
|
dropAnchorElement.href = '';
|
|
752
754
|
minDropAnchorElem.href = '';
|
|
753
755
|
var dropInfoElement = this.createElement('span', { className: 'e-ie-drop-info', attrs: { position: 'absolute' } });
|
|
754
|
-
dropInfoElement.textContent = supportObj['value'] + ' SVG, PNG,
|
|
756
|
+
dropInfoElement.textContent = supportObj['value'] + ' SVG, PNG, ' + andObj['value'] + ' JPG';
|
|
755
757
|
var dropUploader = dropAreaElement.appendChild(this.createElement('input', {
|
|
756
758
|
id: this.element.id + '_dropfileUpload', className: 'e-fileUpload e-image-upload'
|
|
757
759
|
}));
|
|
@@ -995,7 +997,7 @@ var ImageEditor = /** @class */ (function (_super) {
|
|
|
995
997
|
this.notify('draw', { prop: 'open', value: { data: data } });
|
|
996
998
|
}
|
|
997
999
|
else {
|
|
998
|
-
this.updateImage(data, imageSettings.backgroundColor);
|
|
1000
|
+
this.updateImage(data, imageSettings ? imageSettings.backgroundColor : null);
|
|
999
1001
|
}
|
|
1000
1002
|
};
|
|
1001
1003
|
/**
|
|
@@ -2221,7 +2223,7 @@ var ImageEditor = /** @class */ (function (_super) {
|
|
|
2221
2223
|
};
|
|
2222
2224
|
ImageEditor.prototype.updateImage = function (data, imageBackgroundColor) {
|
|
2223
2225
|
var _this = this;
|
|
2224
|
-
if (data || imageBackgroundColor) {
|
|
2226
|
+
if (data || imageBackgroundColor || imageBackgroundColor === '') {
|
|
2225
2227
|
var prevCropObj_1 = extend({}, this.cropObj, {}, true);
|
|
2226
2228
|
var object = { currObj: {} };
|
|
2227
2229
|
this.notify('filter', { prop: 'getCurrentObj', onPropertyChange: false, value: { object: object } });
|
|
@@ -2263,7 +2265,7 @@ var ImageEditor = /** @class */ (function (_super) {
|
|
|
2263
2265
|
}
|
|
2264
2266
|
}, 100);
|
|
2265
2267
|
}
|
|
2266
|
-
if (imageBackgroundColor) {
|
|
2268
|
+
if (imageBackgroundColor || imageBackgroundColor === '') {
|
|
2267
2269
|
this.notify('draw', { prop: 'imageBackgroundColor', onPropertyChange: false, value: { color: imageBackgroundColor } });
|
|
2268
2270
|
this.notify('draw', { prop: 'render-image', value: { isMouseWheel: false } });
|
|
2269
2271
|
if (!data) {
|
|
@@ -201,7 +201,8 @@ var ToolbarModule = /** @class */ (function () {
|
|
|
201
201
|
BorderRadius: 'Border Radius',
|
|
202
202
|
TextOutlineColor: 'Outline Color',
|
|
203
203
|
TextOutlineWidth: 'Outline Width',
|
|
204
|
-
PixelSize: 'Pixel Size'
|
|
204
|
+
PixelSize: 'Pixel Size',
|
|
205
|
+
And: 'and'
|
|
205
206
|
};
|
|
206
207
|
this.l10n = new L10n('image-editor', this.defaultLocale, this.parent.locale);
|
|
207
208
|
};
|
|
@@ -869,13 +870,11 @@ var ToolbarModule = /** @class */ (function () {
|
|
|
869
870
|
zoomIn.addEventListener('mousedown', this.zoomInBtnMouseDownHandler.bind(this));
|
|
870
871
|
zoomIn.addEventListener('mouseup', this.zoomBtnMouseUpHandler.bind(this));
|
|
871
872
|
zoomIn.addEventListener('click', this.zoomInBtnClickHandler.bind(this));
|
|
872
|
-
zoomIn.addEventListener('touchstart', this.zoomInBtnClickHandler.bind(this));
|
|
873
873
|
}
|
|
874
874
|
if (zoomOut) {
|
|
875
875
|
zoomOut.addEventListener('mousedown', this.zoomOutBtnMouseDownHandler.bind(this));
|
|
876
876
|
zoomOut.addEventListener('mouseup', this.zoomBtnMouseUpHandler.bind(this));
|
|
877
877
|
zoomOut.addEventListener('click', this.zoomOutBtnClickHandler.bind(this));
|
|
878
|
-
zoomIn.addEventListener('touchstart', this.zoomInBtnClickHandler.bind(this));
|
|
879
878
|
}
|
|
880
879
|
};
|
|
881
880
|
ToolbarModule.prototype.widthPress = function (e) {
|
|
@@ -5427,6 +5426,7 @@ var ToolbarModule = /** @class */ (function () {
|
|
|
5427
5426
|
parent.notify('draw', { prop: 'render-image', value: { isMouseWheel: null, isPreventClearRect: null, isFrame: true } });
|
|
5428
5427
|
parent.isFrameBtnClick = true;
|
|
5429
5428
|
parent.curFrameObjEvent = { previousFrameSetting: parent.tempFrameObj, currentFrameSetting: parent.frameObj };
|
|
5429
|
+
parent.notify('draw', { prop: 'triggerFrameChange', value: { prevFrameSettings: parent.tempFrameObj, obj: { frameChangeEventArgs: null } } });
|
|
5430
5430
|
break;
|
|
5431
5431
|
case 'redact':
|
|
5432
5432
|
parent.currObjType.isRedact = true;
|
|
@@ -5553,6 +5553,7 @@ var ToolbarModule = /** @class */ (function () {
|
|
|
5553
5553
|
parent.img.destTop += (parent.cxtTbarHeight / 2);
|
|
5554
5554
|
}
|
|
5555
5555
|
this.callFrameToolbar();
|
|
5556
|
+
parent.notify('draw', { prop: 'triggerFrameChange', value: { prevFrameSettings: parent.frameObj, obj: { frameChangeEventArgs: null } } });
|
|
5556
5557
|
}
|
|
5557
5558
|
};
|
|
5558
5559
|
ToolbarModule.prototype.zoomToFrameRange = function () {
|