X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fskins%2Fv2%2Fskin.js;h=d22db87434f6e0b2e2839ef7f78dae8ba32e9a11;hb=3fe9cac293e090ea459a3ee10d78cbe9e1dd0e03;hp=4c51c17938ac18d334d16fe80a15ef14325d65f2;hpb=48b1db88210b4160dce439c6e3e32e14af8c106b;p=ckeditor.git diff --git a/_source/skins/v2/skin.js b/_source/skins/v2/skin.js index 4c51c17..d22db87 100644 --- a/_source/skins/v2/skin.js +++ b/_source/skins/v2/skin.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -8,6 +8,7 @@ CKEDITOR.skins.add( 'v2', (function() return { editor : { css : [ 'editor.css' ] }, dialog : { css : [ 'dialog.css' ] }, + separator : { canGroup: false }, templates : { css : [ 'templates.css' ] }, margins : [ 0, 14, 18, 14 ] }; @@ -36,7 +37,7 @@ CKEDITOR.skins.add( 'v2', (function() height : height + 'px' }); - if ( !CKEDITOR.env.ie ) + if ( !CKEDITOR.env.ie || CKEDITOR.env.ie9Compat ) return; // Fix the size of the elements which have flexible lengths.