kiteditor 1.0.11 → 1.0.12

data/{vendor/assets/javascripts/mercury/regions/snippetable.js.coffee → app/assets/javascripts/mercury/regions/snippets.js.coffee}

@@ -1,16 +1,17 @@
-class @Mercury.Regions.Snippetable extends Mercury.Region
+class @Mercury.Regions.Snippets extends Mercury.Region
   @supported: document.getElementById
-  @supportedText: "IE 7+, Chrome 10+, Firefox 4+, Safari 5+, Opera 8+"
-
-  type = 'snippetable'
+  @supportedText: "Chrome 10+, Firefox 4+, IE 7+, Safari 5+, Opera 8+"
+  type = 'snippets'
+  type: -> type
 
   constructor: (@element, @window, @options = {}) ->
-    @type = 'snippetable'
+    Mercury.log("building #{type}", @element, @options)
     super
     @makeSortable()
 
 
   build: ->
+    jQuery(snippet).attr('data-version', 0) for snippet in @element.find('[data-snippet]')
     @element.css({minHeight: 20}) if @element.css('minHeight') == '0px'
 
 
@@ -45,7 +46,7 @@ class @Mercury.Regions.Snippetable 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 != @
@@ -77,7 +78,7 @@ class @Mercury.Regions.Snippetable extends Mercury.Region
 
   execCommand: (action, options = {}) ->
     super
-    handler.call(@, options) if handler = Mercury.Regions.Snippetable.actions[action]
+    handler.call(@, options) if handler = Mercury.Regions.Snippets.actions[action]
 
 
   makeSortable: ->
@@ -85,7 +86,7 @@ class @Mercury.Regions.Snippetable extends Mercury.Region
       document: @document,
       scroll: false, #scrolling is buggy
       containment: 'parent',
-      items: '.mercury-snippet',
+      items: '[data-snippet]',
       opacity: 0.4,
       revert: 100,
       tolerance: 'pointer',
@@ -93,7 +94,7 @@ class @Mercury.Regions.Snippetable extends Mercury.Region
         Mercury.trigger('hide:toolbar', {type: 'snippet', immediately: true})
         return true
       stop: =>
-        setTimeout(100, => @pushHistory())
+        setTimeout((=> @pushHistory()), 100)
         return true
     }
 

data/{vendor → 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

@@ -0,0 +1,136 @@
+class @Mercury.Snippet
+
+  @all: []
+
+  @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
+
+
+  @optionsUrl: (name) ->
+    url = Mercury.config.snippets.optionsUrl
+    url = url() if typeof(url) == 'function'
+    return url.replace(':name', name)
+
+
+  @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
+      return snippet if snippet.identity == identity
+    return null
+
+
+  @load: (snippets) ->
+    for own identity, details of snippets
+      instance = new Mercury.Snippet(details.name, identity, details)
+      @all.push(instance)
+
+
+  @clearAll = ->
+    delete @all
+    @all = []
+
+
+  constructor: (@name, @identity, options = {}) ->
+    @version = 0
+    @data = ''
+    @wrapperTag = 'div'
+    @wrapperClass = ''
+    @history = new Mercury.HistoryBuffer()
+    @setOptions(options)
+
+
+  getHTML: (context, callback = null) ->
+    elementClass = "#{@name}-snippet"
+    elementClass += " #{@wrapperClass}" if @wrapperClass
+    element = jQuery("<#{@wrapperTag}>", {
+      class: elementClass
+      contenteditable: "false"
+      'data-snippet': @identity
+      'data-version': @version
+    }, context)
+    element.html("[#{@identity}]")
+    @loadPreview(element, callback)
+    return element
+
+
+  getText: (callback) ->
+    return "[--#{@identity}--]"
+
+
+  loadPreview: (element, callback = null) ->
+    jQuery.ajax Snippet.previewUrl(@name), {
+      headers: Mercury.ajaxHeaders()
+      type: Mercury.config.snippets.method
+      data: @options
+      success: (data) =>
+        @data = data
+        element.html(data)
+        callback() if callback
+      error: =>
+        Mercury.notify('Error loading the preview for the \"%s\" snippet.', @name)
+    }
+
+
+  displayOptions: ->
+    Mercury.snippet = @
+    Mercury.modal Snippet.optionsUrl(@name), {
+      title: 'Snippet Options',
+      handler: 'insertSnippet',
+      loadType: Mercury.config.snippets.method,
+      loadData: @options
+    }
+
+
+  setOptions: (@options) ->
+    delete(@options['authenticity_token'])
+    delete(@options['utf8'])
+    @wrapperTag = @options.wrapperTag if @options.wrapperTag
+    @wrapperClass = @options.wrapperClass if @options.wrapperClass
+    @version += 1
+    @history.push(@options)
+
+
+  setVersion: (version = null) ->
+    version = parseInt(version)
+    if version && @history.stack[version - 1]
+      @version = version
+      @options = @history.stack[version - 1]
+      return true
+    return false
+
+
+  serialize: ->
+    return $.extend({name: @name}, @options )
+
+

data/{vendor → app}/assets/javascripts/mercury/snippet_toolbar.js.coffee

@@ -1,6 +1,7 @@
 class @Mercury.SnippetToolbar extends Mercury.Toolbar
 
   constructor: (@document, @options = {}) ->
+    @_boundEvents = []
     super(@options)
 
 
@@ -8,29 +9,34 @@ class @Mercury.SnippetToolbar extends Mercury.Toolbar
     @element = jQuery('<div>', {class: 'mercury-toolbar mercury-snippet-toolbar', style: 'display:none'})
     @element.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
 
-    for own buttonName, options of Mercury.config.toolbars.snippetable
+    for own buttonName, options of Mercury.config.toolbars.snippets
       button = @buildButton(buttonName, options)
       button.appendTo(@element) if button
 
 
   bindEvents: ->
-    Mercury.on 'show:toolbar', (event, options) =>
+    @bindReleasableEvent Mercury, 'show:toolbar', (event, options) =>
       return unless options.snippet
       options.snippet.mouseout => @hide()
       @show(options.snippet)
 
-    Mercury.on 'hide:toolbar', (event, options) =>
+    @bindReleasableEvent Mercury, 'hide:toolbar', (event, options) =>
       return unless options.type && options.type == 'snippet'
       @hide(options.immediately)
 
+    @bindReleasableEvent jQuery(@document), 'scroll', =>
+      @position() if @visible
+
     @element.mousemove =>
       clearTimeout(@hideTimeout)
 
     @element.mouseout =>
       @hide()
 
-    jQuery(@document).on 'scroll', =>
-      @position() if @visible
+
+  bindReleasableEvent: (target, eventName, handler)->
+    target.on eventName, handler
+    @_boundEvents.push [target, eventName, handler]
 
 
   show: (@snippet) ->
@@ -65,8 +71,15 @@ class @Mercury.SnippetToolbar extends Mercury.Toolbar
       @element.hide()
       @visible = false
     else
-      @hideTimeout = setTimeout 500, =>
+      @hideTimeout = setTimeout =>
         @element.stop().animate {opacity: 0}, 300, 'easeInOutSine', =>
           @element.hide()
         @visible = false
+      , 500
+
+  release: ->
+    @element.off()
+    @element.remove()
+    target.off(eventName, handler) for [target, eventName, handler] in @_boundEvents
+    @_boundEvents = []
 

data/{vendor → app}/assets/javascripts/mercury/table_editor.js.coffee

@@ -10,6 +10,14 @@ jQuery.extend Mercury.tableEditor,
     @rowCount = @getRowCount()
 
 
+  addColumnBefore: ->
+    @addColumn('before')
+
+
+  addColumnAfter: ->
+    @addColumn('after')
+
+
   addColumn: (position = 'after') ->
     sig = @cellSignatureFor(@cell)
 
@@ -42,6 +50,14 @@ jQuery.extend Mercury.tableEditor,
     @setColspanFor(cell, @colspanFor(cell) - 1) for cell in adjusting
 
 
+  addRowBefore: ->
+    @addRow('before')
+
+
+  addRowAfter: ->
+    @addRow('after')
+
+
   addRow: (position = 'after') ->
     newRow = jQuery('<tr>')
 

data/{vendor → app}/assets/javascripts/mercury/toolbar.button.js.coffee

@@ -34,25 +34,25 @@ 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, @defaultDialogOptions())
+          result = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
+          @handled[type] = if typeof result is 'string' then new Mercury.Palette(result, @name, @defaultDialogOptions()) else result
 
         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, @defaultDialogOptions())
+          result = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
+          @handled[type] = if typeof result is 'string' then new Mercury.Select(result, @name, @defaultDialogOptions()) else result
 
         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, @defaultDialogOptions())
+          result = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
+          @handled[type] = if typeof result is 'string' then new Mercury.Panel(result, @name, @defaultDialogOptions()) else result
 
         when 'modal'
-          @handled[type] = if jQuery.isFunction(mixed) then mixed.apply(@, @name) else mixed
+          @handled[type] = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
 
         when 'lightview'
-          @handled[type] = if jQuery.isFunction(mixed) then mixed.apply(@, @name) else mixed
+          @handled[type] = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
 
         else throw Mercury.I18n('Unknown button type \"%s\" used for the \"%s\" button.', type, @name)
 
@@ -72,8 +72,8 @@ class @Mercury.Toolbar.Button
         @element.removeClass('active')
 
     Mercury.on 'region:focused', (event, options) =>
-      if @handled.regions && options.region && options.region.type
-        if @handled.regions.indexOf(options.region.type) > -1
+      if @handled.regions && options.region && options.region.type()
+        if @handled.regions.indexOf(options.region.type()) > -1
           @element.removeClass('disabled')
         else
           @element.addClass('disabled')
@@ -89,32 +89,47 @@ class @Mercury.Toolbar.Button
 
     @element.on 'click', (event) =>
       if @element.closest('.disabled').length then return
+      @handleClick(event)
+
+
+  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
 
-      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})
+  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: ->

data/{vendor → app}/assets/javascripts/mercury/toolbar.button_group.js.coffee

@@ -25,8 +25,8 @@ class @Mercury.Toolbar.ButtonGroup
             @element.addClass('disabled')
 
     Mercury.on 'region:focused', (event, options) =>
-      if @regions && options.region && options.region.type
-        if @regions.indexOf(options.region.type) > -1
+      if @regions && options.region && options.region.type()
+        if @regions.indexOf(options.region.type()) > -1
           @element.removeClass('disabled') unless @options._context
         else
           @element.addClass('disabled')

data/{vendor → app}/assets/javascripts/mercury/toolbar.expander.js.coffee

@@ -2,13 +2,13 @@ class @Mercury.Toolbar.Expander extends Mercury.Palette
 
   constructor: (@name, @options) ->
     @container = @options.for
-    @containerWidth = @container.outerWidth()
     super(null, @name, @options)
     return @element
 
 
   build: ->
-    @container.css({whiteSpace: 'normal'})
+    @container.css({whiteSpace: 'normal', visibility: 'hidden', display: 'block'})
+    @container.css({visibility: 'visible'})
     @trigger = jQuery('<div>', {class: 'mercury-toolbar-expander'}).appendTo(jQuery(@options.appendTo).get(0) ? 'body')
     @element = jQuery('<div>', {class: "mercury-palette mercury-expander mercury-#{@name}-expander", style: 'display:none'})
     @windowResize()
@@ -37,13 +37,13 @@ class @Mercury.Toolbar.Expander extends Mercury.Palette
 
 
   windowResize: ->
-    if @containerWidth > jQuery(window).width() then @trigger.show() else @trigger.hide()
+    if jQuery(window).width() == @container.outerWidth() then @trigger.show() else @trigger.hide()
     @hide()
 
 
   position: (keepVisible) ->
     @element.css({top: 0, left: 0, display: 'block', visibility: 'hidden'})
-    position = @trigger.offset()
+    position = @trigger.position()
     width = @element.width()
 
     position.left = position.left - width + @trigger.width() if position.left + width > jQuery(window).width()