Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(): cleanup merge conflict resolution artifact #7956

Merged
merged 2 commits into from
Jun 12, 2022
Merged

fix(): cleanup merge conflict resolution artifact #7956

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
708ac89
fix(): cleanup merge conflict resolution artifact
ShaMan123 May 21, 2022
2dd44d6
Merge branch 'master' into fix-v6-merge-artifact
ShaMan123 Jun 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 12 additions & 19 deletions src/canvas.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,20 @@
*/
_onObjectRemoved: function (obj) {
this._objectsToRender = undefined;
// removing active object should fire "selection:cleared" events
if (obj === this._activeObject) {
this.fire('before:selection:cleared', { target: obj });
this._discardActiveObject();
this.fire('selection:cleared', { target: obj });
obj.fire('deselected');
}
if (obj === this._hoveredTarget) {
this._hoveredTarget = null;
this._hoveredTargets = [];
}
this.callSuper('_onObjectRemoved', obj);
},

/**
* Divides objects in two groups, one to render immediately
* and one to render as activeGroup.
Expand Down Expand Up @@ -1116,25 +1128,6 @@
return [];
},

/**
* @private
* @param {fabric.Object} obj Object that was removed
*/
_onObjectRemoved: function(obj) {
// removing active object should fire "selection:cleared" events
if (obj === this._activeObject) {
this.fire('before:selection:cleared', { target: obj });
this._discardActiveObject();
this.fire('selection:cleared', { target: obj });
obj.fire('deselected');
}
if (obj === this._hoveredTarget){
this._hoveredTarget = null;
this._hoveredTargets = [];
}
this.callSuper('_onObjectRemoved', obj);
},

/**
* @private
* Compares the old activeObject with the current one and fires correct events
Expand Down