mercury-rails 0.1.1 → 0.1.2

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

@@ -8,14 +8,14 @@ class @Mercury.Regions.Editable extends Mercury.Region
 
   build: ->
     # mozilla: set some initial content so everything works correctly
-    @html(' ') if $.browser.mozilla && @html() == ''
+    @content(' ') if jQuery.browser.mozilla && @content() == ''
 
     # set overflow just in case
     @element.data({originalOverflow: @element.css('overflow')})
     @element.css({overflow: 'auto'})
 
     # mozilla: there's some weird behavior when the element isn't a div
-    @specialContainer = $.browser.mozilla && @element.get(0).tagName != 'DIV'
+    @specialContainer = jQuery.browser.mozilla && @element.get(0).tagName != 'DIV'
 
     # make it editable
     # gecko: in this makes double clicking in textareas fail: https://bugzilla.mozilla.org/show_bug.cgi?id=490367
@@ -24,7 +24,7 @@ class @Mercury.Regions.Editable extends Mercury.Region
     # make all snippets not editable, and set their versions to 1
     for element in @element.find('.mercury-snippet')
       element.contentEditable = false
-      $(element).attr('data-version', '1')
+      jQuery(element).attr('data-version', '1')
 
     # add the basic editor settings to the document (only once)
     unless @document.mercuryEditing
@@ -46,7 +46,7 @@ class @Mercury.Regions.Editable extends Mercury.Region
       if currentElement.length
         # setup the table editor if we're inside a table
         table = currentElement.closest('table', @element)
-        Mercury.tableEditor(table, currentElement) if table.length
+        Mercury.tableEditor(table, currentElement.closest('tr, td')) if table.length
         # display a tooltip if we're in an anchor
         anchor = currentElement.closest('a', @element)
         if anchor.length && anchor.attr('href')
@@ -63,7 +63,7 @@ class @Mercury.Regions.Editable extends Mercury.Region
       return if @previewing
       event.preventDefault() if event.shiftKey
       event.originalEvent.dataTransfer.dropEffect = 'copy'
-      if $.browser.webkit
+      if jQuery.browser.webkit
         clearTimeout(@dropTimeout)
         @dropTimeout = setTimeout((=> @element.trigger('possible:drop')), 10)
 
@@ -89,7 +89,7 @@ class @Mercury.Regions.Editable extends Mercury.Region
       return if @previewing
       if snippet = @element.find('img[data-snippet]').get(0)
         @focus()
-        Mercury.Snippet.displayOptionsFor($(snippet).data('snippet'))
+        Mercury.Snippet.displayOptionsFor(jQuery(snippet).data('snippet'))
         @document.execCommand('undo', false, null)
 
     # custom paste handling: we have to do some hackery to get the pasted content since it's not exposed normally
@@ -100,9 +100,9 @@ class @Mercury.Regions.Editable extends Mercury.Region
       return if @previewing
       return unless Mercury.region == @
       Mercury.changes = true
-      html = @html()
+      content = @content()
       event.preventDefault() if @specialContainer
-      setTimeout((=> @handlePaste(html)), 1)
+      setTimeout((=> @handlePaste(content)), 1)
 
     @element.focus =>
       return if @previewing
@@ -116,14 +116,14 @@ class @Mercury.Regions.Editable extends Mercury.Region
       Mercury.tooltip.hide()
 
     @element.click (event) =>
-      $(event.target).closest('a').attr('target', '_top') if @previewing
+      jQuery(event.target).closest('a').attr('target', '_top') if @previewing
 
     @element.dblclick (event) =>
       return if @previewing
-      image = $(event.target).closest('img', @element)
+      image = jQuery(event.target).closest('img', @element)
       if image.length
         @selection().selectNode(image.get(0), true)
-        Mercury.trigger('button', {action: 'insertmedia'})
+        Mercury.trigger('button', {action: 'insertMedia'})
 
     @element.mouseup =>
       return if @previewing
@@ -134,7 +134,6 @@ class @Mercury.Regions.Editable extends Mercury.Region
       return if @previewing
       Mercury.changes = true
       switch event.keyCode
-
         when 90 # undo / redo
           return unless event.metaKey
           event.preventDefault()
@@ -142,9 +141,9 @@ class @Mercury.Regions.Editable extends Mercury.Region
           return
 
         when 13 # enter
-          if $.browser.webkit && @selection().commonAncestor().closest('li, ul', @element).length == 0
+          if jQuery.browser.webkit && @selection().commonAncestor().closest('li, ul', @element).length == 0
             event.preventDefault()
-            @document.execCommand('insertlinebreak', false, null)
+            @document.execCommand('insertLineBreak', false, null)
           else if @specialContainer
             # mozilla: pressing enter in any elemeny besides a div handles strangely
             event.preventDefault()
@@ -164,7 +163,6 @@ class @Mercury.Regions.Editable extends Mercury.Region
 
       if event.metaKey
         switch event.keyCode
-
           when 66 # b
             @execCommand('bold')
             event.preventDefault()
@@ -190,16 +188,16 @@ class @Mercury.Regions.Editable extends Mercury.Region
     Mercury.trigger('region:update', {region: @})
 
 
-  html: (value = null, filterSnippets = true, includeMarker = false) ->
+  content: (value = null, filterSnippets = true, includeMarker = false) ->
     if value != null
       # sanitize the html before we insert it
-      container = $('<div>').appendTo(@document.createDocumentFragment())
+      container = jQuery('<div>').appendTo(@document.createDocumentFragment())
       container.html(value)
 
       # fill in the snippet contents
       for element in container.find('[data-snippet]')
         element.contentEditable = false
-        element = $(element)
+        element = jQuery(element)
         if snippet = Mercury.Snippet.find(element.data('snippet'))
           unless element.data('version')
             try
@@ -225,24 +223,24 @@ class @Mercury.Regions.Editable extends Mercury.Region
         selection.placeMarker()
 
       # sanitize the html before we return it
-      container = $('<div>').appendTo(@document.createDocumentFragment())
+      container = jQuery('<div>').appendTo(@document.createDocumentFragment())
       container.html(@element.html().replace(/^\s+|\s+$/g, ''))
 
       # replace snippet contents to be an identifier
       if filterSnippets then for element, index in container.find('[data-snippet]')
-        element = $(element)
+        element = jQuery(element)
         if snippet = Mercury.Snippet.find(element.data("snippet"))
           snippet.data = element.html()
         element.html("[#{element.data("snippet")}/#{element.data("version")}]")
         element.attr({contenteditable: null, 'data-version': null})
 
       # get the html before removing the markers
-      html = container.html()
+      content = container.html()
 
       # remove the markers from the dom
       selection.removeMarker() if includeMarker
 
-      return html
+      return content
 
 
   togglePreview: ->
@@ -250,7 +248,7 @@ class @Mercury.Regions.Editable extends Mercury.Region
       @element.get(0).contentEditable = true
       @element.css({overflow: 'auto'})
     else
-      @html(@html())
+      @content(@content())
       @element.get(0).contentEditable = false
       @element.css({overflow: @element.data('originalOverflow')})
       @element.blur()
@@ -265,7 +263,7 @@ class @Mercury.Regions.Editable extends Mercury.Region
       handler.call(@, @selection(), options)
     else
       sibling = @element.get(0).previousSibling if action == 'indent'
-      options.value = $('<div>').html(options.value).html() if action == 'insertHTML' && options.value && options.value.get
+      options.value = jQuery('<div>').html(options.value).html() if action == 'insertHTML' && options.value && options.value.get
       try
         @document.execCommand(action, false, options.value)
       catch error
@@ -285,13 +283,13 @@ class @Mercury.Regions.Editable extends Mercury.Region
 
     # if the key code was return, delete, or backspace store now -- unless it was the same as last time
     if knownKeyCode >= 0 && knownKeyCode != @lastKnownKeyCode # || !keyCode
-      @history.push(@html(null, false, true))
+      @history.push(@content(null, false, true))
     else if keyCode
       # set a timeout for pushing to the history
-      @historyTimeout = setTimeout((=> @history.push(@html(null, false, true))), waitTime * 1000)
+      @historyTimeout = setTimeout((=> @history.push(@content(null, false, true))), waitTime * 1000)
     else
       # push to the history immediately
-      @history.push(@html(null, false, true))
+      @history.push(@content(null, false, true))
 
     @lastKnownKeyCode = knownKeyCode
 
@@ -315,33 +313,33 @@ class @Mercury.Regions.Editable extends Mercury.Region
     return element
 
 
-  handlePaste: (prePasteHTML) ->
-    prePasteHTML = prePasteHTML.replace(/^\<br\>/, '')
+  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
-    html = @html()
-    if html.indexOf('<!--StartFragment-->') > -1 || html.indexOf('="mso-') > -1 || html.indexOf('<o:') > -1 || html.indexOf('="Mso') > -1
+    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 = prePasteHTML.singleDiff(@html()).sanitizeHTML()
+      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
-        @html(prePasteHTML)
+        @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 = prePasteHTML.singleDiff(@html())
+      pasted = prePasteContent.singleDiff(@content())
 
-      container = $('<div>').appendTo(@document.createDocumentFragment()).html(pasted)
+      container = jQuery('<div>').appendTo(@document.createDocumentFragment()).html(pasted)
       container.find('[style]').attr({style: null})
 
       @document.execCommand('undo', false, null)
@@ -350,64 +348,64 @@ class @Mercury.Regions.Editable extends Mercury.Region
 
   # Custom actions (eg. things that execCommand doesn't do, or doesn't do well)
   @actions: {
-    insertrowbefore: -> Mercury.tableEditor.addRow('before')
+    insertRowBefore: -> Mercury.tableEditor.addRow('before')
 
-    insertrowafter: -> Mercury.tableEditor.addRow('after')
+    insertRowAfter: -> Mercury.tableEditor.addRow('after')
 
-    insertcolumnbefore: -> Mercury.tableEditor.addColumn('before')
+    insertColumnBefore: -> Mercury.tableEditor.addColumn('before')
 
-    insertcolumnafter: -> Mercury.tableEditor.addColumn('after')
+    insertColumnAfter: -> Mercury.tableEditor.addColumn('after')
 
-    deletecolumn: -> Mercury.tableEditor.removeColumn()
+    deleteColumn: -> Mercury.tableEditor.removeColumn()
 
-    deleterow: -> Mercury.tableEditor.removeRow()
+    deleteRow: -> Mercury.tableEditor.removeRow()
 
-    increasecolspan: -> Mercury.tableEditor.increaseColspan()
+    increaseColspan: -> Mercury.tableEditor.increaseColspan()
 
-    decreasecolspan: -> Mercury.tableEditor.decreaseColspan()
+    decreaseColspan: -> Mercury.tableEditor.decreaseColspan()
 
-    increaserowspan: -> Mercury.tableEditor.increaseRowspan()
+    increaseRowspan: -> Mercury.tableEditor.increaseRowspan()
 
-    decreaserowspan: -> Mercury.tableEditor.decreaseRowspan()
+    decreaseRowspan: -> Mercury.tableEditor.decreaseRowspan()
 
-    undo: -> @html(@history.undo())
+    undo: -> @content(@history.undo())
 
-    redo: -> @html(@history.redo())
+    redo: -> @content(@history.redo())
 
-    removeformatting: (selection) -> selection.insertTextNode(selection.textContent())
+    removeFormatting: (selection) -> selection.insertTextNode(selection.textContent())
 
-    backcolor: (selection, options) -> selection.wrap("<span style=\"background-color:#{options.value.toHex()}\">", true)
+    backColor: (selection, options) -> selection.wrap("<span style=\"background-color:#{options.value.toHex()}\">", true)
 
     overline: (selection) -> selection.wrap('<span style="text-decoration:overline">', true)
 
     style: (selection, options) -> selection.wrap("<span class=\"#{options.value}\">", true)
 
-    replaceHTML: (selection, options) -> @html(options.value)
+    replaceHTML: (selection, options) -> @content(options.value)
 
-    insertImage: (selection, options) -> @execCommand('insertHTML', {value: $('<img/>', options.value)})
+    insertImage: (selection, options) -> @execCommand('insertHTML', {value: jQuery('<img/>', options.value)})
 
     insertLink: (selection, options) ->
-      anchor = $("<#{options.value.tagName}>").attr(options.value.attrs).html(options.value.content)
+      anchor = jQuery("<#{options.value.tagName}>").attr(options.value.attrs).html(options.value.content)
       selection.insertNode(anchor)
 
     replaceLink: (selection, options) ->
-      anchor = $("<#{options.value.tagName}>").attr(options.value.attrs).html(options.value.content)
+      anchor = jQuery("<#{options.value.tagName}>").attr(options.value.attrs).html(options.value.content)
       selection.selectNode(options.node)
-      html = $('<div>').html(selection.content()).find('a').html()
-      selection.replace($(anchor, selection.context).html(html))
+      html = jQuery('<div>').html(selection.content()).find('a').html()
+      selection.replace(jQuery(anchor, selection.context).html(html))
 
-    insertsnippet: (selection, options) ->
+    insertSnippet: (selection, options) ->
       snippet = options.value
       if (existing = @element.find("[data-snippet=#{snippet.identity}]")).length
         selection.selectNode(existing.get(0))
       selection.insertNode(snippet.getHTML(@document))
 
-    editsnippet: ->
+    editSnippet: ->
       return unless @snippet
       snippet = Mercury.Snippet.find(@snippet.data('snippet'))
       snippet.displayOptions()
 
-    removesnippet: ->
+    removeSnippet: ->
       @snippet.remove() if @snippet
       Mercury.trigger('hide:toolbar', {type: 'snippet', immediately: true})
   }
@@ -427,11 +425,11 @@ class Mercury.Regions.Editable.Selection
     return null unless @range
     ancestor = @range.commonAncestorContainer
     ancestor = ancestor.parentNode if ancestor.nodeType == 3 && onlyTag
-    return $(ancestor)
+    return jQuery(ancestor)
 
 
   wrap: (element, replace = false) ->
-    element = $(element, @context).html(@fragment)
+    element = jQuery(element, @context).html(@fragment)
     @replace(element) if replace
     return element
 
@@ -446,24 +444,26 @@ class Mercury.Regions.Editable.Selection
 
   is: (elementType) ->
     content = @content()
-    return $(content.firstChild) if content.childNodes.length == 1 && $(content.firstChild).is(elementType)
+    return jQuery(content.firstChild) if content.childNodes.length == 1 && jQuery(content.firstChild).is(elementType)
     return false
 
 
   forceSelection: (element) ->
-    return unless $.browser.webkit
+    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')
+        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'
+        element.lastChild.textContent = ' ' #\00
       else
-        lastChild = @context.createTextNode('\00')
+        lastChild = @context.createTextNode(' ') #\00
         element.appendChild(lastChild)
 
     if lastChild
@@ -489,8 +489,8 @@ class Mercury.Regions.Editable.Selection
   placeMarker: ->
     return unless @range
 
-    @startMarker = $('<em class="mercury-marker"/>', @context).get(0)
-    @endMarker = $('<em class="mercury-marker"/>', @context).get(0)
+    @startMarker = jQuery('<em class="mercury-marker"/>', @context).get(0)
+    @endMarker = jQuery('<em class="mercury-marker"/>', @context).get(0)
 
     # put a single marker (the end)
     rangeEnd = @range.cloneRange()
@@ -508,8 +508,8 @@ class Mercury.Regions.Editable.Selection
 
 
   removeMarker: ->
-    $(@startMarker).remove()
-    $(@endMarker).remove()
+    jQuery(@startMarker).remove()
+    jQuery(@endMarker).remove()
 
 
   insertTextNode: (string) ->
@@ -522,7 +522,7 @@ class Mercury.Regions.Editable.Selection
 
   insertNode: (element) ->
     element = element.get(0) if element.get
-    element = $(element, @context).get(0) if $.type(element) == 'string'
+    element = jQuery(element, @context).get(0) if jQuery.type(element) == 'string'
 
     @range.deleteContents()
     @range.insertNode(element)
@@ -538,7 +538,7 @@ class Mercury.Regions.Editable.Selection
 
   replace: (element) ->
     element = element.get(0) if element.get
-    element = $(element, @context).get(0) if $.type(element) == 'string'
+    element = jQuery(element, @context).get(0) if jQuery.type(element) == 'string'
 
     @range.deleteContents()
     @range.insertNode(element)

data/app/assets/javascripts/mercury/regions/markupable.js.coffee

@@ -18,16 +18,19 @@ class @Mercury.Regions.Markupable extends Mercury.Region
     height = @element.height()
 
     value = @element.html().replace(/^\s+|\s+$/g, '')
-    @textarea = $('<textarea>', @document).val(value)
+    @textarea = jQuery('<textarea>', @document).val(value)
     @textarea.attr('class', @element.attr('class')).addClass('mercury-textarea')
     @textarea.css({border: 0, background: 'transparent', display: 'block', width: width, height: height, fontFamily: '"Courier New", Courier, monospace', fontSize: '14px'})
     @element.after(@textarea)
     @element.hide()
     @resize()
 
+    @previewElement = @element
+    @element = @textarea
+
 
   focus: ->
-    @textarea.focus()
+    @element.focus()
 
 
   bindEvents: ->
@@ -44,17 +47,24 @@ class @Mercury.Regions.Markupable extends Mercury.Region
       return unless Mercury.region == @
       @execCommand(options.action, options) if options.action
 
-    @textarea.bind 'dragenter', (event) =>
+    Mercury.bind 'unfocus:regions', (event) =>
+      return if @previewing
+      if Mercury.region == @
+        @element.blur()
+        @element.removeClass('focus')
+        Mercury.trigger('region:blurred', {region: @})
+
+    @element.bind 'dragenter', (event) =>
       return if @previewing
       event.preventDefault()
       event.originalEvent.dataTransfer.dropEffect = 'copy'
 
-    @textarea.bind 'dragover', (event) =>
+    @element.bind 'dragover', (event) =>
       return if @previewing
       event.preventDefault()
       event.originalEvent.dataTransfer.dropEffect = 'copy'
 
-    @textarea.bind 'drop', (event) =>
+    @element.bind 'drop', (event) =>
       return if @previewing
 
       # handle dropping snippets
@@ -69,26 +79,20 @@ class @Mercury.Regions.Markupable extends Mercury.Region
         @focus()
         Mercury.uploader(event.originalEvent.dataTransfer.files[0])
 
-    @textarea.focus =>
+    @element.focus =>
       return if @previewing
       Mercury.region = @
-      @textarea.addClass('focus')
+      @element.addClass('focus')
       Mercury.trigger('region:focused', {region: @})
 
-    @textarea.blur =>
-      return if @previewing
-      @textarea.removeClass('focus')
-      Mercury.trigger('region:blurred', {region: @})
-
-    @textarea.keydown (event) =>
+    @element.keydown (event) =>
       return if @previewing
       Mercury.changes = true
       @resize()
       switch event.keyCode
-
         when 13 # enter or return
           selection = @selection()
-          text = @textarea.val()
+          text = @element.val()
           start = text.lastIndexOf('\n', selection.start)
           end = text.indexOf('\n', selection.end)
           end = text.length if end < start
@@ -98,9 +102,7 @@ class @Mercury.Regions.Markupable extends Mercury.Region
             event.preventDefault()
           if /\d/.test(text[start + 1])
             lineText = text.substring(start, end)
-            console.debug(lineText)
             if /(\d+)\./.test(lineText)
-              console.debug(2)
               number = parseInt(RegExp.$1)
               selection.replace("\n#{number += 1}. ", false, true)
               event.preventDefault()
@@ -113,7 +115,6 @@ class @Mercury.Regions.Markupable extends Mercury.Region
 
       if event.metaKey
         switch event.keyCode
-
           when 66 # b
             @execCommand('bold')
             event.preventDefault()
@@ -128,34 +129,41 @@ class @Mercury.Regions.Markupable extends Mercury.Region
 
       @pushHistory(event.keyCode)
 
-    @textarea.keyup =>
+    @element.keyup =>
       return if @previewing
       Mercury.trigger('region:update', {region: @})
 
-    @element.click (event) =>
+    @element.mouseup =>
+      return if @previewing
+      @focus()
+      Mercury.trigger('region:focused', {region: @})
+
+    @previewElement.click (event) =>
       $(event.target).closest('a').attr('target', '_top') if @previewing
 
 
-  html: (value = null, filterSnippets = true) ->
+  content: (value = null, filterSnippets = true) ->
     if value != null
       if $.type(value) == 'string'
-        @textarea.val(value)
+        @element.val(value)
+      if jQuery.type(value) == 'string'
+        @element.val(value)
       else
-        @textarea.val(value.html)
+        @element.val(value.html)
         @selection().select(value.selection.start, value.selection.end)
     else
-      return @textarea.val()
+      return @element.val()
 
 
   togglePreview: ->
     if @previewing
-      @element.hide()
-      @textarea.show()
-    else
-      value = @converter.makeHtml(@textarea.val())
-      @element.html(value)
+      @previewElement.hide()
       @element.show()
-      @textarea.hide()
+    else
+      value = @converter.makeHtml(@element.val())
+      @previewElement.html(value)
+      @previewElement.show()
+      @element.hide()
     super
 
 
@@ -167,7 +175,7 @@ class @Mercury.Regions.Markupable extends Mercury.Region
 
 
   htmlAndSelection: ->
-    return {html: @html(null, false), selection: @selection().serialize()}
+    return {html: @content(null, false), selection: @selection().serialize()}
 
 
   pushHistory: (keyCode) ->
@@ -194,12 +202,13 @@ class @Mercury.Regions.Markupable extends Mercury.Region
 
 
   selection: ->
-    return new Mercury.Regions.Markupable.Selection(@textarea)
+    return new Mercury.Regions.Markupable.Selection(@element)
 
 
   resize: ->
-#    adjustedHeight = Math.max(@textarea.get(0).scrollHeight, @textarea.get(0).clientHeight)
-#    @textarea.height(adjustedHeight) if adjustedHeight >= @textarea.get(0).clientHeight
+    # todo: get this working if possible, and it seems to be useful
+    # adjustedHeight = Math.max(@textarea.get(0).scrollHeight, @textarea.get(0).clientHeight)
+    # @textarea.height(adjustedHeight) if adjustedHeight >= @textarea.get(0).clientHeight
 
 
   snippets: ->
@@ -208,13 +217,13 @@ class @Mercury.Regions.Markupable extends Mercury.Region
   # Actions
   @actions: {
 
-    undo: -> @html(@history.undo())
+    undo: -> @content(@history.undo())
 
-    redo: -> @html(@history.redo())
+    redo: -> @content(@history.redo())
 
     insertHTML: (selection, options) ->
       if options.value.get && element = options.value.get(0)
-        options.value = $('<div>').html(element).html()
+        options.value = jQuery('<div>').html(element).html()
       selection.replace(options.value, false, true)
 
     insertImage: (selection, options) ->
@@ -223,9 +232,9 @@ class @Mercury.Regions.Markupable extends Mercury.Region
     insertLink: (selection, options) ->
       selection.replace("[#{options.value.content}](#{options.value.attrs.href} 'optional title')", true)
 
-    insertunorderedlist: (selection) -> selection.addList('unordered')
+    insertUnorderedList: (selection) -> selection.addList('unordered')
 
-    insertorderedlist: (selection) -> selection.addList('ordered')
+    insertOrderedList: (selection) -> selection.addList('ordered')
 
     style: (selection, options) -> selection.wrap("<span class=\"#{options.value}\">", '</span>')
 
@@ -261,9 +270,9 @@ class @Mercury.Regions.Markupable extends Mercury.Region
     outdent: (selection) ->
       selection.unWrapLine('> ', '', false, true)
 
-    horizontalrule: (selection) -> selection.replace('\n- - -\n')
+    horizontalRule: (selection) -> selection.replace('\n- - -\n')
 
-    insertsnippet: (selection, options) ->
+    insertSnippet: (selection, options) ->
       snippet = options.value
       selection.replace(snippet.getText())
 
@@ -377,4 +386,4 @@ class Mercury.Regions.Markupable.Selection
 
 
   textContent: ->
-    return @text
+    return @text