mercury-rails 0.1.1 → 0.1.2

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

@@ -28,12 +28,11 @@ class @Mercury.Regions.Snippetable extends Mercury.Region
         @element.sortable('destroy')
         Mercury.trigger('region:blurred', {region: @})
 
-    $(@document).keydown (event) =>
+    jQuery(@document).keydown (event) =>
       return if @previewing
       return unless Mercury.region == @
       Mercury.changes = true
       switch event.keyCode
-
         when 90 # undo / redo
           return unless event.metaKey
           event.preventDefault()
@@ -89,7 +88,7 @@ class @Mercury.Regions.Snippetable extends Mercury.Region
       scroll: false, #scrolling is buggy
       containment: 'parent',
       items: '.mercury-snippet',
-      opacity: .4,
+      opacity: 0.4,
       revert: 100,
       tolerance: 'pointer',
       beforeStop: =>
@@ -104,23 +103,23 @@ class @Mercury.Regions.Snippetable extends Mercury.Region
   # Actions
   @actions: {
 
-    undo: -> @html(@history.undo())
+    undo: -> @content(@history.undo())
 
-    redo: -> @html(@history.redo())
+    redo: -> @content(@history.redo())
 
-    insertsnippet: (options) ->
+    insertSnippet: (options) ->
       snippet = options.value
       if (existing = @element.find("[data-snippet=#{snippet.identity}]")).length
         existing.replaceWith(snippet.getHTML(@document, => @pushHistory()))
       else
         @element.append(snippet.getHTML(@document, => @pushHistory()))
 
-    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})
 

data/app/assets/javascripts/mercury/select.js.coffee

@@ -5,8 +5,8 @@ class @Mercury.Select extends Mercury.Dialog
 
 
   build: ->
-    @element = $('<div>', {class: "mercury-select mercury-#{@name}-select loading", style: 'display:none'})
-    @element.appendTo($(@options.appendTo).get(0) ? 'body')
+    @element = jQuery('<div>', {class: "mercury-select mercury-#{@name}-select loading", style: 'display:none'})
+    @element.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
 
 
   bindEvents: ->
@@ -19,7 +19,7 @@ class @Mercury.Select extends Mercury.Dialog
     position = @button.offset()
     elementWidth = @element.width()
     elementHeight = @element.height()
-    documentHeight = $(document).height()
+    documentHeight = jQuery(document).height()
 
     top = position.top + (@button.height() / 2) - (elementHeight / 2)
     top = position.top - 100 if top < position.top - 100
@@ -29,12 +29,12 @@ class @Mercury.Select extends Mercury.Dialog
     height = documentHeight - top - 20 if top + elementHeight >= documentHeight - 20
 
     left = position.left
-    left = left - elementWidth + @button.width() if left + elementWidth > $(window).width()
+    left = left - elementWidth + @button.width() if left + elementWidth > jQuery(window).width()
 
     @element.css {
-      top: top,
-      left: left,
-      height: height,
-      display: if keepVisible then 'block' else 'none',
+      top: top
+      left: left
+      height: height
+      display: if keepVisible then 'block' else 'none'
       visibility: 'visible'
     }

data/app/assets/javascripts/mercury/snippet.js.coffee

@@ -3,7 +3,7 @@ class @Mercury.Snippet
   @all: []
 
   @displayOptionsFor: (name) ->
-    Mercury.modal("/mercury/snippets/#{name}/options", {title: 'Snippet Options', handler: 'insertsnippet', snippetName: name})
+    Mercury.modal("/mercury/snippets/#{name}/options", {title: 'Snippet Options', handler: 'insertSnippet', snippetName: name})
     Mercury.snippet = null
 
 
@@ -21,7 +21,7 @@ class @Mercury.Snippet
 
 
   @load: (snippets) ->
-    for identity, details of snippets
+    for own identity, details of snippets
       instance = new Mercury.Snippet(details.name, identity, details.options)
       @all.push(instance)
 
@@ -34,7 +34,7 @@ class @Mercury.Snippet
 
 
   getHTML: (context, callback = null) ->
-    element = $('<div class="mercury-snippet" contenteditable="false">', context)
+    element = jQuery('<div class="mercury-snippet" contenteditable="false">', context)
     element.attr({'data-snippet': @identity})
     element.attr({'data-version': @version})
     element.html("[#{@identity}]")
@@ -47,7 +47,7 @@ class @Mercury.Snippet
 
 
   loadPreview: (element, callback = null) ->
-    $.ajax "/mercury/snippets/#{@name}/preview", {
+    jQuery.ajax "/mercury/snippets/#{@name}/preview", {
       type: 'POST'
       data: @options
       success: (data) =>
@@ -63,7 +63,7 @@ class @Mercury.Snippet
     Mercury.snippet = @
     Mercury.modal "/mercury/snippets/#{@name}/options", {
       title: 'Snippet Options',
-      handler: 'insertsnippet',
+      handler: 'insertSnippet',
       loadType: 'post',
       loadData: @options
     }
@@ -87,6 +87,6 @@ class @Mercury.Snippet
 
   serialize: ->
     return {
-      name: @name,
+      name: @name
       options: @options
     }

data/app/assets/javascripts/mercury/snippet_toolbar.js.coffee

@@ -5,10 +5,10 @@ class @Mercury.SnippetToolbar extends Mercury.Toolbar
 
 
   build: ->
-    @element = $('<div>', {class: 'mercury-toolbar mercury-snippet-toolbar', style: 'display:none'})
-    @element.appendTo($(@options.appendTo).get(0) ? 'body')
+    @element = jQuery('<div>', {class: 'mercury-toolbar mercury-snippet-toolbar', style: 'display:none'})
+    @element.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
 
-    for buttonName, options of Mercury.config.toolbars.snippetable
+    for own buttonName, options of Mercury.config.toolbars.snippetable
       button = @buildButton(buttonName, options)
       button.appendTo(@element) if button
 
@@ -23,7 +23,7 @@ class @Mercury.SnippetToolbar extends Mercury.Toolbar
       return unless options.type && options.type == 'snippet'
       @hide(options.immediately)
 
-    $(@document).scroll => @position() if @visible
+    jQuery(@document).scroll => @position() if @visible
 
     @element.mousemove => clearTimeout(@hideTimeout)
     @element.mouseout => @hide()
@@ -38,11 +38,11 @@ class @Mercury.SnippetToolbar extends Mercury.Toolbar
   position: ->
     offset = @snippet.offset()
 
-    top = offset.top + Mercury.displayRect.top - $(@document).scrollTop() - @height() + 10
-    left = offset.left - $(@document).scrollLeft()
+    top = offset.top + Mercury.displayRect.top - jQuery(@document).scrollTop() - @height() + 10
+    left = offset.left - jQuery(@document).scrollLeft()
 
     @element.css {
-      top: top,
+      top: top
       left: left
     }
 

data/app/assets/javascripts/mercury/statusbar.js.coffee

@@ -6,16 +6,20 @@ class @Mercury.Statusbar
 
 
   build: ->
-    @element = $('<div>', {class: 'mercury-statusbar'}).appendTo($(@options.appendTo).get(0) ? 'body')
+    @element = jQuery('<div>', {class: 'mercury-statusbar'}).appendTo(jQuery(@options.appendTo).get(0) ? 'body')
 
 
   bindEvents: ->
     Mercury.bind 'region:update', (event, options) =>
-      @setPath(options.region.path()) if options.region && $.type(options.region.path) == 'function'
+      @setPath(options.region.path()) if options.region && jQuery.type(options.region.path) == 'function'
 
 
   height: ->
-    @element.outerHeight()
+    return @element.outerHeight()
+
+
+  top: ->
+    return @element.offset().top
 
 
   setPath: (elements) ->

data/app/assets/javascripts/mercury/table_editor.js.coffee

@@ -2,7 +2,7 @@
   Mercury.tableEditor.load(table, cell)
   return Mercury.tableEditor
 
-$.extend Mercury.tableEditor, {
+jQuery.extend Mercury.tableEditor, {
 
   load: (@table, @cell) ->
     @row = @cell.parent('tr')
@@ -17,7 +17,7 @@ $.extend Mercury.tableEditor, {
       rowSpan = 1
       matchOptions = if position == 'after' then {right: sig.right} else {left: sig.left}
       if matching = @findCellByOptionsFor(row, matchOptions)
-        newCell = $("<#{matching.cell.get(0).tagName}>").text('\00')
+        newCell = jQuery("<#{matching.cell.get(0).tagName}>").text('')
         @setRowspanFor(newCell, matching.height)
         if position == 'before' then matching.cell.before(newCell) else matching.cell.after(newCell)
         i += matching.height - 1
@@ -38,20 +38,20 @@ $.extend Mercury.tableEditor, {
       else if intersecting = @findCellByIntersectionFor(row, sig)
         adjusting.push(intersecting.cell)
 
-    $(cell).remove() for cell in removing
+    jQuery(cell).remove() for cell in removing
     @setColspanFor(cell, @colspanFor(cell) - 1) for cell in adjusting
 
 
   addRow: (position = 'after') ->
-    newRow = $('<tr>')
+    newRow = jQuery('<tr>')
 
     if (rowspan = @rowspanFor(@cell)) > 1 && position == 'after'
-      @row = $(@row.nextAll('tr')[rowspan - 2])
+      @row = jQuery(@row.nextAll('tr')[rowspan - 2])
 
     cellCount = 0
     for cell in @row.find('th, td')
       colspan = @colspanFor(cell)
-      newCell = $("<#{cell.tagName}>").text('\00')
+      newCell = jQuery("<#{cell.tagName}>").text('')
       @setColspanFor(newCell, colspan)
       cellCount += colspan
       if (rowspan = @rowspanFor(cell)) > 1 && position == 'after'
@@ -64,14 +64,14 @@ $.extend Mercury.tableEditor, {
       rowCount = 0
       for previousRow in @row.prevAll('tr')
         rowCount += 1
-        for cell in $(previousRow).find('td[rowspan], th[rowspan]')
+        for cell in jQuery(previousRow).find('td[rowspan], th[rowspan]')
           rowspan = @rowspanFor(cell)
           if rowspan - 1 >= rowCount && position == 'before'
             @setRowspanFor(cell, rowspan + 1)
           else if rowspan - 1 >= rowCount && position == 'after'
             if rowspan - 1 == rowCount
-              newCell = $("<#{cell.tagName}>", {colspan: @colspanFor(cell)})
-              newRow.append(newCell);
+              newCell = jQuery("<#{cell.tagName}>", {colspan: @colspanFor(cell)})
+              newRow.append(newCell)
             else
               @setRowspanFor(cell, rowspan + 1)
 
@@ -93,7 +93,7 @@ $.extend Mercury.tableEditor, {
 
     # remove any emtpy rows below
     if minRowspan > 1
-      $(@row.nextAll('tr')[i]).remove() for i in [0..minRowspan - 2]
+      jQuery(@row.nextAll('tr')[i]).remove() for i in [0..minRowspan - 2]
 
     # find and move down any cells that have a larger rowspan
     for cell in @row.find('td[rowspan], th[rowspan]')
@@ -101,14 +101,14 @@ $.extend Mercury.tableEditor, {
       continue if sig.height == minRowspan
       if match = @findCellByOptionsFor(@row.nextAll('tr')[minRowspan - 1], {left: sig.left, forceAdjacent: true})
         @setRowspanFor(cell, @rowspanFor(cell) - @rowspanFor(@cell))
-        if match.direction == 'before' then match.cell.before($(cell).clone()) else match.cell.after($(cell).clone())
+        if match.direction == 'before' then match.cell.before(jQuery(cell).clone()) else match.cell.after(jQuery(cell).clone())
 
     if @columnsFor(@row.find('td, th')) < @columnCount
       # move up rows looking for cells with rowspans that might intersect
       rowsAbove = 0
       for aboveRow in @row.prevAll('tr')
         rowsAbove += 1
-        for cell in $(aboveRow).find('td[rowspan], th[rowspan]')
+        for cell in jQuery(aboveRow).find('td[rowspan], th[rowspan]')
           # if the cell intersects with the row we're trying to calculate on, and it's index is less than where we've
           # gotten so far, add it
           rowspan = @rowspanFor(cell)
@@ -129,7 +129,7 @@ $.extend Mercury.tableEditor, {
   decreaseColspan: ->
     return if @colspanFor(@cell) == 1
     @setColspanFor(@cell, @colspanFor(@cell) - 1)
-    newCell = $("<#{@cell.get(0).tagName}>").text('\00')
+    newCell = jQuery("<#{@cell.get(0).tagName}>").text('')
     @setRowspanFor(newCell, @rowspanFor(@cell))
     @cell.after(newCell)
 
@@ -146,7 +146,7 @@ $.extend Mercury.tableEditor, {
     return if sig.height == 1
     nextRow = @row.nextAll('tr')[sig.height - 2]
     if match = @findCellByOptionsFor(nextRow, {left: sig.left, forceAdjacent: true})
-      newCell = $("<#{@cell.get(0).tagName}>").text('\00')
+      newCell = jQuery("<#{@cell.get(0).tagName}>").text('')
       @setColspanFor(newCell, @colspanFor(@cell))
       @setRowspanFor(@cell, sig.height - 1)
       if match.direction == 'before' then match.cell.before(newCell) else match.cell.after(newCell)
@@ -164,7 +164,7 @@ $.extend Mercury.tableEditor, {
 
   # Gets the index for a given cell, taking into account that rows above it can have cells that have rowspans.
   cellIndexFor: (cell) ->
-    cell = $(cell)
+    cell = jQuery(cell)
 
     # get the row for the cell and calculate all the columns in it
     row = cell.parent('tr')
@@ -177,7 +177,7 @@ $.extend Mercury.tableEditor, {
       rowsAbove = 0
       for aboveRow in row.prevAll('tr')
         rowsAbove += 1
-        for aboveCell in $(aboveRow).find('td[rowspan], th[rowspan]')
+        for aboveCell in jQuery(aboveRow).find('td[rowspan], th[rowspan]')
           # if the cell intersects with the row we're trying to calculate on, and it's index is less than where we've
           # gotten so far, add it
           if @rowspanFor(aboveCell) > rowsAbove && @cellIndexFor(aboveCell) <= index
@@ -187,7 +187,7 @@ $.extend Mercury.tableEditor, {
 
   # Creates a signature for a given cell, which is made up if it's size, and itself.
   cellSignatureFor: (cell) ->
-    sig = {cell: $(cell)}
+    sig = {cell: jQuery(cell)}
     sig.left = @cellIndexFor(cell)
     sig.width = @colspanFor(cell)
     sig.height = @rowspanFor(cell)
@@ -200,7 +200,7 @@ $.extend Mercury.tableEditor, {
   # left, [width], [forceAdjacent]
   # eg. findCellByOptionsFor(@row, {left: 1, width: 2, forceAdjacent: true})
   findCellByOptionsFor: (row, options) ->
-    for cell in $(row).find('td, th')
+    for cell in jQuery(row).find('td, th')
       sig = @cellSignatureFor(cell)
       if typeof(options.right) != 'undefined'
         return sig if sig.right == options.right
@@ -212,7 +212,7 @@ $.extend Mercury.tableEditor, {
           return sig if sig.left == options.left
         else if options.forceAdjacent
           if sig.left > options.left
-            prev = $(cell).prev('td, th')
+            prev = jQuery(cell).prev('td, th')
             if prev.length
               sig = @cellSignatureFor(prev)
               sig.direction = 'after'
@@ -228,7 +228,7 @@ $.extend Mercury.tableEditor, {
 
   # Finds a cell that intersects with the current signature
   findCellByIntersectionFor: (row, signature) ->
-    for cell in $(row).find('td, th')
+    for cell in jQuery(row).find('td, th')
       sig = @cellSignatureFor(cell)
       return sig if sig.right - signature.left >= 0 && sig.right > signature.left
     return null
@@ -245,22 +245,22 @@ $.extend Mercury.tableEditor, {
   # Tries to get the colspan of a cell, falling back to 1 if there's none
   # specified.
   colspanFor: (cell) ->
-    return parseInt($(cell).attr('colspan')) || 1
+    return parseInt(jQuery(cell).attr('colspan')) || 1
 
 
   # Tries to get the rowspan of a cell, falling back to 1 if there's none
   # specified.
   rowspanFor: (cell) ->
-    return parseInt($(cell).attr('rowspan')) || 1
+    return parseInt(jQuery(cell).attr('rowspan')) || 1
 
 
   # Sets the colspan of a cell, removing it if it's 1.
   setColspanFor: (cell, value) ->
-    $(cell).attr('colspan', if value > 1 then value else null)
+    jQuery(cell).attr('colspan', if value > 1 then value else null)
 
 
   # Sets the rowspan of a cell, removing it if it's 1
   setRowspanFor: (cell, value) ->
-    $(cell).attr('rowspan', if value > 1 then value else null)
+    jQuery(cell).attr('rowspan', if value > 1 then value else null)
 
 }

data/app/assets/javascripts/mercury/toolbar.button.js.coffee

@@ -1,25 +1,24 @@
 class @Mercury.Toolbar.Button
 
-  constructor: (@name, @title, @summary = null, @types = [], @options = {}) ->
+  constructor: (@name, @title, @summary = null, @types = {}, @options = {}) ->
     @build()
     @bindEvents()
     return @element
 
 
   build: ->
-    @element = $('<div>', {title: @summary ? @title, class: "mercury-button mercury-#{@name}-button"}).html("<em>#{@title}</em>")
+    @element = jQuery('<div>', {title: @summary ? @title, class: "mercury-button mercury-#{@name}-button"}).html("<em>#{@title}</em>")
     @element.data('expander', "<div class=\"mercury-expander-button\" data-button=\"#{@name}\"><em></em><span>#{@title}</span></div>")
 
     @handled = []
     dialogOptions = {title: @summary || @title, preload: @types.preload, appendTo: @options.appendDialogsTo || 'body', for: @element}
-    for type, mixed of @types
+    for own type, mixed of @types
       switch type
-
         when 'preload' then true
 
         when 'regions'
           @element.addClass('disabled')
-          @handled[type] = if $.isFunction(mixed) then mixed.call(@, @name) else mixed
+          @handled[type] = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
 
         when 'toggle'
           @handled[type] = true
@@ -28,26 +27,26 @@ class @Mercury.Toolbar.Button
           @handled[type] = if mixed == true then @name else mixed
 
         when 'context'
-          @handled[type] = if $.isFunction(mixed) then mixed else Mercury.Toolbar.Button.contexts[@name]
+          @handled[type] = if jQuery.isFunction(mixed) then mixed else Mercury.Toolbar.Button.contexts[@name]
 
         when 'palette'
           @element.addClass("mercury-button-palette")
-          url = if $.isFunction(mixed) then mixed.call(@, @name) else mixed
+          url = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
           @handled[type] = new Mercury.Palette(url, @name, dialogOptions)
 
         when 'select'
           @element.addClass("mercury-button-select").find('em').html(@title)
-          url = if $.isFunction(mixed) then mixed.call(@, @name) else mixed
+          url = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
           @handled[type] = new Mercury.Select(url, @name, dialogOptions)
 
         when 'panel'
           @element.addClass('mercury-button-panel')
-          url = if $.isFunction(mixed) then mixed.call(@, @name) else mixed
+          url = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
           @handled['toggle'] = true
           @handled[type] = new Mercury.Panel(url, @name, dialogOptions)
 
         when 'modal'
-          @handled[type] = if $.isFunction(mixed) then mixed.apply(@, @name) else mixed
+          @handled[type] = if jQuery.isFunction(mixed) then mixed.apply(@, @name) else mixed
 
         else throw "Unknown button type #{type} used for the #{@name} button."
 
@@ -57,7 +56,7 @@ class @Mercury.Toolbar.Button
       @element.click() if options.action == @name
 
     Mercury.bind 'region:update', (event, options) =>
-      if @handled.context && options.region && $.type(options.region.currentElement) == 'function'
+      if @handled.context && options.region && jQuery.type(options.region.currentElement) == 'function'
         element = options.region.currentElement()
         if element.length && @handled.context.call(@, element, options.region.element)
           @element.addClass('active')
@@ -86,9 +85,8 @@ class @Mercury.Toolbar.Button
       if @element.closest('.disabled').length then return
 
       handled = false
-      for type, mixed of @handled
+      for own type, mixed of @handled
         switch type
-
           when 'toggle'
             @togglePressed()
 
@@ -97,6 +95,7 @@ class @Mercury.Toolbar.Button
             Mercury.trigger('mode', {mode: mixed})
 
           when 'modal'
+            handled = true
             Mercury.modal(@handled.modal, {title: @summary || @title, handler: @name})
 
           when 'palette', 'select', 'panel'
@@ -116,9 +115,9 @@ class @Mercury.Toolbar.Button
 # Button contexts
 @Mercury.Toolbar.Button.contexts =
 
-  backcolor: (node) -> @element.css('background-color', node.css('background-color'))
+  backColor: (node) -> @element.css('background-color', node.css('background-color'))
 
-  forecolor: (node) -> @element.css('background-color', node.css('color'))
+  foreColor: (node) -> @element.css('background-color', node.css('color'))
 
   bold: (node) ->
     weight = node.css('font-weight')
@@ -139,14 +138,14 @@ class @Mercury.Toolbar.Button
 
   superscript: (node, region) -> !!node.closest('sup', region).length
 
-  justifyleft: (node) -> node.css('text-align').indexOf('left') > -1
+  justifyLeft: (node) -> node.css('text-align').indexOf('left') > -1
 
-  justifycenter: (node) -> node.css('text-align').indexOf('center') > -1
+  justifyCenter: (node) -> node.css('text-align').indexOf('center') > -1
 
-  justifyright: (node) -> node.css('text-align').indexOf('right') > -1
+  justifyRight: (node) -> node.css('text-align').indexOf('right') > -1
 
-  justifyfull: (node) -> node.css('text-align').indexOf('justify') > -1
+  justifyFull: (node) -> node.css('text-align').indexOf('justify') > -1
 
-  insertorderedlist: (node, region) -> !!node.closest('ol', region.element).length
+  insertOrderedList: (node, region) -> !!node.closest('ol', region.element).length
 
-  insertunorderedlist: (node, region) -> !!node.closest('ul', region.element).length
+  insertUnorderedList: (node, region) -> !!node.closest('ul', region.element).length