mercury-rails 0.2.3 → 0.3.1

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

@@ -1,4 +1,7 @@
 class @Mercury.Regions.Snippetable extends Mercury.Region
+  @supported: document.getElementById
+  @supportedText: "IE 7+, Chrome 10+, Firefox 4+, Safari 5+, Opera 8+"
+
   type = 'snippetable'
 
   constructor: (@element, @window, @options = {}) ->
@@ -14,52 +17,48 @@ class @Mercury.Regions.Snippetable extends Mercury.Region
   bindEvents: ->
     super
 
-    Mercury.bind 'unfocus:regions', (event) =>
+    Mercury.on 'unfocus:regions', (event) =>
       return if @previewing
       if Mercury.region == @
         @element.removeClass('focus')
         @element.sortable('destroy')
         Mercury.trigger('region:blurred', {region: @})
 
-    Mercury.bind 'focus:window', (event) =>
+    Mercury.on 'focus:window', (event) =>
       return if @previewing
       if Mercury.region == @
         @element.removeClass('focus')
         @element.sortable('destroy')
         Mercury.trigger('region:blurred', {region: @})
 
-    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()
-          if event.shiftKey
-            @execCommand('redo')
-          else
-            @execCommand('undo')
-
-          return
-
-    @element.mouseup =>
+    @element.on 'mouseup', =>
       return if @previewing
       @focus()
       Mercury.trigger('region:focused', {region: @})
 
-    @element.bind 'dragover', (event) =>
+    @element.on 'dragover', (event) =>
       return if @previewing
       event.preventDefault()
       event.originalEvent.dataTransfer.dropEffect = 'copy'
 
-    @element.bind 'drop', (event) =>
-      return if @previewing
-      return unless Mercury.snippet
+    @element.on 'drop', (event) =>
+      return if @previewing || ! Mercury.snippet
       @focus()
       event.preventDefault()
       Mercury.Snippet.displayOptionsFor(Mercury.snippet)
 
+    jQuery(@document).on 'keydown', (event) =>
+      return if @previewing || Mercury.region != @
+      switch event.keyCode
+        when 90 # undo / redo
+          return unless event.metaKey
+          event.preventDefault()
+          if event.shiftKey then @execCommand('redo') else @execCommand('undo')
+
+    jQuery(@document).on 'keyup', =>
+      return if @previewing || Mercury.region != @
+      Mercury.changes = true
+
 
   focus: ->
     Mercury.region = @
@@ -78,7 +77,6 @@ class @Mercury.Regions.Snippetable extends Mercury.Region
 
   execCommand: (action, options = {}) ->
     super
-
     handler.call(@, options) if handler = Mercury.Regions.Snippetable.actions[action]
 
 
@@ -95,7 +93,7 @@ class @Mercury.Regions.Snippetable extends Mercury.Region
         Mercury.trigger('hide:toolbar', {type: 'snippet', immediately: true})
         return true
       stop: =>
-        setTimeout((=> @pushHistory()), 100)
+        setTimeout(100, => @pushHistory())
         return true
     }
 

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

@@ -10,9 +10,10 @@ class @Mercury.Select extends Mercury.Dialog
 
 
   bindEvents: ->
-    Mercury.bind 'hide:dialogs', (event, dialog) => @hide() unless dialog == @
+    Mercury.on 'hide:dialogs', (event, dialog) => @hide() unless dialog == @
 
-    @element.mousedown (event) => event.preventDefault()
+    @element.on 'mousedown', (event) =>
+      event.preventDefault()
 
     super
 

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

@@ -52,6 +52,7 @@ class @Mercury.Snippet
 
   loadPreview: (element, callback = null) ->
     jQuery.ajax Mercury.config.snippets.previewUrl.replace(':name', @name), {
+      headers: Mercury.ajaxHeaders()
       type: Mercury.config.snippets.method
       data: @options
       success: (data) =>
@@ -59,7 +60,7 @@ class @Mercury.Snippet
         element.html(data)
         callback() if callback
       error: =>
-        alert("Error loading the preview for the #{@name} snippet.")
+        Mercury.notify('Error loading the preview for the \"%s\" snippet.', @name)
     }
 
 

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

@@ -14,19 +14,23 @@ class @Mercury.SnippetToolbar extends Mercury.Toolbar
 
 
   bindEvents: ->
-    Mercury.bind 'show:toolbar', (event, options) =>
+    Mercury.on 'show:toolbar', (event, options) =>
       return unless options.snippet
       options.snippet.mouseout => @hide()
       @show(options.snippet)
 
-    Mercury.bind 'hide:toolbar', (event, options) =>
+    Mercury.on 'hide:toolbar', (event, options) =>
       return unless options.type && options.type == 'snippet'
       @hide(options.immediately)
 
-    jQuery(@document).scroll => @position() if @visible
+    @element.mousemove =>
+      clearTimeout(@hideTimeout)
 
-    @element.mousemove => clearTimeout(@hideTimeout)
-    @element.mouseout => @hide()
+    @element.mouseout =>
+      @hide()
+
+    jQuery(@document).on 'scroll', =>
+      @position() if @visible
 
 
   show: (@snippet) ->
@@ -61,9 +65,8 @@ class @Mercury.SnippetToolbar extends Mercury.Toolbar
       @element.hide()
       @visible = false
     else
-      @hideTimeout = setTimeout((=>
+      @hideTimeout = setTimeout 500, =>
         @element.stop().animate {opacity: 0}, 300, 'easeInOutSine', =>
           @element.hide()
         @visible = false
-      ), 500)
 

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

@@ -16,11 +16,11 @@ class @Mercury.Statusbar
 
 
   bindEvents: ->
-    Mercury.bind 'region:update', (event, options) =>
+    Mercury.on 'region:update', (event, options) =>
       @setPath(options.region.path()) if options.region && jQuery.type(options.region.path) == 'function'
 
-    @aboutElement.click =>
-      Mercury.lightview('/mercury/lightviews/about.html', {title: "About Mercury Editor v#{Mercury.version}"})
+    @aboutElement.on 'click', =>
+      Mercury.lightview('/mercury/lightviews/about.html', {title: "Mercury Editor v#{Mercury.version}"})
 
 
   height: ->
@@ -37,7 +37,7 @@ class @Mercury.Statusbar
     path = []
     path.push("<a>#{element.tagName.toLowerCase()}</a>") for element in elements
 
-    @pathElement.html("<span><strong>Path: </strong>#{path.reverse().join(' &raquo; ')}</span>")
+    @pathElement.html("<span><strong>#{Mercury.I18n('Path:')} </strong>#{path.reverse().join(' &raquo; ')}</span>")
 
 
   show: ->

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

@@ -2,7 +2,7 @@
   Mercury.tableEditor.load(table, cell, cellContent)
   return Mercury.tableEditor
 
-jQuery.extend Mercury.tableEditor, {
+jQuery.extend Mercury.tableEditor,
 
   load: (@table, @cell, @cellContent = '') ->
     @row = @cell.parent('tr')
@@ -263,5 +263,3 @@ jQuery.extend Mercury.tableEditor, {
   # Sets the rowspan of a cell, removing it if it's 1
   setRowspanFor: (cell, value) ->
     jQuery(cell).attr('rowspan', if value > 1 then value else null)
-
-}

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

@@ -1,6 +1,9 @@
 class @Mercury.Toolbar.Button
 
   constructor: (@name, @title, @summary = null, @types = {}, @options = {}) ->
+    @title = Mercury.I18n(@title) if @title
+    @summary = Mercury.I18n(@summary) if @summary
+
     @build()
     @bindEvents()
     return @element
@@ -10,8 +13,8 @@ class @Mercury.Toolbar.Button
     @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}
+    @handled = {}
+
     for own type, mixed of @types
       switch type
         when 'preload' then true
@@ -32,30 +35,33 @@ class @Mercury.Toolbar.Button
         when 'palette'
           @element.addClass("mercury-button-palette")
           url = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
-          @handled[type] = new Mercury.Palette(url, @name, dialogOptions)
+          @handled[type] = new Mercury.Palette(url, @name, @defaultDialogOptions())
 
         when 'select'
           @element.addClass("mercury-button-select").find('em').html(@title)
           url = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
-          @handled[type] = new Mercury.Select(url, @name, dialogOptions)
+          @handled[type] = new Mercury.Select(url, @name, @defaultDialogOptions())
 
         when 'panel'
           @element.addClass('mercury-button-panel')
           url = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
           @handled['toggle'] = true
-          @handled[type] = new Mercury.Panel(url, @name, dialogOptions)
+          @handled[type] = new Mercury.Panel(url, @name, @defaultDialogOptions())
 
         when 'modal'
           @handled[type] = if jQuery.isFunction(mixed) then mixed.apply(@, @name) else mixed
 
-        else throw "Unknown button type #{type} used for the #{@name} button."
+        when 'lightview'
+          @handled[type] = if jQuery.isFunction(mixed) then mixed.apply(@, @name) else mixed
+
+        else throw Mercury.I18n('Unknown button type \"%s\" used for the \"%s\" button.', type, @name)
 
 
   bindEvents: ->
-    Mercury.bind 'button', (event, options) =>
-      @element.click() if options.action == @name
+    Mercury.on 'button', (event, options) => @element.click() if options.action == @name
+    Mercury.on 'mode', (event, options) => @togglePressed() if @handled.mode == options.mode && @handled.toggle
 
-    Mercury.bind 'region:update', (event, options) =>
+    Mercury.on 'region:update', (event, options) =>
       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)
@@ -65,30 +71,30 @@ class @Mercury.Toolbar.Button
       else
         @element.removeClass('active')
 
-    Mercury.bind 'region:focused', (event, options) =>
+    Mercury.on 'region:focused', (event, options) =>
       if @handled.regions && options.region && options.region.type
         if @handled.regions.indexOf(options.region.type) > -1
           @element.removeClass('disabled')
         else
           @element.addClass('disabled')
 
-    Mercury.bind 'region:blurred', (event, options) =>
+    Mercury.on 'region:blurred', =>
       @element.addClass('disabled') if @handled.regions
 
-    @element.mousedown (event) =>
+    @element.on 'mousedown', =>
       @element.addClass('active')
 
-    @element.mouseup (event) =>
+    @element.on 'mouseup', =>
       @element.removeClass('active')
 
-    @element.click (event) =>
+    @element.on 'click', (event) =>
       if @element.closest('.disabled').length then return
 
       handled = false
       for own type, mixed of @handled
         switch type
           when 'toggle'
-            @togglePressed()
+            @togglePressed() unless @handled.mode
 
           when 'mode'
             handled = true
@@ -98,13 +104,27 @@ class @Mercury.Toolbar.Button
             handled = true
             Mercury.modal(@handled.modal, {title: @summary || @title, handler: @name})
 
+          when 'lightview'
+            handled = true
+            Mercury.lightview(@handled.lightview, {title: @summary || @title, handler: @name, closeButton: true})
+
           when 'palette', 'select', 'panel'
             event.stopPropagation()
             handled = true
             @handled[type].toggle()
 
       Mercury.trigger('action', {action: @name}) unless handled
-      Mercury.trigger('focus:frame')
+      Mercury.trigger('focus:frame') if @options['regions'] && @options['regions'].length
+
+
+  defaultDialogOptions: ->
+    return {
+      title: @summary || @title
+      preload: @types.preload
+      appendTo: @options.appendDialogsTo || 'body'
+      closeButton: true
+      for: @element
+    }
 
 
   togglePressed: ->
@@ -125,11 +145,13 @@ class @Mercury.Toolbar.Button
 
   italic: (node) -> node.css('font-style') == 'italic'
 
-  # todo: overline is a bit weird because <u> and <strike> override text-decoration, so we can't always tell
-  # todo: maybe walk up the tree if it's not too expensive?
-  overline: (node) -> node.css('text-decoration') == 'overline'
+  # overline is weird because <u> and <strike> override text-decoration -- we can't always tell without checking parents
+  overline: (node) ->
+    return true if node.css('text-decoration') == 'overline'
+    for parent in node.parentsUntil(@element)
+      return true if jQuery(parent).css('text-decoration') == 'overline'
+    return false
 
-  # todo: this should never check for tags, because they could be styled differently
   strikethrough: (node, region) -> node.css('text-decoration') == 'line-through' || !!node.closest('strike', region).length
 
   underline: (node, region) -> node.css('text-decoration') == 'underline' || !!node.closest('u', region).length

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

@@ -14,7 +14,7 @@ class @Mercury.Toolbar.ButtonGroup
 
 
   bindEvents: ->
-    Mercury.bind 'region:update', (event, options) =>
+    Mercury.on 'region:update', (event, options) =>
       context = Mercury.Toolbar.ButtonGroup.contexts[@name]
       if context
         if options.region && jQuery.type(options.region.currentElement) == 'function'
@@ -24,14 +24,14 @@ class @Mercury.Toolbar.ButtonGroup
           else
             @element.addClass('disabled')
 
-    Mercury.bind 'region:focused', (event, options) =>
+    Mercury.on 'region:focused', (event, options) =>
       if @regions && options.region && options.region.type
         if @regions.indexOf(options.region.type) > -1
           @element.removeClass('disabled') unless @options._context
         else
           @element.addClass('disabled')
 
-    Mercury.bind 'region:blurred', (event, options) =>
+    Mercury.on 'region:blurred', (event, options) =>
       @element.addClass('disabled') if @options.regions
 
 

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

@@ -15,8 +15,8 @@ class @Mercury.Toolbar.Expander extends Mercury.Palette
 
 
   bindEvents: ->
-    Mercury.bind 'hide:dialogs', (event, dialog) => @hide() unless dialog == @
-    Mercury.bind 'resize', => @windowResize()
+    Mercury.on 'hide:dialogs', (event, dialog) => @hide() unless dialog == @
+    Mercury.on 'resize', => @windowResize()
 
     super
 

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

@@ -26,7 +26,7 @@ class @Mercury.Toolbar
         expander = new Mercury.Toolbar.Expander(toolbarName, {appendTo: toolbar, for: container})
         expander.appendTo(@element)
 
-      toolbar.addClass('disabled') unless toolbarName == 'primary'
+      toolbar.addClass('disabled') if Mercury.config.toolbars['primary'] && toolbarName != 'primary'
 
     @element.css({width: '100%'})
 
@@ -48,25 +48,27 @@ class @Mercury.Toolbar
       when 'string' # separator
         jQuery('<hr>', {class: "mercury-#{if options == '-' then 'line-separator' else 'separator'}"})
 
-      else throw "Unknown button structure -- please provide an array, object, or string for #{name}."
+      else throw Mercury.I18n('Unknown button structure -- please provide an array, object, or string for "%s".', name)
 
 
   bindEvents: ->
-    Mercury.bind 'region:focused', (event, options) =>
+    Mercury.on 'region:focused', (event, options) =>
       for toolbar in @element.find(".mercury-toolbar")
         toolbar = jQuery(toolbar)
         if regions = toolbar.data('regions')
           toolbar.removeClass('disabled') if regions.split(',').indexOf(options.region.type) > -1
 
-    Mercury.bind 'region:blurred', (event, options) =>
+    Mercury.on 'region:blurred', (event, options) =>
       for toolbar in @element.find(".mercury-toolbar")
         toolbar = jQuery(toolbar)
         if regions = toolbar.data('regions')
           toolbar.addClass('disabled') if regions.split(',').indexOf(options.region.type) > -1
 
+    @element.on 'click', ->
+      Mercury.trigger('hide:dialogs')
 
-    @element.click -> Mercury.trigger('hide:dialogs')
-    @element.mousedown (event) -> event.preventDefault()
+    @element.on 'mousedown', (event) ->
+      event.preventDefault()
 
 
   height: ->

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

@@ -2,10 +2,10 @@
   Mercury.tooltip.show(forElement, content, options)
   return Mercury.tooltip
 
-jQuery.extend Mercury.tooltip, {
+jQuery.extend Mercury.tooltip,
 
   show: (@forElement, @content, @options = {}) ->
-    @document = jQuery(@forElement.get(0).ownerDocument)
+    @document = @forElement.get(0).ownerDocument
     @initialize()
     if @visible then @update() else @appear()
 
@@ -23,15 +23,20 @@ jQuery.extend Mercury.tooltip, {
 
 
   bindEvents: ->
-    Mercury.bind 'resize', => @position() if @visible
-    @document.scroll => @position() if @visible
-    for parent in @forElement.parentsUntil(jQuery('body', @document))
-      if parent.scrollHeight > parent.clientHeight
-        jQuery(parent).scroll => @position() if @visible
-    @element.mousedown (event) ->
+    Mercury.on 'resize', => @position() if @visible
+
+    @element.on 'mousedown', (event) ->
       event.preventDefault()
       event.stopPropagation()
 
+    for parent in @forElement.parentsUntil(jQuery('body', @document))
+      continue unless parent.scrollHeight > parent.clientHeight
+      jQuery(parent).on 'scroll', =>
+        @position() if @visible
+
+    jQuery(@document).on 'scroll', =>
+      @position() if @visible
+
 
   appear: ->
     @update()
@@ -67,4 +72,3 @@ jQuery.extend Mercury.tooltip, {
     @element.hide()
     @visible = false
 
-}