refinerycms 0.9.8.5 → 0.9.8.6

data/vendor/refinerycms/core/public/javascripts/refinery/admin.js

@@ -756,38 +756,58 @@ var image_dialog = {
 }
 
 var list_reorder = {
-  init: function() {
+  initialised: false
+  , init: function() {
     $('#reorder_action').click(list_reorder.enable_reordering);
     $('#reorder_action_done').click(list_reorder.disable_reordering);
+    if(list_reorder.tree === false) {
+      list_reorder.sortable_list.find('li').addClass('no-nest');
+    }
     list_reorder.sortable_list.nestedSortable({
       disableNesting: 'no-nest',
       forcePlaceholderSize: true,
-      handle: 'div',
+      handle: list_reorder.tree ? 'div' : null,
       items: 'li',
       opacity: .6,
       placeholder: 'placeholder',
       tabSize: 25,
       tolerance: 'pointer',
-      toleranceElement: '> div',
+      toleranceElement: list_reorder.tree ? '> div' : null,
       disabled: true,
       start: function () {
       },
       change: function () {
-        list_reorder.reset_branch_classes(this);
+        if (list_reorder.tree) {
+          list_reorder.reset_branch_classes(this);
+        }
       },
       stop: function () {
-        list_reorder.reset_branch_classes(this);
+        if (list_reorder.tree) {
+          list_reorder.reset_branch_classes(this);
+        } else {
+          list_reorder.reset_on_off_classes(this);
+        }
       }
     });
-    list_reorder.reset_branch_classes(list_reorder.sortable_list);
+    if (list_reorder.tree) {
+      list_reorder.reset_branch_classes(list_reorder.sortable_list);
+    } else {
+      list_reorder.reset_on_off_classes(list_reorder.sortable_list);
+    }
+    this.initialised = true;
+  }
+  , reset_on_off_classes: function(ul) {
+    $("> li", ul).each(function(i, li) {
+      $(li).removeClass('on off on-hover').addClass(i % 2 === 0 ? 'on' : 'off');
+    });
   }
 
-  ,reset_branch_classes: function (ul) {
+  , reset_branch_classes: function (ul) {
     $("li.ui-sortable-helper", this).removeClass("record").removeClass("branch_start").removeClass("branch_end");
     $("li", ul).removeClass("branch_start").removeClass("branch_end");
 
-    $("> li:first", ul).addClass("branch_start")
-    $("> li:last", ul).addClass("branch_end")
+    $("> li:first", ul).addClass("branch_start");
+    $("> li:last", ul).addClass("branch_end");
 
     var nested_ul = $("ul", ul);
     $("> li:last", nested_ul).addClass("branch_end");
@@ -798,7 +818,7 @@ var list_reorder = {
     $('#sortable_list').addClass("reordering");
 
     $('#sortable_list .actions, #site_bar, header > *:not(script)').fadeTo(500, 0.3);
-    $('#actions *:not("#reorder_action_done, #reorder_action")').not($('#reorder_action_done').parents('li, ul')).fadeTo(500, 0.55);
+    $('#actions *:not("#reorder_action_done, #reorder_action")').not($('#reorder_action_done').parents('li, ul, div')).fadeTo(500, 0.55);
 
     list_reorder.sortable_list.nestedSortable("enable");
     $('#reorder_action').hide();
@@ -829,19 +849,19 @@ var list_reorder = {
 
   , restore_controls: function(e) {
     if (list_reorder.tree && !$.browser.msie) {
-      list_reorder.sortable_list.add(list_reorder.sortable_list.find('ul, li')).draggable('destroy');
+      list_reorder.sortable_list.add(list_reorder.sortable_list.find('ul, li, div')).draggable({ disabled: true });
     } else {
       $(list_reorder.sortable_list).sortable('destroy');
     }
     $(list_reorder.sortable_list).removeClass('reordering, ui-sortable');
 
     $('#sortable_list .actions, #site_bar, header > *:not(script)').fadeTo(250, 1);
-    $('#actions *:not("#reorder_action_done, #reorder_action")').not($('#reorder_action_done').parents('li, ul')).fadeTo(250, 1, function() {
+    $('#actions *:not("#reorder_action_done, #reorder_action")').not($('#reorder_action_done').parents('li, ul, div')).fadeTo(250, 1, function() {
       $('#reorder_action_done').hide().removeClass('loading');
       $('#reorder_action').show();
     });
   }
-}
+};
 
 var image_picker = {
   options: {

data/vendor/refinerycms/core/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -26,7 +26,7 @@
    Namespace: WYMeditor
    Global WYMeditor namespace.
 */
-if(!WYMeditor) var WYMeditor = {};
+if(!WYMeditor) { var WYMeditor = {}; }
 
 //Wrap the Firebug console in WYMeditor.console
 (function() {
@@ -36,9 +36,9 @@ if(!WYMeditor) var WYMeditor = {};
 
     WYMeditor.console = {};
     for (var i = 0; i < names.length; ++i)
-      WYMeditor.console[names[i]] = function() {}
+      WYMeditor.console[names[i]] = function() {};
 
-  } else WYMeditor.console = window.console;
+  } else { WYMeditor.console = window.console; }
 })();
 $.extend(WYMeditor, {
 
@@ -268,7 +268,7 @@ $.extend(WYMeditor, {
         this._html = $(elem).val();
 
         //store the HTML option, if any
-        if(this._options.html) this._html = this._options.html;
+        if(this._options.html) { this._html = this._options.html; }
 
         //get or compute the base path (where the main JS file is located)
         this._options.basePath = this._options.basePath || this.computeBasePath();
@@ -674,7 +674,7 @@ WYMeditor.editor.prototype.init = function() {
 
   if(WymClass) {
 
-      if($.isFunction(this._options.preInit)) this._options.preInit(this);
+      if($.isFunction(this._options.preInit)) { this._options.preInit(this); }
 
       var SaxListener = new WYMeditor.XhtmlSaxListener();
       $.extend(SaxListener, WymClass);
@@ -729,7 +729,7 @@ WYMeditor.editor.prototype.init = function() {
 
       for(var i = 0; i < aTools.length; i++) {
         var oTool = aTools[i];
-        if(oTool.name && oTool.title)
+        if(oTool.name && oTool.title) {
           var sTool = this._options.toolsItemHtml;
           var sTool = h.replaceAll(sTool, WYMeditor.TOOL_NAME, oTool.name);
           sTool = h.replaceAll(sTool, WYMeditor.TOOL_TITLE, this._options.stringDelimiterLeft
@@ -737,6 +737,7 @@ WYMeditor.editor.prototype.init = function() {
             + this._options.stringDelimiterRight);
           sTool = h.replaceAll(sTool, WYMeditor.TOOL_CLASS, oTool.css);
           sTools += sTool;
+        }
       }
 
       boxHtml = h.replaceAll(boxHtml, WYMeditor.TOOLS_ITEMS, sTools);
@@ -780,7 +781,7 @@ WYMeditor.editor.prototype.init = function() {
 
       for(var i = 0; i < aContainers.length; i++) {
         var oContainer = aContainers[i];
-        if(oContainer.name && oContainer.title)
+        if(oContainer.name && oContainer.title) {
           var sContainer = this._options.containersItemHtml;
           sContainer = h.replaceAll(sContainer, WYMeditor.CONTAINER_NAME, oContainer.name);
           sContainer = h.replaceAll(sContainer, WYMeditor.CONTAINER_TITLE,
@@ -789,6 +790,7 @@ WYMeditor.editor.prototype.init = function() {
             + this._options.stringDelimiterRight);
           sContainer = h.replaceAll(sContainer, WYMeditor.CONTAINER_CLASS, oContainer.css);
           sContainers += sContainer;
+        }
       }
 
       boxHtml = h.replaceAll(boxHtml, WYMeditor.CONTAINERS_ITEMS, sContainers);
@@ -849,7 +851,7 @@ WYMeditor.editor.prototype.bindEvents = function() {
               }
             });
 
-            oClass = {expr: (classRule.rules[indexOf].expr || null)}
+            oClass = {expr: (classRule.rules[indexOf].expr || null)};
           }
         }
       });
@@ -896,8 +898,11 @@ WYMeditor.editor.prototype.box = function() {
  */
 WYMeditor.editor.prototype.html = function(html) {
 
-  if(typeof html === 'string') $(this._doc.body).html(html);
-  else return($(this._doc.body).html());
+  if(typeof html === 'string') {
+    $(this._doc.body).html(html);
+  } else {
+    return($(this._doc.body).html());
+  }
 };
 
 /* @name intercept_paste
@@ -910,7 +915,7 @@ WYMeditor.editor.prototype.intercept_paste = function(e) {
   if (e) {
     e.preventDefault();
   }
-}
+};
 
 /* @name xhtml
  * @description Cleans up the HTML
@@ -1040,12 +1045,12 @@ WYMeditor.editor.prototype.container = function(sType) {
             var lgt = nodes.length;
             var firstNode = null;
 
-            if(lgt > 0) firstNode = nodes.item(0);
+            if(lgt > 0) { firstNode = nodes.item(0); }
             for(var x=0; x<lgt; x++) {
               blockquote.parentNode.insertBefore(nodes.item(0),blockquote);
             }
             blockquote.parentNode.removeChild(blockquote);
-            if(firstNode) this.setFocusToNode(firstNode);
+            if(firstNode) { this.setFocusToNode(firstNode); }
           }
         }
 
@@ -1058,7 +1063,7 @@ WYMeditor.editor.prototype.container = function(sType) {
       }
     }
   }
-  else return(this.selected());
+  else { return(this.selected()); }
 };
 
 /* @name toggleClass
@@ -1069,7 +1074,7 @@ WYMeditor.editor.prototype.toggleClass = function(sClass, jqexpr) {
   var container = $((this._selected_image ? this._selected_image : this.selected(true)));
   if (jqexpr != null) { container = $(container.parentsOrSelf(jqexpr)); }
   container.toggleClass(sClass);
-  if(!container.attr(WYMeditor.CLASS)) container.removeAttr(this._class);
+  if(!container.attr(WYMeditor.CLASS)) { container.removeAttr(this._class); }
 
 };
 
@@ -1082,9 +1087,9 @@ WYMeditor.editor.prototype.removeClass = function(sClass, jqexpr) {
   if (jqexpr != null) { container = $(container.parentsOrSelf(jqexpr)); }
   container.removeClass(sClass);
 
-  if(!container.attr(WYMeditor.CLASS)) container.removeAttr(this._class);
+  if(!container.attr(WYMeditor.CLASS)) { container.removeAttr(this._class); }
 
-}
+};
 
 /* @name findUp
  * @description Returns the first parent or self container, based on its type
@@ -1123,10 +1128,14 @@ WYMeditor.editor.prototype.findUp = function(node, filter) {
         }
       }
 
-      if(tagname != WYMeditor.BODY) return(node);
-      else return(null);
-
-  } else return(null);
+      if(tagname != WYMeditor.BODY) {
+        return(node);
+      } else {
+        return(null);
+      }
+  } else {
+    return(null);
+  }
 };
 
 /* @name switchTo
@@ -1175,7 +1184,7 @@ WYMeditor.editor.prototype.replaceStrings = function(sVal) {
   //replace all the strings in sVal and return it
   $.each(WYMeditor.STRINGS[wym._options.lang], function(key, value) {
     sVal = WYMeditor.Helper.replaceAll(sVal, wym.encloseString(key), value);
-  })
+  });
 
   return(sVal);
 };
@@ -1197,36 +1206,58 @@ WYMeditor.editor.prototype.status = function(sMessage) {
  * @description Updates the element and textarea values
  */
 WYMeditor.editor.prototype.update = function() {
+  var wym = this;
 
   // the replace function below makes the HTML source code easier to read when end users need to use this view.
-  var html = this.xhtml().replace(/<\/([A-Za-z0-9]*)></g, function(m){return m.split(">").join(">\n")});
-  html = html.replace(/src=\"system\/images/g, 'src="/system/images'); // make system/images calls absolute.
-  html = html.replace(/(\ ?id=(\"|\')replace_me_with_wym-[0-9]*(\"|\'))/g, ''); // get rid of replace_me_with_wym id tags that were forgotten about.
-  html = html.replace(/(\ ?id=(\"|\')last\_paste(\"|\'))/g, '') // get rid of id='last_page' that were forgotten about.
+  var html = wym.xhtml().replace(/<\/([A-Za-z0-9]*)></g, function(m){
+    return m.split(">").join(">\n");
+  });
+
+  // ensure system/images calls become /system/images.
+  html = html.replace(/src=\"system\/images/g, 'src="/system/images');
+
+  // get rid of wym id tags that were forgotten about by replacing them with their content.
+  $(html).find(bad_spans='span[id|=wym], span[id=undefined]').add($(html).filter(bad_spans)).each(function(i, span) {
+    html_to_replace_with = wym.parser.parse($(span).html());
+    html_to_replace = wym.parser.parse($(span).wrap('<div />').parent().html());
+    if($.browser.msie) {
+      // converts <SPAN id=wym-1231231>foo</SPAN> to <SPAN id="wym-1231231">foo</SPAN> (note the quotes)
+      html_to_replace = new RegExp(html_to_replace.replace(/(\ [^\=]+\=)([^\ >]+)/, '$1"$2"'), "ig");
+    }
+    html = html.replace(html_to_replace, html_to_replace_with);
+  });
 
-  $(this._element).val(html);
-  $(this._box).find(this._options.htmlValSelector).not('.hasfocus').val(html); //#147
+  // get rid of id='last_paste' tags that were forgotten about.
+  html = html.replace(/(\ ?id=(\"|\')last\_paste(\"|\'))/igm, '');
+
+  // get rid of any temporary text-only interpolation tags we have inserted for cursor position.
+  html = html.replace(/[%$]+wym-[^%$]*[%$]+/igm, '');
+
+  // apply changes/
+  $(wym._element).val(html);
+  $(wym._box).find(wym._options.htmlValSelector).not('.hasfocus').val(html); //#147
 };
 
 /* @name dialog
  * @description Opens a dialog box
  */
 WYMeditor.editor.prototype.dialog = function( dialogType ) {
-  this.update();
-  var path = this._wym._options.dialogPath + dialogType;
+  var wym = this;
+
+  wym.update();
+  var path = this._wym._options.dialogPath + dialogType + '?wymeditor=true';
 
-  this._current_unique_stamp = this.uniqueStamp();
+  wym._current_unique_stamp = wym.uniqueStamp();
   // change undo or redo on cancel to true to have this happen when a user closes (cancels) a dialogue
-  this._undo_on_cancel = false;
-  this._redo_on_cancel = false;
+  wym._undo_on_cancel = false;
+  wym._redo_on_cancel = false;
 
   var selected = this.selected();
   //set to P if parent = BODY unless it's a table going in there.
   if (dialogType != WYMeditor.DIALOG_TABLE) {
-    this.format_block();
+    wym.format_block();
   }
 
-  var wym = this;
   if (dialogType == WYMeditor.DIALOG_LINK && $.browser.mozilla) {
     selection = wym._iframe.contentWindow.getSelection();
     matches = $($(selected).html().match(new RegExp(selection.anchorNode.textContent + "(.*)" + selection.focusNode.textContent)));
@@ -1240,70 +1271,81 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
           {
             selected = possible_match;
           }
-        })
+        });
       }
     }
   }
 
-  // set up handlers.
-  wym = this;
-  ajax_loaded_callback = function(){wym.dialog_ajax_callback(selected)}
+  ajax_loaded_callback = function(){wym.dialog_ajax_callback(selected);};
 
-  var parent_node = null;
-  if (this._selected_image) {
-    parent_node = this._selected_image.parentNode;
-  }
-  else {
-    parent_node = selected;
-  }
+  var parent_node = wym._selected_image ? wym._selected_image.parentNode : selected;
+  if (typeof(parent_node) != 'undefined' && parent_node !== null) {
+    if (parent_node.tagName.toLowerCase() != WYMeditor.A) {
+      // wrap the current selection with a funky span.
+      if (wym._selected_image == null)
+      {
+        if (selected != null && selected.tagName.toLowerCase() != WYMeditor.A && wym._iframe.contentWindow.getSelection) {
+          // Fixes webkit issue where it would not paste at cursor.
+          selection = wym._iframe.contentWindow.getSelection();
+          if (selection.focusNode.insertData) {
+            // if you highlight backwards, it reverses the order of the anchorNode and focusNode / anchorOffset and focusOffset.
+            // anchorOffset is where you started the selection, focusOffset is where you ended the selection.
+            // So, if you highlight forwards then {anchorOffset}some text{focusOffset}
+            // But, if you highlight backwards then {focusOffset}some text{anchorOffset}
+            if (selection.anchorOffset > selection.focusOffset) {
+              start_node = selection.focusNode;
+              start = selection.focusOffset;
+
+              end_node = selection.anchorNode;
+              end = selection.anchorOffset;
+            } else {
+              start_node = selection.anchorNode;
+              start = selection.anchorOffset;
 
-  if ((parent_node != null) && (parent_node.tagName.toLowerCase() != WYMeditor.A))
-  {
-    // wrap the current selection with a funky span.
-    if (this._selected_image == null)
-    {
-      if (selected != null && selected.tagName.toLowerCase() != WYMeditor.A && wym._iframe.contentWindow.getSelection) {
-        // Fixes webkit issue where it would not paste at cursor.
-        selection = wym._iframe.contentWindow.getSelection();
-        selected_html = $(selected).html().replace('&nbsp;', ' ');
+              end_node = selection.focusNode;
+              end = selection.focusOffset;
+            }
 
-        if ((offset = selected_html.indexOf(selection.focusNode.textContent)) == -1) {
-          offset = 0;
-        }
-        focus = offset + selection.focusOffset;
-        anchor = offset + selection.anchorOffset;
-        length = (focus - anchor);
-
-        if (length > 1) {
-          new_html = selected_html.substring(0, anchor)
-                     + "<span id='replace_me_with_" + this._current_unique_stamp + "'>"
-                     + selected_html.substring(anchor, focus)
-                     + "</span>"
-                     + selected_html.substring(focus);
+            // because .insertData only inserts text, we have to insert some 'meaningful' *text* only interpolation tags (no html).
+            start_tag = '%%' + wym._current_unique_stamp + '%%';
+            end_tag = '$$' + wym._current_unique_stamp + '$$';
+
+            // sometimes we may be crossing multiple "nodes" so a simple test for whether this is the case.
+            // this is important, see this example:
+            // some text <a href='/'>with some link</a> and then more text
+            // {start_node}some text {end_start_node}{anotherNode}<a href='/'>with some link</a>{end_anotherNode}{end_node} and then more text{end_end_node}
+            // the "start_node" is a separate node to the end node and therefore we can't treat them as one long node anymore.
+            if (start_node === end_node) {
+              end = end + start_tag.length;
+            }
+
+            // Insert the 'meaningful' text interpolation tags.
+            start_node.insertData(start, start_tag);
+            end_node.insertData(end, end_tag);
+
+            // Now that we can use HTML again, replace the simple text with a span tag.
+            $(selected).html($(selected).html().replace(start_tag, "<span id='" + wym._current_unique_stamp + "'>")
+                                               .replace(end_tag, "</span>"));
+          } else {
+            wym.wrap("<span id='" + wym._current_unique_stamp + "'>", "</span>");
+          }
         } else {
-          new_html = selected_html.substring(0, focus)
-                     + "<span id='replace_me_with_" + this._current_unique_stamp + "'></span>"
-                     + selected_html.substring(focus);
+          wym.wrap("<span id='" + wym._current_unique_stamp + "'>", "</span>");
         }
-        new_html = new_html.replace('  ', '&nbsp;');
-
-        $(selected).html(new_html);
-      } else {
-        this.wrap("<span id='replace_me_with_" + this._current_unique_stamp + "'>", "</span>");
       }
     }
-  }
-  else {
-    if (!this._selected_image) {
-      parent_node._id_before_replaceable = parent_node.id;
-      parent_node.id = 'replace_me_with_' + this._current_unique_stamp;
-    }
+    else {
+      if (!wym._selected_image) {
+        parent_node._id_before_replaceable = parent_node.id;
+        parent_node.id = '' + this._current_unique_stamp;
+      }
 
-    if (dialogType != WYMeditor.DIALOG_PASTE && dialogType != WYMeditor.DIALOG_TABLE) {
-      path += path.indexOf("?") == -1 ? "?" : "&";
-      port = (window.location.port.length > 0 ? (":" + window.location.port) : "")
-      path += "current_link=" + parent_node.href.replace(window.location.protocol + "//" + window.location.hostname + port, "");
-      path += "&target_blank=" + (parent_node.target == "_blank" ? "true" : "false");
+      if (dialogType != WYMeditor.DIALOG_PASTE && dialogType != WYMeditor.DIALOG_TABLE) {
+        path += path.indexOf("?") == -1 ? "?" : "&";
+        port = (window.location.port.length > 0 ? (":" + window.location.port) : "");
+        path += "current_link=" + parent_node.href.replace(window.location.protocol + "//" + window.location.hostname + port, "");
+        path += "&target_blank=" + (parent_node.target == "_blank" ? "true" : "false");
+      }
     }
   }
 
@@ -1311,7 +1353,7 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
   dialog_title = wym.replaceStrings(wym.encloseString( dialogType ));
   dialog_container = $("<div id='" + wym._options.dialogId + "' class='editor_dialog'></div>");
   switch(dialogType) {
-    case WYMeditor.DIALOG_TABLE: {
+    case WYMeditor.DIALOG_TABLE:
       // create and open dialog
       dialog_container.html(wym.replaceStrings(wym._options.dialogTableHtml))
                       .dialog($.extend(wym._options.dialogInlineFeatures, {
@@ -1320,8 +1362,7 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
 
       ajax_loaded_callback();
       break;
-    }
-    case WYMeditor.DIALOG_PASTE: {
+    case WYMeditor.DIALOG_PASTE:
       dialog_container.html(wym.replaceStrings(wym._options.dialogPasteHtml))
                       .dialog($.extend(wym._options.dialogInlineFeatures, {
                                         title: dialog_title
@@ -1329,15 +1370,12 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
 
       ajax_loaded_callback();
       break;
-    }
     default:
-    {
       $("<img id='dialog_loading' src='/images/refinery/dialogLoadingAnimation.gif' width='208' height='13' />").appendTo(dialog_container);
       dialog_container.dialog($.extend(wym._options.dialogFeatures, {
         title: dialog_title
       })).load(path, ajax_loaded_callback);
       break;
-    }
   }
 
 };
@@ -1380,7 +1418,7 @@ WYMeditor.editor.prototype.paste = function(sData) {
   wym.format_block();
 
   var sTmp;
-  replaceable = $(wym._doc.body).find('#replace_me_with_' + wym._current_unique_stamp);
+  replaceable = $(wym._doc.body).find('#' + wym._current_unique_stamp);
 
   // replaceable doesn't actually get replaced here, it's just used as a marker for where the cursor was.
   container = replaceable.get(0) || this.selected();
@@ -1402,11 +1440,11 @@ WYMeditor.editor.prototype.paste = function(sData) {
         // Only if we placed more items after it (aP.length)
         if (aP.length > 1
             && $(container).get(0).tagName.toLowerCase() == "span"
-            && $(container).attr('id') == ('replace_me_with_' + wym._current_unique_stamp)
+            && $(container).attr('id') == ('' + wym._current_unique_stamp)
             && $(container).parent().get(0).tagName.toLowerCase() == "p")
         {
           p = $(container).parent();
-          matches = p.html().match(new RegExp("([\\s\\S]*)\<span id=[\'|\"]replace_me_with_" + wym._current_unique_stamp + "[\'|\"]\>.*\<\/span\>"));
+          matches = p.html().match(new RegExp("([\\s\\S]*)\<span id=[\'|\"]" + wym._current_unique_stamp + "[\'|\"]\>.*\<\/span\>"));
           sTmp = matches[1] + sTmp + $(container).html();
           p.html(sTmp);
           if (insertedContentAfterBreak != null && insertedContentAfterBreak.length > 0) {
@@ -1425,7 +1463,7 @@ WYMeditor.editor.prototype.paste = function(sData) {
         }
       } else {
         if ((aP.length -1) == x) {
-          contentAfterBreak = $(container).parent().html().match(new RegExp("\<span id=[\'|\"]replace_me_with_" + wym._current_unique_stamp + "[\'|\"]\>.*\<\/span\>([\\s\\S]*)"))[1].split('</p>')[0];
+          contentAfterBreak = $(container).parent().html().match(new RegExp("\<span id=[\'|\"]" + wym._current_unique_stamp + "[\'|\"]\>.*\<\/span\>([\\s\\S]*)"))[1].split('</p>')[0];
           sTmp = "<p id='last_paste'>" + sTmp + "</p>";
         } else {
           sTmp = "<p>" + sTmp + "</p>";
@@ -1501,14 +1539,14 @@ WYMeditor.editor.prototype.setFocusToNode = function(node, toStart) {
   selection.addRange(range);
   selection.collapse(node, toStart);
   this._iframe.contentWindow.focus();
-}
+};
 
 WYMeditor.editor.prototype.addCssRules = function(doc, aCss) {
   var styles = doc.styleSheets[0];
   if(styles) {
     for(var i = 0; i < aCss.length; i++) {
       var oCss = aCss[i];
-      if(oCss.name && oCss.css) this.addCssRule(styles, oCss);
+      if(oCss.name && oCss.css) { this.addCssRule(styles, oCss); }
     }
   }
 };
@@ -1517,7 +1555,6 @@ WYMeditor.editor.prototype.format_block = function(selected) {
 
   //'this' should be the wymeditor instance.
   var wym = this;
-
   var container = selected || wym.selected() || $(wym._iframe).contents().find('body').get(0);
   var name = container.tagName.toLowerCase();
 
@@ -1604,8 +1641,8 @@ WYMeditor.editor.prototype.mousedown = function(e) {
   var wym = WYMeditor.INSTANCES[this.ownerDocument.title];
   wym._selected_image = (e.target.tagName.toLowerCase() == WYMeditor.IMG) ? e.target : null;
   $(wym._iframe).contents().find('.selected_by_wym').removeClass('selected_by_wym');
-  if (!$.browser.mozilla) $(wym._selected_image).addClass('selected_by_wym');
-  if (!$.browser.webkit) e.stopPropagation();
+  if (!$.browser.mozilla) { $(wym._selected_image).addClass('selected_by_wym'); }
+  if (!$.browser.webkit) { e.stopPropagation(); }
 };
 
 /********** SKINS **********/
@@ -1676,13 +1713,13 @@ WYMeditor.INIT_DIALOG = function(wym, selected, isIframe) {
   if (wym._selected_image) {
     var replaceable = $(wym._selected_image);
   } else {
-    var replaceable = $(wym._doc.body).find('#replace_me_with_' + wym._current_unique_stamp);
+    var replaceable = $(wym._doc.body).find('#' + wym._current_unique_stamp);
   }
 
   // focus first textarea or input type text element
   dialog.find('input[type=text], textarea').first().focus();
 
-  dialog.find(".close_dialog").click(function(e){
+  doc.find('body').addClass('wym_iframe_body').find('#cancel_button').add(dialog.find('.close_dialog')).click(function(e){
     wym.close_dialog(e, true);
   });
 
@@ -1706,11 +1743,9 @@ WYMeditor.INIT_DIALOG = function(wym, selected, isIframe) {
         {
           // ensure some attributes are copied across to the new link.
           link.attr({'style': replaceable.attr('style'), 'class': replaceable.attr('class')});
-          replaceable.after(link);
-          link.html(replaceable.html());
 
-          // now we can get rid of the replaceable element.
-          replaceable.remove();
+          link.html(replaceable.html());
+          replaceable.replaceWith($('<div/>').append(link).html());
         }
         else
         {
@@ -1764,7 +1799,13 @@ WYMeditor.INIT_DIALOG = function(wym, selected, isIframe) {
         .attr(WYMeditor.SRC, url)
         .attr(WYMeditor.TITLE, form.find(wym._options.titleSelector).val())
         .attr(WYMeditor.ALT, form.find(wym._options.titleSelector).val())
-        .attr(WYMeditor.REL, form.find(wym._options.sizeSelector).val());
+        .attr(WYMeditor.REL, form.find(wym._options.sizeSelector).val())
+        .load(function(e){
+          $(this).attr({
+            'width': $(this).width()
+            , 'height': $(this).height()
+          });
+        });
 
        if (replaceable != null) {
          replaceable.after(image).remove();
@@ -1816,11 +1857,12 @@ WYMeditor.editor.prototype.close_dialog = function(e, cancelled) {
   if (cancelled)
   {
     // if replaceable exists, replace it with its own html contents.
-    if ((span = $(this._doc.body).find('span#replace_me_with_' + this._current_unique_stamp)).length > 0) {
+    if ((span = $(this._doc.body).find('span#' + this._current_unique_stamp)).length > 0) {
       span.parent().html(span.parent().html().replace(new RegExp(["<span(.+?)", span.attr('id'), "(.+?)<\/span>"].join("")), span.html()));
     }
-    (remove_id = $(this._doc.body).find('#replace_me_with_' + this._current_unique_stamp)).attr('id', (remove_id.attr('_id_before_replaceable') || ""));
-
+    (remove_id = $(this._doc.body).find('#' + this._current_unique_stamp))
+      .attr('id', (remove_id.attr('_id_before_replaceable') || ""))
+      .replaceWith(remove_id.html());
     if (this._undo_on_cancel == true) {
       this._exec("undo");
     }
@@ -1842,7 +1884,7 @@ WYMeditor.editor.prototype.close_dialog = function(e, cancelled) {
   if (e) {
     e.preventDefault();
   }
-}
+};
 
 /********** XHTML LEXER/PARSER **********/
 
@@ -4178,6 +4220,25 @@ WYMeditor.WymClassExplorer = function(wym) {
 
 };
 
+WYMeditor.WymClassExplorer.prototype.format_block = function(selected) {
+
+  //'this' should be the wymeditor instance.
+  var wym = this;
+  var container = selected || wym.selected() || $(wym._iframe).contents().find('body').get(0);
+  var name = container.tagName.toLowerCase();
+
+  //fix forbidden main containers
+  if($.inArray(name, ['strong', 'b', 'em', 'i', 'sub', 'sup', 'a']) > -1) {
+    name = container.parentNode.tagName.toLowerCase();
+  }
+
+  if(name == WYMeditor.BODY) {
+    wym._selected_image = null;
+    $(wym._iframe).contents().find('.selected_by_wym').removeClass('selected_by_wym');
+    wym._exec(WYMeditor.FORMAT_BLOCK, "<" + WYMeditor.P + ">");
+  }
+};
+
 WYMeditor.WymClassExplorer.prototype.initIframe = function(iframe) {
 
     //This function is executed twice, though it is called once!
@@ -4340,13 +4401,16 @@ WYMeditor.WymClassExplorer.prototype.unwrap = function() {
 };
 
 //keyup handler
-WYMeditor.WymClassExplorer.prototype.keyup = function() {
-  this._selected_image = null;
-  $(this._iframe).contents().find('.selected_by_wym').removeClass('selected_by_wym');
+WYMeditor.WymClassExplorer.prototype.keyup = function(e) {
+
+  (wym = this)._selected_image = null;
+  $(wym._iframe).contents().find('.selected_by_wym').removeClass('selected_by_wym');
+  wym.format_block();
 };
 
 WYMeditor.WymClassExplorer.prototype.setFocusToNode = function(node, toStart) {
-  var range = this._doc.selection.createRange();
+  (wym = this)._iframe.contentWindow.focus();
+  var range = wym._doc.selection.createRange();
   toStart = toStart ? true : false;
 
   range.moveToElementText(node);
@@ -4832,54 +4896,6 @@ WYMeditor.WymClassSafari.prototype.initIframe = function(iframe) {
     this.listen();
 };
 
-WYMeditor.WymClassSafari.prototype.paste = function(sData) {
-
-  (wym = this).format_block();
-  replaceable = $(wym._doc.body).find('#replace_me_with_' + wym._current_unique_stamp);
-
-  // replaceable doesn't actually get replaced here, it's just used as a marker for where the cursor was.
-  var container = replaceable.get(0) || this.selected();
-
-  //split the data, using double newlines as the separator
-  var aP = sData.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
-            .split(wym._newLine + wym._newLine);
-  var rExp = new RegExp(wym._newLine, "g");
-
-  //add a P for each item
-  var sTmp;
-  if(container && container.tagName.toLowerCase() != WYMeditor.BODY) {
-    for(x = aP.length - 1; x >= 0; x--) {
-      sTmp = aP[x];
-      //simple newlines are replaced by a break
-      sTmp = sTmp.replace(rExp, "<br />");
-      if (x == 0 && $(container).html().replace(/<br\ ?\/?>/, "").length == 0) {
-        $(container).html(sTmp);
-      }
-      else {
-        $(container).after("<p>" + sTmp + "</p>");
-      }
-    }
-  }
-
-  else {
-    for(x = 0; x < aP.length; x++) {
-      sTmp = aP[x];
-      //simple newlines are replaced by a break
-      sTmp = sTmp.replace(rExp, "<br />");
-      if (x == 0 && $(container).html().replace(/<br\ ?\/?>/, "").length == 0) {
-        $(container).html(sTmp);
-      } else {
-        $(wym._doc.body).append("<p>" + sTmp + "</p>");
-      }
-    }
-  }
-
-  if (replaceable.get(0) != null) {
-    // set the id of the container back.
-    replaceable.get(0).id = replaceable.get(0)._id_before_replaceable;
-  }
-};
-
 WYMeditor.WymClassSafari.prototype._exec = function(cmd,param) {
 
     if(!this.selected()) return(false);
@@ -4964,9 +4980,9 @@ WYMeditor.WymClassSafari.prototype.selected = function(upgrade_text_nodes) {
           return node.parentNode;
         }
       }
-      else return(node);
+      else { return(node); }
   }
-  else return(null);
+  else { return(null); }
 };
 
 /* @name toggleClass
@@ -5046,15 +5062,15 @@ WYMeditor.WymClassSafari.prototype.keyup = function(e) {
     //text nodes replaced by P
 
     container = wym.selected();
-    var name = container.tagName.toLowerCase();
-
-    //fix forbidden main containers
-    if($.inArray(name, ['strong', 'b', 'em', 'i', 'sub', 'sup', 'a', 'span']) > -1) {
-      name = container.parentNode.tagName.toLowerCase();
-    }
+    if (container && (name = container.tagName.toLowerCase())) {
+      //fix forbidden main containers
+      if($.inArray(name, ['strong', 'b', 'em', 'i', 'sub', 'sup', 'a', 'span']) > -1) {
+        name = container.parentNode.tagName.toLowerCase();
+      }
 
-    if(name == WYMeditor.BODY || name == WYMeditor.DIV) {
-      wym._exec(WYMeditor.FORMAT_BLOCK, WYMeditor.P); //fix #110 for DIV
+      if(name == WYMeditor.BODY || name == WYMeditor.DIV) {
+        wym._exec(WYMeditor.FORMAT_BLOCK, WYMeditor.P); //fix #110 for DIV
+      }
     }
   }
 };