refinerycms-ckeditor 0.1.4 → 0.2.0

data/app/assets/javascripts/ckeditor/_source/plugins/fakeobjects/plugin.js

@@ -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/filebrowser/plugin.js

@@ -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
 */
 
@@ -246,7 +246,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		{
 			element = elements[ i ];
 
-			if ( element.type == 'hbox' || element.type == 'vbox' )
+			if ( element.type == 'hbox' || element.type == 'vbox' || element.type == 'fieldset' )
 				attachFileBrowser( editor, dialogName, definition, element.children );
 
 			if ( !element.filebrowser )
@@ -321,7 +321,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	{
 		var dialog = sourceElement.getDialog();
 		var targetElement = sourceElement.filebrowser.target || null;
-		url = url.replace( /#/g, '%23' );
 
 		// If there is a reference to targetElement, update it.
 		if ( targetElement )

data/app/assets/javascripts/ckeditor/_source/plugins/find/dialogs/find.js

@@ -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/find/plugin.js

@@ -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/flash/dialogs/flash.js

@@ -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/flash/plugin.js

@@ -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/floatpanel/plugin.js

@@ -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
 */
 
@@ -47,6 +47,9 @@ CKEDITOR.plugins.add( 'floatpanel',
 				element = panel.element,
 				iframe = element.getFirst().getFirst();
 
+			// Disable native browser menu. (#4825)
+			element.disableContextMenu();
+
 			this.element = element;
 
 			this._ =
@@ -198,9 +201,6 @@ CKEDITOR.plugins.add( 'floatpanel',
 
 				CKEDITOR.tools.setTimeout( function()
 					{
-						if ( rtl )
-							left -= element.$.offsetWidth;
-
 						var panelLoad = CKEDITOR.tools.bind( function ()
 						{
 							var target = element.getFirst();
@@ -247,24 +247,72 @@ CKEDITOR.plugins.add( 'floatpanel',
 							else
 								target.removeStyle( 'height' );
 
+							// Flip panel layout horizontally in RTL with known width.
+							if ( rtl )
+								left -= element.$.offsetWidth;
+
+							// Pop the style now for measurement.
+							element.setStyle( 'left', left + 'px' );
+
+							/* panel layout smartly fit the viewport size. */
 							var panelElement = panel.element,
 								panelWindow = panelElement.getWindow(),
-								windowScroll = panelWindow.getScrollPosition(),
-								viewportSize = panelWindow.getViewPaneSize(),
-								panelSize =
+								rect = element.$.getBoundingClientRect(),
+								viewportSize = panelWindow.getViewPaneSize();
+
+							// Compensation for browsers that dont support "width" and "height".
+							var rectWidth = rect.width || rect.right - rect.left,
+							rectHeight = rect.height || rect.bottom - rect.top;
+
+							// Check if default horizontal layout is impossible.
+							var spaceAfter = rtl ? rect.right : viewportSize.width - rect.left,
+								spaceBefore = rtl ? viewportSize.width - rect.right : rect.left;
+
+							if ( rtl )
+							{
+								if ( spaceAfter < rectWidth )
 								{
-									'height' : panelElement.$.offsetHeight,
-									'width' : panelElement.$.offsetWidth
-								};
-
-							// If the menu is horizontal off, shift it toward
-							// the opposite language direction.
-							if ( rtl ? left < 0 : left + panelSize.width > viewportSize.width + windowScroll.x )
-								left += ( panelSize.width * ( rtl ? 1 : -1 ) );
-
-							// Vertical off screen is simpler.
-							if ( top + panelSize.height > viewportSize.height + windowScroll.y )
-								top -= panelSize.height;
+									// Flip to show on right.
+									if ( spaceBefore > rectWidth )
+										left += rectWidth;
+									// Align to window left.
+									else if ( viewportSize.width > rectWidth )
+										left = left - rect.left;
+									// Align to window right, never cutting the panel at right.
+									else
+										left = left - rect.right + viewportSize.width;
+								}
+							}
+							else if ( spaceAfter < rectWidth )
+							{
+									// Flip to show on left.
+									if ( spaceBefore > rectWidth )
+										left -= rectWidth;
+									// Align to window right.
+									else if ( viewportSize.width > rectWidth )
+										left = left - rect.right + viewportSize.width;
+									// Align to window left, never cutting the panel at left.
+									else
+										left = left - rect.left;
+								}
+
+
+							// Check if the default vertical layout is possible.
+							var spaceBelow = viewportSize.height - rect.top,
+								spaceAbove = rect.top;
+
+							if ( spaceBelow < rectHeight )
+							{
+								// Flip to show above.
+								if ( spaceAbove > rectHeight )
+									top -= rectHeight;
+								// Align to window bottom.
+								else if ( viewportSize.height > rectHeight )
+									top = top - rect.bottom + viewportSize.height;
+								// Align to top, never cutting the panel at top.
+								else
+									top = top - rect.top;
+							}
 
 							// If IE is in RTL, we have troubles with absolute
 							// position and horizontal scrolls. Here we have a

data/app/assets/javascripts/ckeditor/_source/plugins/font/plugin.js

@@ -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/format/plugin.js

@@ -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/forms/dialogs/button.js

@@ -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
 */
 CKEDITOR.dialog.add( 'button', function( editor )

data/app/assets/javascripts/ckeditor/_source/plugins/forms/dialogs/checkbox.js

@@ -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
 */
 CKEDITOR.dialog.add( 'checkbox', function( editor )

data/app/assets/javascripts/ckeditor/_source/plugins/forms/dialogs/form.js

@@ -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
 */
 CKEDITOR.dialog.add( 'form', function( editor )

data/app/assets/javascripts/ckeditor/_source/plugins/forms/dialogs/hiddenfield.js

@@ -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
 */
 CKEDITOR.dialog.add( 'hiddenfield', function( editor )

data/app/assets/javascripts/ckeditor/_source/plugins/forms/dialogs/radio.js

@@ -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
 */
 CKEDITOR.dialog.add( 'radio', function( editor )

data/app/assets/javascripts/ckeditor/_source/plugins/forms/dialogs/select.js

@@ -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
 */
 CKEDITOR.dialog.add( 'select', function( editor )

data/app/assets/javascripts/ckeditor/_source/plugins/forms/dialogs/textarea.js

@@ -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
 */
 CKEDITOR.dialog.add( 'textarea', function( editor )

data/app/assets/javascripts/ckeditor/_source/plugins/forms/dialogs/textfield.js

@@ -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
 */
 CKEDITOR.dialog.add( 'textfield', function( editor )

data/app/assets/javascripts/ckeditor/_source/plugins/forms/plugin.js

@@ -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/horizontalrule/plugin.js

@@ -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/htmldataprocessor/plugin.js

@@ -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
 */
 
@@ -308,7 +308,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				// Avoid corrupting the inline event attributes (#7243).
 				// We should not rewrite the existed protected attributes, e.g. clipboard content from editor. (#5218)
 				if ( !( /^on/ ).test( attrName ) && attributes.indexOf( 'data-cke-saved-' + attrName ) == -1 )
-					return ' data-cke-saved-' + fullAttr + ' ' + fullAttr;
+					return ' data-cke-saved-' + fullAttr + ' data-cke-' + CKEDITOR.rnd + '-' + fullAttr;
 
 				return fullAttr;
 			}) + '>';
@@ -516,10 +516,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			// Call the browser to help us fixing a possibly invalid HTML
 			// structure.
 			var div = new CKEDITOR.dom.element( 'div' );
+
 			// Add fake character to workaround IE comments bug. (#3801)
 			div.setHtml( 'a' + data );
 			data = div.getHtml().substr( 1 );
 
+			// Restore shortly protected attribute names.
+			data = data.replace( new RegExp( ' data-cke-' + CKEDITOR.rnd + '-', 'ig' ), ' ' );
+
 			// Unprotect "some" of the protected elements at this point.
 			data = unprotectElementNames( data );
 

data/app/assets/javascripts/ckeditor/_source/plugins/htmlwriter/plugin.js

@@ -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/iframe/dialogs/iframe.js

@@ -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/iframe/plugin.js

@@ -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/iframedialog/plugin.js

@@ -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/image/dialogs/image.js

@@ -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
 */
 
@@ -266,7 +266,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			btnLockSizesId = numbering( 'btnLockSizes' ),
 			btnResetSizeId = numbering( 'btnResetSize' ),
 			imagePreviewLoaderId = numbering( 'ImagePreviewLoader' ),
-			imagePreviewBoxId = numbering( 'ImagePreviewBox' ),
 			previewLinkId = numbering( 'previewLink' ),
 			previewImageId = numbering( 'previewImage' );
 
@@ -290,8 +289,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				this.addLink = false;
 
 				var editor = this.getParentEditor(),
-					sel = this.getParentEditor().getSelection(),
-					element = sel.getSelectedElement(),
+					sel = editor.getSelection(),
+					element = sel && sel.getSelectedElement(),
 					link = element && element.getAscendant( 'a' );
 
 				//Hide loader.
@@ -1077,7 +1076,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 											style : 'width:95%;',
 											html : '<div>' + CKEDITOR.tools.htmlEncode( editor.lang.common.preview ) +'<br>'+
 											'<div id="' + imagePreviewLoaderId + '" class="ImagePreviewLoader" style="display:none"><div class="loading">&nbsp;</div></div>'+
-											'<div id="' + imagePreviewBoxId + '" class="ImagePreviewBox"><table><tr><td>'+
+											'<div class="ImagePreviewBox"><table><tr><td>'+
 											'<a href="javascript:void(0)" target="_blank" onclick="return false;" id="' + previewLinkId + '">'+
 											'<img id="' + previewImageId + '" alt="" /></a>' +
 											( editor.config.image_previewText ||

data/app/assets/javascripts/ckeditor/_source/plugins/image/plugin.js

@@ -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
 */
 
@@ -7,6 +7,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
  * @file Image plugin
  */
 
+(function()
+{
+
 CKEDITOR.plugins.add( 'image',
 {
 	init : function( editor )
@@ -53,14 +56,94 @@ CKEDITOR.plugins.add( 'image',
 		{
 			editor.contextMenu.addListener( function( element, selection )
 				{
-					if ( !element || !element.is( 'img' ) || element.data( 'cke-realelement' ) || element.isReadOnly() )
-						return null;
-
-					return { image : CKEDITOR.TRISTATE_OFF };
+					if ( getSelectedImage( editor, element ) )
+						return { image : CKEDITOR.TRISTATE_OFF };
 				});
 		}
+	},
+	afterInit : function( editor )
+	{
+		// Customize the behavior of the alignment commands. (#7430)
+		setupAlignCommand( 'left' );
+		setupAlignCommand( 'right' );
+		setupAlignCommand( 'center' );
+		setupAlignCommand( 'block' );
+
+		function setupAlignCommand( value )
+		{
+			var command = editor.getCommand( 'justify' + value );
+			if ( command )
+			{
+				if ( value == 'left' || value == 'right' )
+				{
+					command.on( 'exec', function( evt )
+						{
+							var img = getSelectedImage( editor ), align;
+							if ( img )
+							{
+								align = getImageAlignment( img );
+								if ( align == value )
+								{
+									img.removeStyle( 'float' );
+
+									// Remove "align" attribute when necessary.
+									if ( value == getImageAlignment( img ) )
+										img.removeAttribute( 'align' );
+								}
+								else
+									img.setStyle( 'float', value );
+
+								evt.cancel();
+							}
+						});
+				}
+
+				command.on( 'refresh', function( evt )
+					{
+						var img = getSelectedImage( editor ), align;
+						if ( img )
+						{
+							align = getImageAlignment( img );
+
+							this.setState(
+								( align == value ) ? CKEDITOR.TRISTATE_ON :
+								( value == 'right' || value == 'left' ) ? CKEDITOR.TRISTATE_OFF :
+								CKEDITOR.TRISTATE_DISABLED );
+
+							evt.cancel();
+						}
+					});
+			}
+		}
 	}
-} );
+});
+
+function getSelectedImage( editor, element )
+{
+	if ( !element )
+	{
+		var sel = editor.getSelection();
+		element = ( sel.getType() == CKEDITOR.SELECTION_ELEMENT ) && sel.getSelectedElement();
+	}
+
+	if ( element && element.is( 'img' ) && !element.data( 'cke-realelement' ) && !element.isReadOnly() )
+		return element;
+}
+
+function getImageAlignment( element )
+{
+	var align = element.getStyle( 'float' );
+
+	if ( align == 'inherit' || align == 'none' )
+		align = 0;
+
+	if ( !align )
+		align = element.getAttribute( 'align' );
+
+	return align;
+}
+
+})();
 
 /**
  * Whether to remove links when emptying the link URL field in the image dialog.