wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "$.extend -> ve.extendObject"

Browse source
This commit is contained in:
jenkins-bot 2018-11-07 18:28:08 +00:00 committed by Gerrit Code Review
parent ff1a05e245 3564006e91
commit b588eb2f97
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ve-mw/dm/models/ve.dm.MWImageModel.js
View file

@ -502,7 +502,7 @@ ve.dm.MWImageModel.prototype.insertImageNode = function ( fragment ) {
ve.dm.MWImageModel.prototype.getData = function () {
var data,
originalAttrs = ve.copy( this.getOriginalImageAttributes() ),
editAttributes = $.extend( originalAttrs, this.getUpdatedAttributes() ),
editAttributes = ve.extendObject( originalAttrs, this.getUpdatedAttributes() ),
nodeType = this.getImageNodeType();
// Remove old classes