Skip to content

Commit 10a7105

Browse files
committed
Merge branch 't/13300' into major
2 parents ca891bb + b3370ac commit 10a7105

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Fixed Issues:
1111
* [#13199](http://dev.ckeditor.com/ticket/13199): Fixed: Embedsemantic does not support widget classes.
1212
* [#13003](http://dev.ckeditor.com/ticket/13003): Fixed: Anchors are uploaded when moving them by drag and drop.
1313
* [#13032](http://dev.ckeditor.com/ticket/13032): Fixed: When upload is done notification update should be marked as important.
14+
* [#13300](http://dev.ckeditor.com/ticket/13300): Fixed: The `internalCommit` argument in the image dialog seems to be never used.
1415
* [#13036](http://dev.ckeditor.com/ticket/13036): Fixed: Notifications are 10px more to the right.
1516
* Toolbar configurators:
1617
* [#13185](http://dev.ckeditor.com/ticket/13185): Fixed: Wrong position of the suggestion box if there is not enough space below the caret.

plugins/image/dialogs/image.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -609,15 +609,15 @@
609609
return isValid;
610610
},
611611
setup: setupDimension,
612-
commit: function( type, element, internalCommit ) {
612+
commit: function( type, element ) {
613613
var value = this.getValue();
614614
if ( type == IMAGE ) {
615615
if ( value && editor.activeFilter.check( 'img{width,height}' ) )
616616
element.setStyle( 'width', CKEDITOR.tools.cssLength( value ) );
617617
else
618618
element.removeStyle( 'width' );
619619

620-
!internalCommit && element.removeAttribute( 'width' );
620+
element.removeAttribute( 'width' );
621621
} else if ( type == PREVIEW ) {
622622
var aMatch = value.match( regexGetSize );
623623
if ( !aMatch ) {
@@ -650,15 +650,15 @@
650650
return isValid;
651651
},
652652
setup: setupDimension,
653-
commit: function( type, element, internalCommit ) {
653+
commit: function( type, element ) {
654654
var value = this.getValue();
655655
if ( type == IMAGE ) {
656656
if ( value && editor.activeFilter.check( 'img{width,height}' ) )
657657
element.setStyle( 'height', CKEDITOR.tools.cssLength( value ) );
658658
else
659659
element.removeStyle( 'height' );
660660

661-
!internalCommit && element.removeAttribute( 'height' );
661+
element.removeAttribute( 'height' );
662662
} else if ( type == PREVIEW ) {
663663
var aMatch = value.match( regexGetSize );
664664
if ( !aMatch ) {
@@ -755,7 +755,7 @@
755755
this.setValue( value );
756756
}
757757
},
758-
commit: function( type, element, internalCommit ) {
758+
commit: function( type, element ) {
759759
var value = parseInt( this.getValue(), 10 );
760760
if ( type == IMAGE || type == PREVIEW ) {
761761
if ( !isNaN( value ) ) {
@@ -765,7 +765,7 @@
765765
element.removeStyle( 'border' );
766766
}
767767

768-
if ( !internalCommit && type == IMAGE )
768+
if ( type == IMAGE )
769769
element.removeAttribute( 'border' );
770770
} else if ( type == CLEANUP ) {
771771
element.removeAttribute( 'border' );
@@ -806,7 +806,7 @@
806806
this.setValue( value );
807807
}
808808
},
809-
commit: function( type, element, internalCommit ) {
809+
commit: function( type, element ) {
810810
var value = parseInt( this.getValue(), 10 );
811811
if ( type == IMAGE || type == PREVIEW ) {
812812
if ( !isNaN( value ) ) {
@@ -817,7 +817,7 @@
817817
element.removeStyle( 'margin-right' );
818818
}
819819

820-
if ( !internalCommit && type == IMAGE )
820+
if ( type == IMAGE )
821821
element.removeAttribute( 'hspace' );
822822
} else if ( type == CLEANUP ) {
823823
element.removeAttribute( 'hspace' );
@@ -856,7 +856,7 @@
856856
this.setValue( value );
857857
}
858858
},
859-
commit: function( type, element, internalCommit ) {
859+
commit: function( type, element ) {
860860
var value = parseInt( this.getValue(), 10 );
861861
if ( type == IMAGE || type == PREVIEW ) {
862862
if ( !isNaN( value ) ) {
@@ -867,7 +867,7 @@
867867
element.removeStyle( 'margin-bottom' );
868868
}
869869

870-
if ( !internalCommit && type == IMAGE )
870+
if ( type == IMAGE )
871871
element.removeAttribute( 'vspace' );
872872
} else if ( type == CLEANUP ) {
873873
element.removeAttribute( 'vspace' );
@@ -916,15 +916,15 @@
916916
this.setValue( value );
917917
}
918918
},
919-
commit: function( type, element, internalCommit ) {
919+
commit: function( type, element ) {
920920
var value = this.getValue();
921921
if ( type == IMAGE || type == PREVIEW ) {
922922
if ( value )
923923
element.setStyle( 'float', value );
924924
else
925925
element.removeStyle( 'float' );
926926

927-
if ( !internalCommit && type == IMAGE ) {
927+
if ( type == IMAGE ) {
928928
value = ( element.getAttribute( 'align' ) || '' ).toLowerCase();
929929
switch ( value ) {
930930
// we should remove it only if it matches "left" or "right",

0 commit comments

Comments
 (0)