Partial fix for localwiki#280, for images already on the page

wrought · Jun 7, 2012 · c1a01b7 · c1a01b7
1 parent f73ae26
commit c1a01b7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/sapling/pages/static/js/ckeditor/_source/plugins/simpleimage/dialogs/simpleimage.js b/sapling/pages/static/js/ckeditor/_source/plugins/simpleimage/dialogs/simpleimage.js
@@ -876,6 +876,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                         	element.removeClass("image_right");
                                                             if ( value ) {
                                                             	element.addClass("image_" + value);
+                                                            	// Move to top level in the DOM when floated
+                                                            	top_level = jQuery(element.$).parentsUntil('body,td,th').last();
+                                                            	if(top_level.length)
+                                                            	{
+                                                            		jQuery(element.$).remove();
+                                                            		top_level.before(jQuery(element.$));
+                                                            	}
                                                             }
 
                                                             if ( !internalCommit && type == IMAGE )

diff --git a/sapling/pages/static/js/ckeditor/_source/plugins/simpleimage/plugin.js b/sapling/pages/static/js/ckeditor/_source/plugins/simpleimage/plugin.js
@@ -140,6 +140,7 @@ CKEDITOR.plugins.add( 'simpleimage',
             	var oldHtml = oldFrame.length ? oldFrame.outerHTML() : img.outerHTML();
             	img.addClass('cke_moved');
             	oldFrame.addClass('cke_moved');
+            	var floated = oldFrame.hasClass('image_right') || oldFrame.hasClass('image_left');
             	var moveImage = function(evt){
                     oldFrame.remove();
             		var moved_image = jQuery('img.cke_moved', editor.document.$);
@@ -160,7 +161,13 @@ CKEDITOR.plugins.add( 'simpleimage',
             		        outerFrame.before(oldHtml);
             		    else outerFrame.after(oldHtml);
             		} else {
-            		    moved_element.before(oldHtml);
+                        where_to_drop = moved_element;
+            		    if(floated)
+            		    {
+            		        top_level = moved_element.parentsUntil('body,td,th').last();
+            		        where_to_drop = top_level;
+            		    }
+            		    where_to_drop.before(oldHtml);
             		}
             		// fix the cursor position
             		var selection = editor.getSelection();