mercury-rails 0.2.0 → 0.2.3

data/vendor/assets/javascripts/mercury/lightview.js.coffee

@@ -27,6 +27,8 @@ jQuery.extend Mercury.lightview, {
     @overlay = jQuery('<div>', {class: 'mercury-lightview-overlay'})
 
     @titleElement = @element.find('.mercury-lightview-title')
+    @titleElement.append('<a class="mercury-lightview-close"></a>') if @options.closeButton
+
     @contentElement = @element.find('.mercury-lightview-content')
 
     @element.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
@@ -39,7 +41,8 @@ jQuery.extend Mercury.lightview, {
     Mercury.bind 'refresh', => @resize(true)
     Mercury.bind 'resize', => @position() if @visible
 
-    @overlay.click => @hide()
+    @overlay.click => @hide() unless @options.closeButton
+    @titleElement.find('.mercury-lightview-close').click => @hide()
 
     jQuery(document).bind 'keydown', (event) =>
        @hide() if event.keyCode == 27 && @visible
@@ -52,7 +55,7 @@ jQuery.extend Mercury.lightview, {
     @overlay.animate {opacity: 1}, 200, 'easeInOutSine', =>
       @setTitle()
       @element.show().css({opacity: 0})
-      @element.animate {opacity: 1}, 200, 'easeInOutSine', =>
+      @element.stop().animate {opacity: 1}, 200, 'easeInOutSine', =>
         @visible = true
         @load()
 

data/vendor/assets/javascripts/mercury/mercury.js.coffee

@@ -1,9 +1,10 @@
 # ## Require all the dependencies
-#= require mercury_dependencies/jquery-1.6
-#= require mercury_dependencies/jquery-ui-1.8.13.custom
-#= require mercury_dependencies/jquery.additions
-#= require mercury_dependencies/liquidmetal
-#= require mercury_dependencies/showdown
+#= require mercury/dependencies/jquery-1.6
+#= require mercury/dependencies/jquery-ui-1.8.13.custom
+#= require mercury/dependencies/jquery.additions
+#= require mercury/dependencies/jquery.htmlClean
+#= require mercury/dependencies/liquidmetal
+#= require mercury/dependencies/showdown
 #
 # ## Require all mercury files
 #= require_self
@@ -33,7 +34,7 @@
 #
 @Mercury ||= {}
 jQuery.extend @Mercury, {
-  version: '0.2.0'
+  version: '0.2.3'
 
   # No IE support yet because it doesn't follow the W3C standards for HTML5 contentEditable (aka designMode).
   supported: document.getElementById && document.designMode && !jQuery.browser.konqueror && !jQuery.browser.msie
@@ -47,12 +48,12 @@ jQuery.extend @Mercury, {
 
   # Custom event and logging methods
   bind: (eventName, callback) ->
-    jQuery(document).bind("mercury:#{eventName}", callback)
+    jQuery(top).bind("mercury:#{eventName}", callback)
 
 
   trigger: (eventName, options) ->
     Mercury.log(eventName, options)
-    jQuery(document).trigger("mercury:#{eventName}", options)
+    jQuery(top).trigger("mercury:#{eventName}", options)
 
 
   log: ->

data/vendor/assets/javascripts/mercury/modals/htmleditor.js.coffee

@@ -1,6 +1,8 @@
 @Mercury.modalHandlers.htmlEditor = ->
   # fill the text area with the content
-  @element.find('textarea').val(Mercury.region.content(null, true, false))
+  content = Mercury.region.content(null, true, false)
+#  content = jQuery.htmlClean(content, {format: true, replace: [], allowedClasses: ['mercury-snippet']})
+  @element.find('textarea').val(content)
 
   # replace the contents on form submit
   @element.find('form').submit (event) =>

data/vendor/assets/javascripts/mercury/modals/inserttable.js.coffee

@@ -5,7 +5,7 @@
   table.click (event) =>
     cell = jQuery(event.target)
     table = cell.closest('table')
-    table.find('.selected').removeClass('selected')
+    table.find('.selected').removeAttr('class')
     cell.addClass('selected')
     Mercury.tableEditor(table, cell, ' ')
 
@@ -44,7 +44,7 @@
   # build the table on form submission
   @element.find('form').submit (event) =>
     event.preventDefault()
-    table.find('.selected').removeClass('selected')
+    table.find('.selected').removeAttr('class')
     table.find('td, th').html(' ')
 
     html = jQuery('<div>').html(table).html()

data/vendor/assets/javascripts/mercury/native_extensions.js.coffee

@@ -9,23 +9,6 @@ String::toHex = ->
     "##{parseInt(r).toHex()}#{parseInt(g).toHex()}#{parseInt(b).toHex()}"
 
 
-String::singleDiff = (that) ->
-  diff = ''
-  for char, index in that
-    break if char == 'each'
-    if char != @[index]
-      re = new RegExp(@substr(index).regExpEscape().replace(/^\s+|^( )+/g, '') + '$', 'm')
-      diff = that.substr(index).replace(re, '')
-      break
-  return diff
-
-
-String::regExpEscape = ->
-  specials = ['/','.','*','+','?','|','(',')','[',']','{','}','\\']
-  escaped = new RegExp('(\\' + specials.join('|\\') + ')', 'g')
-  return @replace(escaped, '\\$1')
-
-
 String::sanitizeHTML = ->
   element = jQuery('<div>').html(@.toString())
   element.find('style').remove()
@@ -46,3 +29,9 @@ Number::toBytes = ->
     bytes /= 1024
     i += 1
   return if i then "#{bytes.toFixed(2)}#{['', ' kb', ' Mb', ' Gb', ' Tb', ' Pb', ' Eb'][i]}" else "#{bytes} bytes"
+
+
+# make setTimeout not suck for coffeescript
+window.originalSetTimeout = window.setTimeout
+window.setTimeout = (arg1, arg2) ->
+  if typeof(arg1) == 'number' then window.originalSetTimeout(arg2, arg1) else window.originalSetTimeout(arg1, arg2)

data/vendor/assets/javascripts/mercury/page_editor.js.coffee

@@ -2,6 +2,8 @@ class @Mercury.PageEditor
 
   # options
   # saveStyle: 'form', or 'json' (defaults to json)
+  # saveDataType: 'xml', 'json', 'jsonp', 'script', 'text', 'html' (defaults to json)
+  # saveMethod: 'POST', or 'PUT', create or update actions on save (defaults to POST)
   # visible: boolean, if the interface should start visible or not (defaults to true)
   constructor: (@saveUrl = null, @options = {}) ->
     throw "Mercury.PageEditor is unsupported in this client. Supported browsers are chrome 10+, firefix 4+, and safari 5+." unless Mercury.supported
@@ -17,8 +19,9 @@ class @Mercury.PageEditor
 
 
   initializeInterface: ->
-    @focusableElement = jQuery('<input>', {type: 'text', style: 'position:absolute;opacity:0'}).appendTo(@options.appendTo ? 'body')
-    @iframe = jQuery('<iframe>', {class: 'mercury-iframe', seamless: 'true', frameborder: '0', src: 'about:blank', style: 'position:absolute;top:0;width:100%;visibility:hidden'})
+    @focusableElement = jQuery('<input>', {class: 'mercury-focusable', type: 'text'}).appendTo(@options.appendTo ? 'body')
+
+    @iframe = jQuery('<iframe>', {id: 'mercury_iframe', class: 'mercury-iframe', seamless: 'true', frameborder: '0', src: 'about:blank'})
     @iframe.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
 
     @iframe.load => @initializeFrame()
@@ -32,8 +35,10 @@ class @Mercury.PageEditor
     try
       return if @iframe.data('loaded')
       @iframe.data('loaded', true)
+      alert("Opera isn't a fully supported browser, your results may not be optimal.") if jQuery.browser.opera
       @document = jQuery(@iframe.get(0).contentWindow.document)
-      jQuery("<style mercury-styles=\"true\">").html(Mercury.config.injectedStyles).appendTo(@document.find('head'))
+      stylesToInject = Mercury.config.injectedStyles.replace(/{{regionClass}}/g, Mercury.config.regionClass)
+      jQuery("<style mercury-styles=\"true\">").html(stylesToInject).appendTo(@document.find('head'))
 
       # jquery: make jQuery evaluate scripts within the context of the iframe window -- note that this means that we
       # can't use eval in mercury (eg. script tags in ajax responses) because it will eval in the wrong context (you can
@@ -41,13 +46,18 @@ class @Mercury.PageEditor
       # todo: look into `context` options for ajax as an alternative
       iframeWindow = @iframe.get(0).contentWindow
       jQuery.globalEval = (data) -> (iframeWindow.execScript || (data) -> iframeWindow["eval"].call(iframeWindow, data))(data) if (data && /\S/.test(data))
+
       iframeWindow.Mercury = Mercury
+      iframeWindow.History = History if window.History && History.Adapter
 
       @bindEvents()
       @resize()
       @initializeRegions()
       @finalizeInterface()
       Mercury.trigger('ready')
+      jQuery(iframeWindow).trigger('mercury:ready')
+      iframeWindow.Event.fire(iframeWindow, 'mercury:ready') if iframeWindow.Event && iframeWindow.Event.fire
+      iframeWindow.onMercuryReady() if iframeWindow.onMercuryReady
 
       @iframe.css({visibility: 'visible'})
     catch error
@@ -55,7 +65,7 @@ class @Mercury.PageEditor
 
 
   initializeRegions: ->
-    @buildRegion(jQuery(region)) for region in jQuery('.mercury-region', @document)
+    @buildRegion(jQuery(region)) for region in jQuery(".#{Mercury.config.regionClass}", @document)
     return unless @options.visible
     for region in @regions
       if region.focus
@@ -73,6 +83,9 @@ class @Mercury.PageEditor
 
 
   finalizeInterface: ->
+    @santizerElement = jQuery('<div>', {id: 'mercury_sanitizer', contenteditable: 'true', style: 'position:fixed;width:100px;height:100px;top:-100px;left:-100px;opacity:0'})
+    @santizerElement.appendTo(@options.appendTo ? @document.find('body'))
+
     @snippetToolbar = new Mercury.SnippetToolbar(@document)
 
     @hijackLinksAndForms()
@@ -92,7 +105,7 @@ class @Mercury.PageEditor
     @document.mousedown (event) ->
       Mercury.trigger('hide:dialogs')
       if Mercury.region
-        Mercury.trigger('unfocus:regions') unless jQuery(event.target).closest('.mercury-region').get(0) == Mercury.region.element.get(0)
+        Mercury.trigger('unfocus:regions') unless jQuery(event.target).closest(".#{Mercury.config.regionClass}").get(0) == Mercury.region.element.get(0)
 
     jQuery(window).resize => @resize()
     window.onbeforeunload = @beforeUnload
@@ -138,7 +151,7 @@ class @Mercury.PageEditor
         if jQuery(element).hasClass(classname)
           ignored = true
           continue
-      if !ignored && (element.target == '' || element.target == '_self') && !jQuery(element).closest('.mercury-region').length
+      if !ignored && (element.target == '' || element.target == '_self') && !jQuery(element).closest(".#{Mercury.config.regionClass}").length
         jQuery(element).attr('target', '_top')
 
 
@@ -148,15 +161,23 @@ class @Mercury.PageEditor
     return null
 
 
+  getRegionByName: (id) ->
+    for region in @regions
+      return region if region.name == id
+    return null
+
+
   save: ->
     url = @saveUrl ? Mercury.saveURL ? @iframeSrc()
     data = @serialize()
     Mercury.log('saving', data)
     data = jQuery.toJSON(data) unless @options.saveStyle == 'form'
+    method = 'PUT' if @options.saveMethod == 'PUT'
     jQuery.ajax url, {
-      type: 'POST'
+      type: method || 'POST'
+      dataType: @options.saveDataType || 'json'
       headers: @saveHeaders()
-      data: {content: data}
+      data: {content: data, _method: method}
       success: =>
         Mercury.changes = false
       error: =>

data/vendor/assets/javascripts/mercury/plugins/save_as_xml/mercury/page_editor.js.coffee

@@ -0,0 +1,27 @@
+class Mercury.PageEditor extends Mercury.PageEditor
+
+  save: ->
+    url = @saveUrl ? Mercury.saveURL ? @iframeSrc()
+    data = @serializeAsXml()
+    console.log('saving', data)
+    return
+    method = 'PUT' if @options.saveMethod == 'PUT'
+    jQuery.ajax url, {
+      type: method || 'POST'
+      dataType: 'xml'
+      data: data
+      success: =>
+        Mercury.changes = false
+      error: =>
+        alert("Mercury was unable to save to the url: #{url}")
+    }
+
+  serializeAsXml: ->
+    data = @serialize()
+    regionNodes = []
+    for regionName, regionProperties of data
+      snippetNodes = []
+      for snippetName, snippetProperties of regionProperties['snippets']
+        snippetNodes.push("<#{snippetName} name=\"#{snippetProperties['name']}\"><![CDATA[#{jQuery.toJSON(snippetProperties['options'])}]]></#{snippetName}>")
+      regionNodes.push("<region name=\"#{regionName}\" type=\"#{regionProperties['type']}\"><value>\n<![CDATA[#{regionProperties['value']}]]>\n</value><snippets>#{snippetNodes.join('')}</snippets></region>")
+    return "<regions>#{regionNodes.join('')}</regions>"

data/vendor/assets/javascripts/mercury/plugins/save_as_xml/plugin.js

@@ -0,0 +1,9 @@
+/*!
+ * This is an example plugin that will serialize to XML instead of JSON before saving.  This could be useful to someone,
+ * but is mostly provided as an example of how to write a simple plugin.
+ *
+ * This file is could be a nice place to provide configuration options for your plugin.
+ *
+ *= require_self
+ *= require_tree ./mercury
+ */

data/vendor/assets/javascripts/mercury/region.js.coffee

@@ -66,11 +66,11 @@ class @Mercury.Region
   togglePreview: ->
     if @previewing
       @previewing = false
-      @element.addClass('mercury-region').removeClass('mercury-region-preview')
+      @element.addClass(Mercury.config.regionClass).removeClass("#{Mercury.config.regionClass}-preview")
       @focus() if Mercury.region == @
     else
       @previewing = true
-      @element.addClass('mercury-region-preview').removeClass('mercury-region')
+      @element.addClass("#{Mercury.config.regionClass}-preview").removeClass(Mercury.config.regionClass)
       Mercury.trigger('region:blurred', {region: @})
 
 

data/vendor/assets/javascripts/mercury/regions/editable.js.coffee

@@ -28,11 +28,14 @@ class @Mercury.Regions.Editable extends Mercury.Region
 
     # add the basic editor settings to the document (only once)
     unless @document.mercuryEditing
-      @document.execCommand('styleWithCSS', false, false)
-      @document.execCommand('insertBROnReturn', false, true)
-      @document.execCommand('enableInlineTableEditing', false, false)
-      @document.execCommand('enableObjectResizing', false, false)
       @document.mercuryEditing = true
+      try
+        @document.execCommand('styleWithCSS', false, false)
+        @document.execCommand('insertBROnReturn', false, true)
+        @document.execCommand('enableInlineTableEditing', false, false)
+        @document.execCommand('enableObjectResizing', false, false)
+      catch e
+        # intentionally do nothing if any of these fail, to broaden support for Opera
 
 
   bindEvents: ->
@@ -85,7 +88,7 @@ class @Mercury.Regions.Editable extends Mercury.Region
     # isn't handled (eg, putting the image where it was dropped,) so to allow the browser to do it's thing, and also do
     # our thing we have this little hack.  *sigh*
     # read: http://www.quirksmode.org/blog/archives/2009/09/the_html5_drag.html
-    @element.bind 'possible:drop', (event) =>
+    @element.bind 'possible:drop', =>
       return if @previewing
       if snippet = @element.find('img[data-snippet]').get(0)
         @focus()
@@ -96,16 +99,15 @@ class @Mercury.Regions.Editable extends Mercury.Region
     # through a clipboard in firefox (heaven forbid), and to keep the behavior across all browsers, we manually detect
     # what was pasted by running a quick diff, removing it by calling undo, making our adjustments, and then putting the
     # content back.  This is possible, so it doesn't make sense why it wouldn't be exposed in a sensible way.  *sigh*
-    @element.bind 'paste', =>
+    @element.bind 'paste', (event) =>
       return if @previewing
       return unless Mercury.region == @
-      Mercury.changes = true
       if @specialContainer
         event.preventDefault()
         return
-      content = @content()
-      clearTimeout(@handlePasteTimeout)
-      @handlePasteTimeout = setTimeout((=> @handlePaste(content)), 100)
+      return if @pasting
+      Mercury.changes = true
+      @handlePaste(event.originalEvent)
 
     @element.focus =>
       return if @previewing
@@ -144,25 +146,27 @@ class @Mercury.Regions.Editable extends Mercury.Region
           return
 
         when 13 # enter
-          if jQuery.browser.webkit && @selection().commonAncestor().closest('li, ul', @element).length == 0
+          if jQuery.browser.webkit && @selection().commonAncestor().closest('li, ul, ol', @element).length == 0
             event.preventDefault()
-            @document.execCommand('insertLineBreak', false, null)
-          else if @specialContainer
-            # mozilla: pressing enter in any elemeny besides a div handles strangely
+            @document.execCommand('insertParagraph', false, null)
+          else if @specialContainer || jQuery.browser.opera
+            # mozilla: pressing enter in any element besides a div handles strangely
             event.preventDefault()
             @document.execCommand('insertHTML', false, '<br/>')
 
         when 9 # tab
           event.preventDefault()
           container = @selection().commonAncestor()
-          handled = false
 
           # indent when inside of an li
           if container.closest('li', @element).length
-            handled = true
-            if event.shiftKey then @execCommand('outdent') else @execCommand('indent')
-
-          @execCommand('insertHTML', {value: '&nbsp; '}) unless handled
+            unless event.shiftKey
+              @execCommand('indent')
+            # do not outdent on last ul/ol parent, or we break out of the list
+            else if container.parents('ul, ol').length > 1
+              @execCommand('outdent')
+          else
+            @execCommand('insertHTML', {value: '&nbsp; '})
 
       if event.metaKey
         switch event.keyCode
@@ -320,78 +324,69 @@ class @Mercury.Regions.Editable extends Mercury.Region
     return element
 
 
-  handlePaste: (prePasteContent) ->
-    prePasteContent = prePasteContent.replace(/^\<br\>/, '')
-
-    # remove any regions that might have been pasted
-    @element.find('.mercury-region').remove()
-
-    # handle pasting from ms office etc
-    content = @content()
-    if content.indexOf('<!--StartFragment-->') > -1 || content.indexOf('="mso-') > -1 || content.indexOf('<o:') > -1 || content.indexOf('="Mso') > -1
-      # clean out all the tags from the pasted contents
-      cleaned = prePasteContent.singleDiff(@content()).sanitizeHTML()
-      try
-        # try to undo and put the cleaned html where the selection was
-        @document.execCommand('undo', false, null)
-        @execCommand('insertHTML', {value: cleaned})
-      catch error
-        # remove the pasted html and load up the cleaned contents into a modal
-        @content(prePasteContent)
-        Mercury.modal '/mercury/modals/sanitizer', {
-          title: 'HTML Sanitizer (Starring Clippy)',
-          afterLoad: -> @element.find('textarea').val(cleaned.replace(/<br\/>/g, '\n'))
-        }
-    else if Mercury.config.cleanStylesOnPaste
-      # strip styles
-      pasted = prePasteContent.singleDiff(@content())
-
-      container = jQuery('<div>').appendTo(@document.createDocumentFragment()).html(pasted)
-      container.find('[style]').attr({style: null})
+  handlePaste: (event) ->
+    # get the text content from the clipboard and fall back to using the sanitizer if unavailable
+    if Mercury.config.pasting.sanitize == 'text' && event.clipboardData
+      @execCommand('insertHTML', {value: event.clipboardData.getData('text/plain')})
+      event.preventDefault()
+      return
+    else
+      console.debug('testing')
+      # get current selection & range
+      selection = @selection()
+      selection.placeMarker()
+
+      sanitizer = jQuery('#mercury_sanitizer', @document).focus()
+
+      # set 1ms timeout to allow paste event to complete
+      setTimeout 1, =>
+        # sanitize the content
+        content = @sanitize(sanitizer)
+
+        # move cursor back to original element & position
+        selection.selectMarker(@element)
+        selection.removeMarker()
+
+        # paste sanitized content
+        @element.focus()
+        @execCommand('insertHTML', {value: content})
+
+
+  sanitize: (sanitizer) ->
+    # always remove nested regions
+    sanitizer.find(".#{Mercury.config.regionClass}").remove()
+
+    if Mercury.config.pasting.sanitize
+      switch Mercury.config.pasting.sanitize
+        when 'blacklist'
+          # todo: finish writing black list functionality
+          sanitizer.find('[style]').removeAttr('style')
+          sanitizer.find('[class="Apple-style-span"]').removeClass('Apple-style-span')
+          content = sanitizer.html()
+        when 'whitelist'
+          for element in sanitizer.find('*')
+            allowed = false
+            for allowedTag, allowedAttributes of Mercury.config.pasting.whitelist
+              if element.tagName.toLowerCase() == allowedTag.toLowerCase()
+                allowed = true
+                for attr, index in element.attributes
+                  jQuery(element).attr(attr.name, null) if attr && allowedAttributes.indexOf(attr.name) == -1
+                break
+            jQuery(element).replaceWith(jQuery(element).contents()) unless allowed
+          content = sanitizer.html()
+        else content = sanitizer.text()
+    else
+      # force text if it looks like it's from word/pages, even if there's no sanitizing requested
+      content = sanitizer.html()
+      if content.indexOf('<!--StartFragment-->') > -1 || content.indexOf('="mso-') > -1 || content.indexOf('<o:') > -1 || content.indexOf('="Mso') > -1
+        content = sanitizer.text()
 
-      @document.execCommand('undo', false, null)
-      @execCommand('insertHTML', {value: container.html()})
+    sanitizer.html('')
+    return content
 
 
   # Custom actions (eg. things that execCommand doesn't do, or doesn't do well)
   @actions: {
-#    bold: (selection) ->
-#      unless selection.collapsed
-#        @document.execCommand('bold', false, null)
-#      else
-##        selection.selectWordByCursor()
-##        @document.execCommand('bold', false, null)
-#
-#        selection.placeMarker()
-#        node = @element.find('.mercury-marker').get(0)
-#        prev = node.previousSibling
-#        selection.removeMarker()
-#        next = prev.nextSibling
-#        console.debug(prev, next)
-##        if prev.textContent[prev.textContent.length - 1] != ' ' &&
-
-
-#[some]| content
-# textContent = some, wholeText = some
-# textContent = '', wholeText = some
-#content |[some]
-#content [s|ome]
-#co|ntent [some]
-#|content [some]
-
-
-#
-#        console.debug(commonAncestor)
-#        beforeText = commonAncestor.textContent
-#        afterText = commonAncestor.wholeText.substring(commonAncestor.wholeText.lastIndexOf(beforeText) + beforeText.length, commonAncestor.wholeText.length)
-#        if beforeText && afterText && (beforeChar = beforeText[beforeText.length - 1]) != ' ' && (afterChar = afterText[0]) != ' '
-#          console.debug('bolding word', beforeChar, afterChar)
-#        else
-#          @document.execCommand('bold', false, null)
-#
-##          selection.selectWord()
-##      commonAncestor.wholeText, commonAncestor.textContent
-#      else
 
     insertRowBefore: -> Mercury.tableEditor.addRow('before')
 
@@ -417,6 +412,8 @@ class @Mercury.Regions.Editable extends Mercury.Region
 
     redo: -> @content(@history.redo())
 
+    horizontalRule: -> this.execCommand('insertHorizontalRule')
+
     removeFormatting: (selection) -> selection.insertTextNode(selection.textContent())
 
     backColor: (selection, options) -> selection.wrap("<span style=\"background-color:#{options.value.toHex()}\">", true)
@@ -490,7 +487,7 @@ class Mercury.Regions.Editable.Selection
 
   is: (elementType) ->
     content = @content()
-    return jQuery(content.firstChild) if content.childNodes.length == 1 && jQuery(content.firstChild).is(elementType)
+    return jQuery(content.firstChild) if jQuery(content).length == 1 && jQuery(content.firstChild).is(elementType)
     return false
 
 
@@ -498,18 +495,16 @@ class Mercury.Regions.Editable.Selection
     return unless jQuery.browser.webkit
     range = @context.createRange()
 
-    # todo: the \00 thing breaks when using uglifier, and is escapped to "0".. it's been fixed, but isn't available yet
-    # https://github.com/lautis/uglifier/issues/11
     if @range
       if @commonAncestor(true).closest('.mercury-snippet').length
-        lastChild = @context.createTextNode('\00') #\00
+        lastChild = @context.createTextNode('\00')
         element.appendChild(lastChild)
     else
       if element.lastChild && element.lastChild.nodeType == 3 && element.lastChild.textContent.replace(/^[\s+|\n+]|[\s+|\n+]$/, '') == ''
         lastChild = element.lastChild
-        element.lastChild.textContent = '\00' #\00
+        element.lastChild.textContent = '\00'
       else
-        lastChild = @context.createTextNode(' ') #\00
+        lastChild = @context.createTextNode('\00')
         element.appendChild(lastChild)
 
     if lastChild
@@ -582,7 +577,7 @@ class Mercury.Regions.Editable.Selection
     @selection.addRange(@range)
 
 
-  replace: (element) ->
+  replace: (element, collapse) ->
     element = element.get(0) if element.get
     element = jQuery(element, @context).get(0) if jQuery.type(element) == 'string'
 
@@ -590,3 +585,4 @@ class Mercury.Regions.Editable.Selection
     @range.insertNode(element)
     @range.selectNodeContents(element)
     @selection.addRange(@range)
+    @range.collapse(false) if collapse