From 0601a4c6da2851b2dd0d9645357da3691cbfe8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Koszuli=C5=84ski?= Date: Wed, 20 May 2015 12:33:55 +0200 Subject: [PATCH 1/2] Removed argument that was never used. --- plugins/image/dialogs/image.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/image/dialogs/image.js b/plugins/image/dialogs/image.js index 44a85ae3ad1..7da5c7fecd6 100644 --- a/plugins/image/dialogs/image.js +++ b/plugins/image/dialogs/image.js @@ -609,7 +609,7 @@ return isValid; }, setup: setupDimension, - commit: function( type, element, internalCommit ) { + commit: function( type, element ) { var value = this.getValue(); if ( type == IMAGE ) { if ( value && editor.activeFilter.check( 'img{width,height}' ) ) @@ -617,7 +617,7 @@ else element.removeStyle( 'width' ); - !internalCommit && element.removeAttribute( 'width' ); + element.removeAttribute( 'width' ); } else if ( type == PREVIEW ) { var aMatch = value.match( regexGetSize ); if ( !aMatch ) { @@ -650,7 +650,7 @@ return isValid; }, setup: setupDimension, - commit: function( type, element, internalCommit ) { + commit: function( type, element ) { var value = this.getValue(); if ( type == IMAGE ) { if ( value && editor.activeFilter.check( 'img{width,height}' ) ) @@ -658,7 +658,7 @@ else element.removeStyle( 'height' ); - !internalCommit && element.removeAttribute( 'height' ); + element.removeAttribute( 'height' ); } else if ( type == PREVIEW ) { var aMatch = value.match( regexGetSize ); if ( !aMatch ) { @@ -755,7 +755,7 @@ this.setValue( value ); } }, - commit: function( type, element, internalCommit ) { + commit: function( type, element ) { var value = parseInt( this.getValue(), 10 ); if ( type == IMAGE || type == PREVIEW ) { if ( !isNaN( value ) ) { @@ -765,7 +765,7 @@ element.removeStyle( 'border' ); } - if ( !internalCommit && type == IMAGE ) + if ( type == IMAGE ) element.removeAttribute( 'border' ); } else if ( type == CLEANUP ) { element.removeAttribute( 'border' ); @@ -806,7 +806,7 @@ this.setValue( value ); } }, - commit: function( type, element, internalCommit ) { + commit: function( type, element ) { var value = parseInt( this.getValue(), 10 ); if ( type == IMAGE || type == PREVIEW ) { if ( !isNaN( value ) ) { @@ -817,7 +817,7 @@ element.removeStyle( 'margin-right' ); } - if ( !internalCommit && type == IMAGE ) + if ( type == IMAGE ) element.removeAttribute( 'hspace' ); } else if ( type == CLEANUP ) { element.removeAttribute( 'hspace' ); @@ -856,7 +856,7 @@ this.setValue( value ); } }, - commit: function( type, element, internalCommit ) { + commit: function( type, element ) { var value = parseInt( this.getValue(), 10 ); if ( type == IMAGE || type == PREVIEW ) { if ( !isNaN( value ) ) { @@ -867,7 +867,7 @@ element.removeStyle( 'margin-bottom' ); } - if ( !internalCommit && type == IMAGE ) + if ( type == IMAGE ) element.removeAttribute( 'vspace' ); } else if ( type == CLEANUP ) { element.removeAttribute( 'vspace' ); @@ -916,7 +916,7 @@ this.setValue( value ); } }, - commit: function( type, element, internalCommit ) { + commit: function( type, element ) { var value = this.getValue(); if ( type == IMAGE || type == PREVIEW ) { if ( value ) @@ -924,7 +924,7 @@ else element.removeStyle( 'float' ); - if ( !internalCommit && type == IMAGE ) { + if ( type == IMAGE ) { value = ( element.getAttribute( 'align' ) || '' ).toLowerCase(); switch ( value ) { // we should remove it only if it matches "left" or "right", From b3370acd9b21bd7455ce039b19ba70cca8f3c970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Koszuli=C5=84ski?= Date: Wed, 20 May 2015 12:35:45 +0200 Subject: [PATCH 2/2] Changelog entry. --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 9d57fbde9c5..979c46de692 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,7 @@ Fixed Issues: * [#13199](http://dev.ckeditor.com/ticket/13199): Fixed: Embedsemantic does not support widget classes. * [#13003](http://dev.ckeditor.com/ticket/13003): Fixed: Anchors are uploaded when moving them by drag and drop. * [#13032](http://dev.ckeditor.com/ticket/13032): Fixed: When upload is done notification update should be marked as important. +* [#13300](http://dev.ckeditor.com/ticket/13300): Fixed: The `internalCommit` argument in the image dialog seems to be never used. * [#13036](http://dev.ckeditor.com/ticket/13036): Fixed: Notifications are 10px more to the right. * Toolbar configurators: * [#13185](http://dev.ckeditor.com/ticket/13185): Fixed: Wrong position of the suggestion box if there is not enough space below the caret.