diff --git a/CHANGES.md b/CHANGES.md index 0e619459be0..524b981845b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,7 @@ Fixed Issues: * [#12113](http://dev.ckeditor.com/ticket/12113): Fixed: Code snippet should be presented in elements path as "codesnippet". * [#12311](http://dev.ckeditor.com/ticket/12311): Fixed: Remove format should also remove `` elements. * [#12261](http://dev.ckeditor.com/ticket/12261): Fixed: Filter has to be destroyed and removed from [`CKEDITOR.filter.instances`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter-static-property-instances) on editor destroy. +* [#12163](http://dev.ckeditor.com/ticket/12163): Fixed: Maximize plugin should abort its initialization if the [Shared Spaces plugin](http://ckeditor.com/addon/sharedspace) is initialized. ## CKEditor 4.4.4 diff --git a/plugins/maximize/plugin.js b/plugins/maximize/plugin.js index 4441391dbeb..617c4355d95 100644 --- a/plugins/maximize/plugin.js +++ b/plugins/maximize/plugin.js @@ -96,10 +96,14 @@ icons: 'maximize', // %REMOVE_LINE_CORE% hidpi: true, // %REMOVE_LINE_CORE% init: function( editor ) { - // Maximize plugin isn't available in inline mode yet. + // Maximize plugin isn't available in inline mode yet... if ( editor.elementMode == CKEDITOR.ELEMENT_MODE_INLINE ) return; + // ...and when sharedspace plugin is present. + if ( editor.plugins.sharedspace ) + return; + var lang = editor.lang; var mainDocument = CKEDITOR.document, mainWindow = mainDocument.getWindow(); diff --git a/plugins/sharedspace/samples/sharedspace.html b/plugins/sharedspace/samples/sharedspace.html index df7ff4d1dd6..0c2d89600e9 100644 --- a/plugins/sharedspace/samples/sharedspace.html +++ b/plugins/sharedspace/samples/sharedspace.html @@ -83,7 +83,7 @@

CKEDITOR.appendTo( 'framed1', { extraPlugins: 'sharedspace', - removePlugins: 'maximize,resize', + removePlugins: 'resize', sharedSpaces: { top: 'top', bottom: 'bottom' @@ -94,7 +94,7 @@

CKEDITOR.appendTo( 'framed2', { extraPlugins: 'sharedspace', - removePlugins: 'maximize,resize', + removePlugins: 'resize', sharedSpaces: { top: 'top', bottom: 'bottom'