mercury-rails 0.8.0 → 0.9.0

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

@@ -34,7 +34,7 @@
 #
 @Mercury ||= {}
 jQuery.extend @Mercury,
-  version: '0.8.0'
+  version: '0.9.0'
 
   # Mercury object namespaces
   Regions: Mercury.Regions || {}

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

@@ -1,7 +1,7 @@
 @Mercury.modal = (url, options = {}) ->
-  Mercury.modal.instance ||= new Mercury.Modal(url, options)
-  Mercury.modal.instance.show(url, options)
-  return Mercury.modal.instance
+  instance = new Mercury.Modal(url, options)
+  instance.show()
+  return instance
 
 
 class @Mercury.Modal
@@ -13,6 +13,7 @@ class @Mercury.Modal
     @url = url || @url
     @options = options || @options
     @options.minWidth ||= 400
+    @options.ujsHandling = true unless @options.ujsHandling == false
 
     Mercury.trigger('focus:window')
     @initializeModal()
@@ -54,9 +55,10 @@ class @Mercury.Modal
     @titleElement.find('a').on 'click', =>
       @hide()
 
-    @element.on 'ajax:beforeSend', (event, xhr, options) =>
-      options.success = (content) =>
-        @loadContent(content)
+    if @options.ujsHandling
+      @element.on 'ajax:beforeSend', (event, xhr, options) =>
+        options.success = (content) =>
+          @loadContent(content)
 
     jQuery(document).on 'keydown', (event) =>
       @hide() if event.keyCode == 27 && @visible
@@ -187,6 +189,7 @@ class @Mercury.Modal
           @initialize()
 
     @element.localize(Mercury.locale()) if Mercury.config.localization.enabled
+    @element.find('.modal-close').on('click', @hide)
     @resize()
 
 
@@ -196,12 +199,16 @@ class @Mercury.Modal
     if @options.closeButton == false then closeButton.hide() else closeButton.show()
 
 
+  serializeForm: ->
+    return @element.find('form').serializeObject() || {}
+
+
   reset: ->
     @titleElement.find('span').html('')
     @contentElement.html('')
 
 
-  hide: ->
+  hide: =>
     return if @showing
     @options = {}
 

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

@@ -7,6 +7,6 @@
   # replace the contents on form submit
   @element.find('form').on 'submit', (event) =>
     event.preventDefault()
-    value = @element.find('textarea').val().replace(/\n/g, '')
+    value = @element.find('textarea').val()
     Mercury.trigger('action', {action: 'replaceHTML', value: value})
     @hide()

data/app/assets/javascripts/mercury/modals/insertmedia.js.coffee

@@ -27,6 +27,7 @@
     if image = selection.is?('img')
       @element.find('#media_image_url').val(image.attr('src'))
       @element.find('#media_image_alignment').val(image.attr('align'))
+      @element.find('#media_image_float').val(if image.attr('style')? then image.css('float') else '')
       @focus('#media_image_url')
 
     # if we're editing an iframe (assume it's a video for now)
@@ -98,6 +99,7 @@
       when 'image_url'
         attrs = {src: @element.find('#media_image_url').val()}
         attrs['align'] = alignment if alignment = @element.find('#media_image_alignment').val()
+        attrs['style'] = 'float: ' + float + ';' if float = @element.find('#media_image_float').val()
         Mercury.trigger('action', {action: 'insertImage', value: attrs})
 
       when 'youtube_url'

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

@@ -41,13 +41,19 @@
   setTableAlignment: ->
     @table.attr({align: @element.find('#table_alignment').val()})
 
-
   setTableBorder: ->
-    @table.attr({border: parseInt(@element.find('#table_border').val(), 10) || 1})
-
+    border = parseInt(@element.find('#table_border').val(), 10)
+    if isNaN(border)
+      @table.removeAttr('border')
+    else
+      @table.attr({border: border})
 
   setTableCellSpacing: ->
-    @table.attr({cellspacing: parseInt(@element.find('#table_spacing').val(), 10) || 1})
+    cellspacing = parseInt(@element.find('#table_spacing').val(), 10)
+    if isNaN(cellspacing)
+      @table.removeAttr('cellspacing')
+    else
+      @table.attr({cellspacing: cellspacing})
 
 
   submitForm: ->

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

@@ -24,12 +24,12 @@ class @Mercury.PageEditor
     @iframe = jQuery('<iframe>', {id: 'mercury_iframe', class: 'mercury-iframe', frameborder: '0', src: 'about:blank'})
     @iframe.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
 
-    @toolbar = new Mercury.Toolbar(@options)
-    @statusbar = new Mercury.Statusbar(@options)
+    @toolbar = new Mercury.Toolbar(jQuery.extend(true, {}, @options, @options.toolbarOptions))
+    @statusbar = new Mercury.Statusbar(jQuery.extend(true, {}, @options, @options.statusbarOptions))
     @resize()
 
-    @iframe.on 'load', => @initializeFrame()
     @iframe.one 'load', => @bindEvents()
+    @iframe.on 'load', => @initializeFrame()
     @loadIframeSrc(null)
 
 
@@ -93,7 +93,7 @@ class @Mercury.PageEditor
 
 
   finalizeInterface: ->
-    @santizerElement = jQuery('<div>', {id: 'mercury_sanitizer', contenteditable: 'true', style: 'position:fixed;width:100px;height:100px;top:0;left:-100px;opacity:0;overflow:hidden'})
+    @santizerElement = jQuery('<div>', {id: 'mercury_sanitizer', contenteditable: 'true', style: 'position:fixed;width:100px;height:100px;min-width:0;top:0;left:-100px;opacity:0;overflow:hidden'})
     @santizerElement.appendTo(@options.appendTo ? @document.find('body'))
 
     @snippetToolbar.release() if @snippetToolbar
@@ -126,7 +126,7 @@ class @Mercury.PageEditor
     Mercury.on 'action', (event, options) =>
       action = Mercury.config.globalBehaviors[options.action] || @[options.action]
       return unless typeof(action) == 'function'
-      options.already_handled = true
+      event.preventDefault()
       action.call(@, options)
 
     jQuery(window).on 'resize', =>
@@ -161,7 +161,7 @@ class @Mercury.PageEditor
   resize: ->
     width = jQuery(window).width()
     height = @statusbar.top()
-    toolbarHeight = @toolbar.height()
+    toolbarHeight = @toolbar.top() + @toolbar.height()
 
     Mercury.displayRect = {top: toolbarHeight, left: 0, width: width, height: height - toolbarHeight, fullHeight: height}
 
@@ -178,7 +178,7 @@ class @Mercury.PageEditor
     # remove the /editor segment of the url if it gets passed through
     url = (url ? window.location.href).replace(Mercury.config.editorUrlRegEx ?= /([http|https]:\/\/.[^\/]*)\/editor\/?(.*)/i,  "$1/$2")
     url = url.replace(/[\?|\&]mercury_frame=true/gi, '')
-    url = url.replace(/\&_=i\d+/gi, '')
+    url = url.replace(/\&_=\d+/gi, '')
     if params
       # add a param allowing the server to know that the request is coming from mercury
       # and add a cache busting param so we don't get stale content
@@ -236,9 +236,9 @@ class @Mercury.PageEditor
       type: method
       dataType: @options.saveDataType
       data: data
-      success: =>
+      success: (response) =>
         Mercury.changes = false
-        Mercury.trigger('saved')
+        Mercury.trigger('saved', response)
         callback() if typeof(callback) == 'function'
       error: (response) =>
         Mercury.trigger('save_failed', response)

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

@@ -16,7 +16,7 @@ class @Mercury.Palette extends Mercury.Dialog
 
   position: (keepVisible) ->
     @element.css({top: 0, left: 0, display: 'block', visibility: 'hidden'})
-    position = @button.offset()
+    position = @button.position()
     width = @element.width()
 
     position.left = position.left - width + @button.width() if position.left + width > jQuery(window).width()

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

@@ -57,6 +57,7 @@ class @Mercury.Panel extends Mercury.Dialog
       @titleElement.find('.mercury-panel-close').animate({opacity: 1}, 100)
 
       @paneElement.css({display: 'block', width: postWidth})
+      jQuery(@paneElement.find('.focusable').get(0)).focus()
       @makeDraggable()
 
     @hide() unless @visible

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

@@ -28,7 +28,7 @@ class @Mercury.Region
       @focus()
 
     Mercury.on 'action', (event, options) =>
-      return if @previewing || Mercury.region != @
+      return if @previewing || Mercury.region != @ || event.isDefaultPrevented()
       @execCommand(options.action, options) if options.action
 
     @element.on 'mousemove', (event) =>
@@ -76,7 +76,7 @@ class @Mercury.Region
     @pushHistory() unless action == 'redo'
 
     Mercury.log('execCommand', action, options.value)
-    Mercury.changes = true unless options.already_handled
+    Mercury.changes = true
 
 
   pushHistory: ->
@@ -94,7 +94,7 @@ class @Mercury.Region
 
   dataAttributes: ->
     data = {}
-    data[attr] = @element.attr('data-' + attr) for attr in Mercury.config.regions.dataAttributes
+    data[attr] = (@container || @element).attr('data-' + attr) for attr in Mercury.config.regions.dataAttributes
     return data
 
 

data/app/assets/javascripts/mercury/regions/{full.coffee → full.js.coffee}

@@ -94,7 +94,7 @@ class @Mercury.Regions.Full extends Mercury.Region
       return if @previewing
       if snippetPlaceHolder = @element.find('img[data-snippet]').get(0)
         @focus()
-        Mercury.Snippet.displayOptionsFor(jQuery(snippetPlaceHolder).data('snippet'))
+        Mercury.Snippet.displayOptionsFor(jQuery(snippetPlaceHolder).data('snippet'), {}, jQuery(snippetPlaceHolder).data('options'))
         @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
@@ -425,7 +425,7 @@ class @Mercury.Regions.Full extends Mercury.Region
 
     redo: -> @content(@history.redo())
 
-    horizontalRule: -> this.execCommand('insertHorizontalRule')
+    horizontalRule: -> @execCommand('insertHTML', {value: '<hr/>'})
 
     removeFormatting: (selection) -> selection.insertTextNode(selection.textContent())
 

data/app/assets/javascripts/mercury/regions/{markdown.coffee → markdown.js.coffee}

@@ -34,6 +34,12 @@ class @Mercury.Regions.Markdown extends Mercury.Region
     @resize()
 
 
+  dataAttributes: ->
+    data = {}
+    data[attr] = @container.attr('data-' + attr) for attr in Mercury.config.regions.dataAttributes
+    return data
+
+
   bindEvents: ->
     Mercury.on 'mode', (event, options) => @togglePreview() if options.mode == 'preview'
     Mercury.on 'focus:frame', => @focus() if !@previewing && Mercury.region == @
@@ -65,7 +71,7 @@ class @Mercury.Regions.Markdown extends Mercury.Region
       if Mercury.snippet
         event.preventDefault()
         @focus()
-        Mercury.Snippet.displayOptionsFor(Mercury.snippet)
+        Mercury.Snippet.displayOptionsFor(Mercury.snippet.name, {}, Mercury.snippet.hasOptions)
 
       # handle any files that were dropped
       if event.originalEvent.dataTransfer.files.length

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

@@ -46,7 +46,7 @@ class @Mercury.Regions.Snippets extends Mercury.Region
       return if @previewing || ! Mercury.snippet
       @focus()
       event.preventDefault()
-      Mercury.Snippet.displayOptionsFor(Mercury.snippet)
+      Mercury.Snippet.displayOptionsFor(Mercury.snippet.name, {}, Mercury.snippet.hasOptions)
 
     jQuery(@document).on 'keydown', (event) =>
       return if @previewing || Mercury.region != @

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

@@ -20,7 +20,7 @@ class @Mercury.Select extends Mercury.Dialog
 
   position: (keepVisible) ->
     @element.css({top: 0, left: 0, display: 'block', visibility: 'hidden'})
-    position = @button.offset()
+    position = @button.position()
     elementWidth = @element.width()
     elementHeight = @element.height()
     documentHeight = jQuery(document).height()

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

@@ -2,27 +2,47 @@ class @Mercury.Snippet
 
   @all: []
 
-  @displayOptionsFor: (name, options = {}) ->
-    Mercury.modal Mercury.config.snippets.optionsUrl.replace(':name', name), jQuery.extend({
-      title: 'Snippet Options'
-      handler: 'insertSnippet'
-      snippetName: name
-    }, options)
+  @displayOptionsFor: (name, options = {}, displayOptions = true) ->
+    if displayOptions
+      Mercury.modal @optionsUrl(name), jQuery.extend({
+        title: 'Snippet Options'
+        handler: 'insertSnippet'
+        snippetName: name
+        loadType: Mercury.config.snippets.method
+      }, options)
+    else
+      snippet = Mercury.Snippet.create(name)
+      Mercury.trigger('action', {action: 'insertSnippet', value: snippet})
     Mercury.snippet = null
 
 
-  @create: (name, options) ->
-    if @all.length > 0
-      identity = "snippet_0"
-      for snippet, i in @all
-        identity = "snippet_#{i+1}" if snippet.identity == identity
-    else
-      identity = "snippet_#{@all.length}"
+  @optionsUrl: (name) ->
+    url = Mercury.config.snippets.optionsUrl
+    url = url() if typeof(url) == 'function'
+    return url.replace(':name', name)
+
 
-    instance = new Mercury.Snippet(name, identity, options)
+  @previewUrl: (name) ->
+    url = Mercury.config.snippets.previewUrl
+    url = url() if typeof(url) == 'function'
+    return url.replace(':name', name)
+
+
+  @create: (name, options) ->
+    instance = new Mercury.Snippet(name, @uniqueId(), options)
     @all.push(instance)
     return instance
 
+  @uniqueId: ->
+    [i, identity] = [0, "snippet_0"]
+    identities = (snippet.identity for snippet in @all)
+
+    while identities.indexOf(identity) isnt -1
+      i += 1
+      identity = "snippet_#{i}"
+
+    return identity
+
 
   @find: (identity) ->
     for snippet in @all
@@ -32,7 +52,7 @@ class @Mercury.Snippet
 
   @load: (snippets) ->
     for own identity, details of snippets
-      instance = new Mercury.Snippet(details.name, identity, details.options)
+      instance = new Mercury.Snippet(details.name, identity, details)
       @all.push(instance)
 
 
@@ -66,7 +86,7 @@ class @Mercury.Snippet
 
 
   loadPreview: (element, callback = null) ->
-    jQuery.ajax Mercury.config.snippets.previewUrl.replace(':name', @name), {
+    jQuery.ajax Snippet.previewUrl(@name), {
       headers: Mercury.ajaxHeaders()
       type: Mercury.config.snippets.method
       data: @options
@@ -81,7 +101,7 @@ class @Mercury.Snippet
 
   displayOptions: ->
     Mercury.snippet = @
-    Mercury.modal Mercury.config.snippets.optionsUrl.replace(':name', @name), {
+    Mercury.modal Snippet.optionsUrl(@name), {
       title: 'Snippet Options',
       handler: 'insertSnippet',
       loadType: Mercury.config.snippets.method,
@@ -107,7 +127,6 @@ class @Mercury.Snippet
 
 
   serialize: ->
-    return {
-      name: @name
-      options: @options
-    }
+    return $.extend({name: @name}, @options )
+
+

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

@@ -89,32 +89,47 @@ class @Mercury.Toolbar.Button
 
     @element.on 'click', (event) =>
       if @element.closest('.disabled').length then return
+      @handleClick(event)
 
-      handled = false
-      for own type, mixed of @handled
-        switch type
-          when 'toggle'
-            @togglePressed() unless @handled.mode
 
-          when 'mode'
-            handled = true
-            Mercury.trigger('mode', {mode: mixed})
+  handleClick: (event) ->
+    handled = false
+    for own type, mixed of @handled
+      switch type
+        when 'toggle'
+          @togglePressed() unless @handled.mode
+
+        when 'mode'
+          handled = true
+          Mercury.trigger('mode', {mode: mixed})
+
+        when 'modal'
+          handled = @handleModal(event)
+
+        when 'lightview'
+          handled = @handleLightview(event)
+
+        when 'palette', 'select', 'panel'
+          handled = @handleDialog(event, type)
+
+    Mercury.trigger('action', {action: @name}) unless handled
+    Mercury.trigger('focus:frame') if @options['regions'] && @options['regions'].length
+
+
+  handleModal: (event) ->
+    Mercury.modal(@handled.modal, {title: @summary || @title, handler: @name})
+    return true
 
-          when 'modal'
-            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})
+  handleLightview: (event) ->
+    Mercury.lightview(@handled.lightview, {title: @summary || @title, handler: @name, closeButton: true})
+    return true
 
-          when 'palette', 'select', 'panel'
-            event.stopPropagation()
-            handled = true
-            @handled[type].toggle()
 
-      Mercury.trigger('action', {action: @name}) unless handled
-      Mercury.trigger('focus:frame') if @options['regions'] && @options['regions'].length
+  handleDialog: (event, type) ->
+    event.stopPropagation()
+    @handled[type].toggle()
+    return true
 
 
   defaultDialogOptions: ->