RubyGems - refinerycms-ckeditor - Versions diffs - 0.1.4 → 0.2.0 - Mend

refinerycms-ckeditor 0.1.4 → 0.2.0

Files changed (700) hide show

data/app/assets/javascripts/ckeditor/_source/plugins/undo/plugin.js CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -260,7 +260,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			if ( startedTyping || modifierSnapshot )
 			{
-				var beforeTypeImage = new Image( this.editor );
+				var beforeTypeImage = new Image( this.editor ),
+					beforeTypeCount = this.snapshots.length;
 				// Use setTimeout, so we give the necessary time to the
 				// browser to insert the character into the DOM.
@@ -272,7 +273,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						if ( CKEDITOR.env.ie )
 							currentSnapshot = currentSnapshot.replace( /\s+data-cke-expando=".*?"/g, '' );
-						if ( beforeTypeImage.contents != currentSnapshot )
+						// If changes have taken place, while not been captured yet (#8459),
+						// compensate the snapshot.
+						if ( beforeTypeImage.contents != currentSnapshot &&
+							 beforeTypeCount == this.snapshots.length )
 						{
 							// It's safe to now indicate typing state.
 							this.typing = true;
@@ -410,10 +414,21 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		restoreImage : function( image )
 		{
+			// Bring editor focused to restore selection.
+			var editor = this.editor,
+				sel;
+			if ( image.bookmarks )
+			{
+				editor.focus();
+				// Retrieve the selection beforehand. (#8324)
+				sel = editor.getSelection();
+			}
 			this.editor.loadSnapshot( image.contents );
 			if ( image.bookmarks )
-				this.editor.getSelection().selectBookmarks( image.bookmarks );
+				sel.selectBookmarks( image.bookmarks );
 			else if ( CKEDITOR.env.ie )
 			{
 				// IE BUG: If I don't set the selection to *somewhere* after setting

data/app/assets/javascripts/ckeditor/_source/plugins/wsc/dialogs/ciframe.html CHANGED

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <!--
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 -->
 <html>

data/app/assets/javascripts/ckeditor/_source/plugins/wsc/dialogs/tmpFrameset.html CHANGED

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <!--
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 -->
 <html>

data/app/assets/javascripts/ckeditor/_source/plugins/wsc/dialogs/wsc.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/plugins/wsc/dialogs/wsc.js CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/plugins/wsc/plugin.js CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/plugins/wysiwygarea/plugin.js CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -30,10 +30,20 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			{
 				this.focus();
+				// Since the insertion might happen from within dialog or menu
+				// where the editor selection might be locked at the moment,
+				// update the locked selection.
+				var selection = this.getSelection(),
+				selIsLocked = selection.isLocked;
+				selIsLocked && selection.unlock();
 				this.fire( 'saveSnapshot' );
 				insertFunc.call( this, evt.data );
+				selIsLocked && this.getSelection().lock();
 				// Save snaps after the whole execution completed.
 				// This's a workaround for make DOM modification's happened after
 				// 'insertElement' to be included either, e.g. Form-based dialogs' 'commitContents'
@@ -83,11 +93,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		if ( CKEDITOR.env.ie )
 		{
-			var selIsLocked = selection.isLocked;
-			if ( selIsLocked )
-				selection.unlock();
 			var $sel = selection.getNative();
 			// Delete control selections to avoid IE bugs on pasteHTML.
@@ -113,9 +118,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			}
 			$sel.createRange().pasteHTML( data );
-			if ( selIsLocked )
-				this.getSelection().lock();
 		}
 		else
 			this.document.$.execCommand( 'inserthtml', false, data );
@@ -476,6 +478,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			var frameLabel = editor.lang.editorTitle.replace( '%1', editor.name );
+			var win = CKEDITOR.document.getWindow();
 			var contentDomReadyHandler;
 			editor.on( 'editingBlockReady', function()
 				{
@@ -484,7 +487,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						isLoadingData,
 						isPendingFocus,
 						frameLoaded,
-						fireMode;
+						fireMode,
+						onResize;
 					// Support for custom document.domain in IE.
@@ -546,6 +550,19 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							CKEDITOR.event.useCapture = false;
 						mainElement.append( iframe );
+						// Webkit: iframe size doesn't auto fit well. (#7360)
+						if ( CKEDITOR.env.webkit )
+						{
+							onResize = function()
+							{
+								iframe.hide();
+								iframe.setSize( 'width', mainElement.getSize( 'width' ) );
+								iframe.show();
+							};
+							win.on( 'resize', onResize );
+						}
 					};
 					// The script that launches the bootstrap logic on 'domReady', so the document
@@ -689,28 +706,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							} );
 						}
-						// IE standard compliant in editing frame doesn't focus the editor when
-						// clicking outside actual content, manually apply the focus. (#1659)
-						if ( editable &&
-								CKEDITOR.env.ie && domDocument.$.compatMode == 'CSS1Compat'
-								|| CKEDITOR.env.gecko
-								|| CKEDITOR.env.opera )
-						{
-							var htmlElement = domDocument.getDocumentElement();
-							htmlElement.on( 'mousedown', function( evt )
-							{
-								// Setting focus directly on editor doesn't work, we
-								// have to use here a temporary element to 'redirect'
-								// the focus.
-								if ( evt.data.getTarget().equals( htmlElement ) )
-								{
-									if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 )
-										blinkCursor();
-									focusGrabber.focus();
-								}
-							} );
-						}
 						var focusTarget = CKEDITOR.env.ie ? iframe : domWindow;
 						focusTarget.on( 'blur', function()
 							{
@@ -778,6 +773,28 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 									return;
 								}
 							}
+							// PageUp OR PageDown
+							if ( keyCode == 33 || keyCode == 34 )
+							{
+								if ( CKEDITOR.env.gecko )
+								{
+									var body = domDocument.getBody();
+									// Page up/down cause editor selection to leak
+									// outside of editable thus we try to intercept
+									// the behavior, while it affects only happen
+									// when editor contents are not overflowed. (#7955)
+									if ( domWindow.$.innerHeight > body.$.offsetHeight )
+									{
+										range = new CKEDITOR.dom.range( domDocument );
+										range[ keyCode == 33 ? 'moveToElementEditStart' : 'moveToElementEditEnd']( body );
+										range.select();
+										evt.data.preventDefault();
+									}
+								}
+							}
 						} );
 						// PageUp/PageDown scrolling is broken in document
@@ -803,9 +820,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							domDocument.on( 'selectionchange', function()
 							{
 								var body = domDocument.getBody(),
-									range = editor.getSelection().getRanges()[ 0 ];
+									sel = editor.getSelection(),
+									range = sel && sel.getRanges()[ 0 ];
-								if ( body.getHtml().match( /^<p>&nbsp;<\/p>$/i )
+								if ( range && body.getHtml().match( /^<p>&nbsp;<\/p>$/i )
 									&& range.startContainer.equals( body ) )
 								{
 									// Avoid the ambiguity from a real user cursor position.
@@ -1078,6 +1096,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							{
 								this.onDispose();
+								if ( onResize )
+									win.removeListener( 'resize', onResize );
 								editor.window = editor.document = iframe = mainElement = isPendingFocus = null;
 								editor.fire( 'contentDomUnload' );
@@ -1158,6 +1179,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				editor.addCss( 'html { height: 100% !important; }' );
 				editor.addCss( 'img:-moz-broken { -moz-force-broken-image-icon : 1;	width : 24px; height : 24px; }' );
 			}
+			// Remove the margin to avoid mouse confusion. (#8835)
+			else if ( CKEDITOR.env.ie && CKEDITOR.env.version < 8 && editor.config.contentsLangDirection == 'ltr' )
+				editor.addCss( 'body{margin-right:0;}' );
 			/* #3658: [IE6] Editor document has horizontal scrollbar on long lines
 			To prevent this misbehavior, we show the scrollbar always */
@@ -1198,31 +1222,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					});
 			}
-			// Create an invisible element to grab focus.
-			if ( CKEDITOR.env.gecko || CKEDITOR.env.ie || CKEDITOR.env.opera )
-			{
-				var focusGrabber;
-				editor.on( 'uiReady', function()
-				{
-					focusGrabber = editor.container.append( CKEDITOR.dom.element.createFromHtml(
-						// Use 'span' instead of anything else to fly under the screen-reader radar. (#5049)
-						'<span tabindex="-1" style="position:absolute;" role="presentation"></span>' ) );
-					focusGrabber.on( 'focus', function()
-						{
-							editor.focus();
-						} );
-					editor.focusGrabber = focusGrabber;
-				} );
-				editor.on( 'destroy', function()
-				{
-					CKEDITOR.tools.removeFunction( contentDomReadyHandler );
-					focusGrabber.clearCustomData();
-					delete editor.focusGrabber;
-				} );
-			}
 			// Disable form elements editing mode provided by some browers. (#5746)
 			editor.on( 'insertElement', function ( evt )
 			{

data/app/assets/javascripts/ckeditor/_source/plugins/xml/plugin.js CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/kama/dialog.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/kama/editor.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/kama/elementspath.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/kama/icons.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/kama/mainui.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/kama/menu.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/kama/panel.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/kama/presets.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/kama/reset.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/kama/richcombo.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/kama/skin.js CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/kama/templates.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/kama/toolbar.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/office2003/dialog.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/office2003/editor.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/office2003/elementspath.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/office2003/icons.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */

data/app/assets/javascripts/ckeditor/_source/skins/office2003/mainui.css CHANGED

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */