Skip to content
Permalink
Browse files

Merge branch 't/12398'

  • Loading branch information...
Reinmar committed Sep 5, 2014
2 parents 8749148 + 702190e commit 9555c193676f6e1d949602ecb8b3e646c43d6e50
Showing with 32 additions and 2 deletions.
  1. +1 −0 CHANGES.md
  2. +9 −1 core/creators/themedui.js
  3. +3 −1 plugins/maximize/plugin.js
  4. +19 −0 tests/plugins/maximize/maximize.js
@@ -18,6 +18,7 @@ Fixed Issues:
* [#12311](http://dev.ckeditor.com/ticket/12311): Fixed: Remove format should also remove `<cite>` 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.
* [#12398](http://dev.ckeditor.com/ticket/12398): Fixed: Maximize does not work on instance without a [title](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title).

## CKEditor 4.4.4

@@ -270,7 +270,15 @@ CKEDITOR.replaceClass = 'ckeditor';
var container = this.container,
contents = this.ui.space( 'contents' ),
contentsFrame = CKEDITOR.env.webkit && this.document && this.document.getWindow().$.frameElement,
outer = resizeInner ? container.getChild( 1 ) : container;
outer;

if ( resizeInner ) {
outer = this.container.getFirst( function( node ) {
return node.hasClass( 'cke_inner' );
} );
} else {
outer = container;
}

// Set as border box width. (#5353)
outer.setSize( 'width', width, true );
@@ -129,7 +129,9 @@
readOnly: 1,
editorFocus: false,
exec: function() {
var container = editor.container.getChild( 1 );
var container = editor.container.getFirst( function( node ) {
return node.hasClass( 'cke_inner' );
} );
var contents = editor.ui.space( 'contents' );

// Save current selection and scroll position in editing area.
@@ -44,5 +44,24 @@ bender.test(
} );

wait();
},

'test maximize command work when config title is set to empty string': function() {
bender.editorBot.create( {
name: 'editor2',
config: {
title: ''
}
}, function( bot ) {
var inner = bot.editor.container.getFirst( function( node ) {
return node.hasClass( 'cke_inner' );
} );

bot.editor.execCommand( 'maximize' );
assert.isTrue( inner.hasClass( 'cke_maximized' ) );

bot.editor.execCommand( 'maximize' );
assert.isFalse( inner.hasClass( 'cke_maximized' ) );
} );
}
} );

0 comments on commit 9555c19

Please sign in to comment.
You can’t perform that action at this time.