X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fpagebreak%2Fplugin.js;h=ac7653f3af90d76baa26d89e2bdce2d13e2695a6;hb=f0610347140239143439a511ee2bd48cb784f470;hp=e3e05d56addae60512f15723b9e3a598212496cd;hpb=c9fdde67e6384bd5a66adc2b3bba5c4ce9db56c7;p=ckeditor.git

diff --git a/_source/plugins/pagebreak/plugin.js b/_source/plugins/pagebreak/plugin.js
index e3e05d5..ac7653f 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
 */
 
@@ -22,31 +22,66 @@ CKEDITOR.plugins.add( 'pagebreak',
 				command : 'pagebreak'
 			});
 
+		var cssStyles = [
+			'{' ,
+				'background: url(' + CKEDITOR.getUrl( this.path + 'images/pagebreak.gif' ) + ') no-repeat center center;' ,
+				'clear: both;' ,
+				'width:100%; _width:99.9%;' ,
+				'border-top: #999999 1px dotted;' ,
+				'border-bottom: #999999 1px dotted;' ,
+				'padding:0;' ,
+				'height: 5px;' ,
+				'cursor: default;' ,
+			'}'
+			].join( '' ).replace(/;/g, ' !important;' );	// Increase specificity to override other styles, e.g. block outline.
+
 		// Add the style that renders our placeholder.
-		editor.addCss(
-			'img.cke_pagebreak' +
-			'{' +
-				'background-image: url(' + CKEDITOR.getUrl( this.path + 'images/pagebreak.gif' ) + ');' +
-				'background-position: center center;' +
-				'background-repeat: no-repeat;' +
-				'clear: both;' +
-				'display: block;' +
-				'float: none;' +
-				'width:100% !important; _width:99.9% !important;' +
-				'border-top: #999999 1px dotted;' +
-				'border-bottom: #999999 1px dotted;' +
-				'height: 5px !important;' +
-				'page-break-after: always;' +
-
-			'}' );
+		editor.addCss( 'div.cke_pagebreak' + cssStyles );
+
+		// Opera needs help to select the page-break.
+		CKEDITOR.env.opera && editor.on( 'contentDom', function()
+		{
+			editor.document.on( 'click', function( evt )
+			{
+				var target = evt.data.getTarget();
+				if ( target.is( 'div' ) && target.hasClass( 'cke_pagebreak')  )
+					editor.getSelection().selectElement( target );
+			});
+		});
 	},
 
 	afterInit : function( editor )
 	{
-		// Register a filter to displaying placeholders after mode change.
+		var label = editor.lang.pagebreakAlt;
 
+		// Register a filter to displaying placeholders after mode change.
 		var dataProcessor = editor.dataProcessor,
-			dataFilter = dataProcessor && dataProcessor.dataFilter;
+			dataFilter = dataProcessor && dataProcessor.dataFilter,
+			htmlFilter = dataProcessor && dataProcessor.htmlFilter;
+
+		if ( htmlFilter )
+		{
+			htmlFilter.addRules(
+			{
+				attributes : {
+					'class' : function( value, element )
+					{
+						var className =  value.replace( 'cke_pagebreak', '' );
+						if ( className != value )
+						{
+							var span = CKEDITOR.htmlParser.fragment.fromHtml( '<span style="display: none;">&nbsp;</span>' );
+							element.children.length = 0;
+							element.add( span );
+							var attrs = element.attributes;
+							delete attrs[ 'aria-label' ];
+							delete attrs.contenteditable;
+							delete attrs.title;
+						}
+						return className;
+					}
+				}
+			}, 5 );
+		}
 
 		if ( dataFilter )
 		{
@@ -63,11 +98,13 @@ CKEDITOR.plugins.add( 'pagebreak',
 
 							if ( childStyle && ( /page-break-after\s*:\s*always/i ).test( style ) && ( /display\s*:\s*none/i ).test( childStyle ) )
 							{
-								var fakeImg = editor.createFakeParserElement( element, 'cke_pagebreak', 'div' );
-								var label = editor.lang.pagebreakAlt;
-								fakeImg.attributes[ 'alt' ] = label;
-								fakeImg.attributes[ 'aria-label' ] = label;
-								return fakeImg;
+								attributes.contenteditable = "false";
+								attributes[ 'class' ] = "cke_pagebreak";
+								attributes[ 'data-cke-display-name' ] = "pagebreak";
+								attributes[ 'aria-label' ] = label;
+								attributes[ 'title' ] = label;
+
+								element.children.length = 0;
 							}
 						}
 					}
@@ -82,14 +119,18 @@ 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( '<div style="page-break-after: always;"><span style="display: none;">&nbsp;</span></div>' );
 
-		// Creates the fake image used for this element.
-		breakObject = editor.createFakeElement( breakObject, 'cke_pagebreak', 'div' );
-		breakObject.setAttribute( 'alt', label );
-		breakObject.setAttribute( 'aria-label', label );
+		// Create read-only element that represents a print break.
+		var pagebreak = CKEDITOR.dom.element.createFromHtml(
+			'<div style="' +
+			'page-break-after: always;"' +
+			'contenteditable="false" ' +
+			'title="'+ label + '" ' +
+			'aria-label="'+ label + '" ' +
+			'data-cke-display-name="pagebreak" ' +
+			'class="cke_pagebreak">' +
+			'</div>', editor.document );
 
 		var ranges = editor.getSelection().getRanges( true );
 
@@ -100,20 +141,22 @@ CKEDITOR.plugins.pagebreakCmd =
 			range = ranges[ i ];
 
 			if ( i < ranges.length -1 )
-				breakObject = breakObject.clone( true );
+				pagebreak = pagebreak.clone( true );
 
 			range.splitBlock( 'p' );
-			range.insertNode( breakObject );
+			range.insertNode( pagebreak );
 			if ( i == ranges.length - 1 )
 			{
-				range.moveToPosition( breakObject, CKEDITOR.POSITION_AFTER_END );
-				range.select();
-			}
+				var next = pagebreak.getNext();
+				range.moveToPosition( pagebreak, CKEDITOR.POSITION_AFTER_END );
 
-			var previous = breakObject.getPrevious();
+				// If there's nothing or a non-editable block followed by, establish a new paragraph
+				// to make sure cursor is not trapped.
+				if ( !next || next.type == CKEDITOR.NODE_ELEMENT && !next.isEditable() )
+					range.fixBlock( true, editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p'  );
 
-			if ( previous && CKEDITOR.dtd[ previous.getName() ].div )
-				breakObject.move( previous );
+				range.select();
+			}
 		}
 
 		editor.fire( 'saveSnapshot' );