X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fpagebreak%2Fplugin.js;h=242b9fa73d475dadbb09bae17ce3505fdeb3dc5f;hb=refs%2Ftags%2Fv3.5.3;hp=558733075e8023be110c3e595232682049b978c0;hpb=055b6b0792ce7dc53d47af606b367c04b927c2ab;p=ckeditor.git diff --git a/_source/plugins/pagebreak/plugin.js b/_source/plugins/pagebreak/plugin.js index 5587330..242b9fa 100644 --- a/_source/plugins/pagebreak/plugin.js +++ b/_source/plugins/pagebreak/plugin.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -62,7 +62,13 @@ CKEDITOR.plugins.add( 'pagebreak', childStyle = child && ( child.name == 'span' ) && child.attributes.style; if ( childStyle && ( /page-break-after\s*:\s*always/i ).test( style ) && ( /display\s*:\s*none/i ).test( childStyle ) ) - return editor.createFakeParserElement( element, 'cke_pagebreak', 'div' ); + { + var fakeImg = editor.createFakeParserElement( element, 'cke_pagebreak', 'div' ); + var label = editor.lang.pagebreakAlt; + fakeImg.attributes[ 'alt' ] = label; + fakeImg.attributes[ 'aria-label' ] = label; + return fakeImg; + } } } }); @@ -77,20 +83,22 @@ CKEDITOR.plugins.pagebreakCmd = exec : function( editor ) { // Create the element that represents a print break. + var label = editor.lang.pagebreakAlt; var breakObject = CKEDITOR.dom.element.createFromHtml( '
 
' ); // Creates the fake image used for this element. breakObject = editor.createFakeElement( breakObject, 'cke_pagebreak', 'div' ); + breakObject.setAttributes( { alt : label, 'aria-label' : label, title : label } ); - var ranges = editor.getSelection().getRanges(); + var ranges = editor.getSelection().getRanges( true ); editor.fire( 'saveSnapshot' ); - for ( var range, i = 0 ; i < ranges.length ; i++ ) + for ( var range, i = ranges.length - 1 ; i >= 0; i-- ) { range = ranges[ i ]; - if ( i > 0 ) + if ( i < ranges.length -1 ) breakObject = breakObject.clone( true ); range.splitBlock( 'p' ); @@ -103,7 +111,7 @@ CKEDITOR.plugins.pagebreakCmd = var previous = breakObject.getPrevious(); - if ( CKEDITOR.dtd[ previous.getName() ].div ) + if ( previous && CKEDITOR.dtd[ previous.getName() ].div ) breakObject.move( previous ); }