kiteditor 1.0.12 → 1.0.13

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

@@ -1,10 +1,16 @@
-class @Mercury.Regions.Markdown extends Mercury.Region
+# todo:
+# context for the toolbar buttons and groups needs to change so we can do the following:
+# how to handle context for buttons?  if the cursor is within a bold area (**bo|ld**), or selecting it -- it would be
+# nice if we could activate the bold button for instance.
+
+class @Mercury.Regions.Markupable extends Mercury.Region
   @supported: document.getElementById
-  @supportedText: "Chrome 10+, Firefox 4+, IE 7+, Safari 5+, Opera 8+"
-  type = 'markdown'
-  type: -> type
+  @supportedText: "IE 7+, Chrome 10+, Firefox 4+, Safari 5+, Opera 8+"
+
+  type = 'markupable'
 
   constructor: (@element, @window, @options = {}) ->
+    @type = 'markupable'
     super
     @converter = new Showdown.converter()
 
@@ -12,18 +18,13 @@ class @Mercury.Regions.Markdown extends Mercury.Region
   build: ->
     width = '100%'
     height = @element.height()
-    value = @element.html().replace(/^\s+|\s+$/g, '').replace('>', '>')
-
-    @textarea = jQuery('<textarea>', @document).val(value).addClass('mercury-textarea')
-    @textarea.css
-      border: 0
-      background: 'transparent'
-      display: 'block'
-      'overflow-y': 'hidden'
-      width: width
-      height: height
-      fontFamily: '"Courier New", Courier, monospace'
 
+    value = @element.html().replace(/^\s+|\s+$/g, '').replace('&gt;', '>')
+    @element.removeClass(Mercury.config.regions.className)
+    @textarea = jQuery('<textarea>', @document).val(value)
+    @textarea.attr('class', @element.attr('class')).addClass('mercury-textarea')
+    @textarea.css({border: 0, background: 'transparent', display: 'block', 'overflow-y': 'hidden', width: width, height: height, fontFamily: '"Courier New", Courier, monospace'})
+    @element.addClass(Mercury.config.regions.className)
     @element.empty().append(@textarea)
 
     @previewElement = jQuery('<div>', @document)
@@ -34,12 +35,6 @@ 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 == @
@@ -71,7 +66,7 @@ class @Mercury.Regions.Markdown extends Mercury.Region
       if Mercury.snippet
         event.preventDefault()
         @focus()
-        Mercury.Snippet.displayOptionsFor(Mercury.snippet.name, {}, Mercury.snippet.hasOptions)
+        Mercury.Snippet.displayOptionsFor(Mercury.snippet)
 
       # handle any files that were dropped
       if event.originalEvent.dataTransfer.files.length
@@ -169,13 +164,13 @@ class @Mercury.Regions.Markdown extends Mercury.Region
   togglePreview: ->
     if @previewing
       @previewing = false
-      @container.attr(Mercury.config.regions.attribute, type)
+      @container.addClass(Mercury.config.regions.className).removeClass("#{Mercury.config.regions.className}-preview")
       @previewElement.hide()
       @element.show()
       @focus() if Mercury.region == @
     else
       @previewing = true
-      @container.removeAttr(Mercury.config.regions.attribute)
+      @container.addClass("#{Mercury.config.regions.className}-preview").removeClass(Mercury.config.regions.className)
       value = @converter.makeHtml(@element.val())
       @previewElement.html(value)
       @previewElement.show()
@@ -186,7 +181,7 @@ class @Mercury.Regions.Markdown extends Mercury.Region
   execCommand: (action, options = {}) ->
     super
 
-    handler.call(@, @selection(), options) if handler = Mercury.Regions.Markdown.actions[action]
+    handler.call(@, @selection(), options) if handler = Mercury.Regions.Markupable.actions[action]
     @resize()
 
 
@@ -205,7 +200,7 @@ class @Mercury.Regions.Markdown extends Mercury.Region
       @history.push(@contentAndSelection())
     else if keyCode
       # set a timeout for pushing to the history
-      @historyTimeout = setTimeout((=> @history.push(@contentAndSelection())), waitTime * 1000)
+      @historyTimeout = setTimeout(waitTime * 1000, => @history.push(@contentAndSelection()))
     else
       # push to the history immediately
       @history.push(@contentAndSelection())
@@ -214,7 +209,7 @@ class @Mercury.Regions.Markdown extends Mercury.Region
 
 
   selection: ->
-    return new Mercury.Regions.Markdown.Selection(@element)
+    return new Mercury.Regions.Markupable.Selection(@element)
 
 
   resize: ->
@@ -266,7 +261,7 @@ class @Mercury.Regions.Markdown extends Mercury.Region
       }
       selection.unWrapLine("#{wrapper[0]}", "#{wrapper[1]}") for wrapperName, wrapper of wrappers
       if options.value == 'blockquote'
-        Mercury.Regions.Markdown.actions.indent.call(@, selection, options)
+        Mercury.Regions.Markupable.actions.indent.call(@, selection, options)
         return
       selection.wrapLine("#{wrappers[options.value][0]}", "#{wrappers[options.value][1]}")
 
@@ -294,7 +289,7 @@ class @Mercury.Regions.Markdown extends Mercury.Region
 
 
 # Helper class for managing selection and getting information from it
-class Mercury.Regions.Markdown.Selection
+class Mercury.Regions.Markupable.Selection
 
   constructor: (@element) ->
     @el = @element.get(0)

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

@@ -1,11 +1,16 @@
+# todo:
+
+# how to handle context for buttons?  if the cursor is within a bold area (**bo|ld**), or selecting it -- it would be
+# nice if we could activate the bold button for instance.
+
 class @Mercury.Regions.Simple extends Mercury.Region
   @supported: document.getElementById
-  @supportedText: "Chrome 10+, Firefox 4+, IE 7+, Safari 5+, Opera 8+"
+  @supportedText: "IE 7+, Chrome 10+, Firefox 4+, Safari 5+, Opera 8+"
+
   type = 'simple'
-  type: -> type
 
   constructor: (@element, @window, @options = {}) ->
-    Mercury.log("building #{type}", @element, @options)
+    @type = 'simple'
     super
 
 
@@ -18,7 +23,9 @@ class @Mercury.Regions.Simple extends Mercury.Region
       height = @element.height() # 'auto'
 
     value = @element.text()
-    @textarea = jQuery('<textarea>', @document).val(value).addClass('mercury-textarea')
+    @element.removeClass(Mercury.config.regions.className)
+    @textarea = jQuery('<textarea>', @document).val(value)
+    @textarea.attr('class', @element.attr('class')).addClass('mercury-textarea')
     @textarea.css
       border: 0
       background: 'transparent'
@@ -37,7 +44,7 @@ class @Mercury.Regions.Simple extends Mercury.Region
       display: 'inherit'
       lineHeight: 'inherit'
       textAlign: 'inherit'
-
+    @element.addClass(Mercury.config.regions.className)
     @element.empty().append(@textarea)
 
     @container = @element
@@ -60,10 +67,31 @@ class @Mercury.Regions.Simple extends Mercury.Region
       @container.removeClass('focus')
       Mercury.trigger('region:blurred', {region: @})
 
-    @bindElementEvents()
+    @element.on 'dragenter', (event) =>
+      return if @previewing
+      event.preventDefault()
+      event.originalEvent.dataTransfer.dropEffect = 'copy'
+
+    @element.on 'dragover', (event) =>
+      return if @previewing
+      event.preventDefault()
+      event.originalEvent.dataTransfer.dropEffect = 'copy'
 
+    @element.on 'drop', (event) =>
+      return if @previewing
+
+      # handle dropping snippets
+      if Mercury.snippet
+        event.preventDefault()
+        @focus()
+        Mercury.Snippet.displayOptionsFor(Mercury.snippet)
+
+      # handle any files that were dropped
+      if event.originalEvent.dataTransfer.files.length
+        event.preventDefault()
+        @focus()
+        Mercury.uploader(event.originalEvent.dataTransfer.files[0])
 
-  bindElementEvents: ->
     @element.on 'focus', =>
       return if @previewing
       Mercury.region = @
@@ -103,6 +131,20 @@ class @Mercury.Regions.Simple extends Mercury.Region
           event.preventDefault()
           @execCommand('insertHTML', {value: '  '})
 
+      if event.metaKey
+        switch event.keyCode
+          when 66 # b
+            @execCommand('bold')
+            event.preventDefault()
+
+          when 73 # i
+            @execCommand('italic')
+            event.preventDefault()
+
+          when 85 # u
+            @execCommand('underline')
+            event.preventDefault()
+
       @pushHistory(event.keyCode)
 
     @element.on 'keyup', =>
@@ -160,14 +202,15 @@ class @Mercury.Regions.Simple extends Mercury.Region
     if @previewing
       @previewing = false
       @element = @container
-      @container.attr(Mercury.config.regions.attribute, type)
       @build()
-      @bindElementEvents()
       @focus() if Mercury.region == @
+      # @container.addClass(Mercury.config.regions.className).removeClass("#{Mercury.config.regions.className}-preview")
+      # @previewElement.hide()
+      # @element.show()
     else
       @previewing = true
+      @container.addClass("#{Mercury.config.regions.className}-preview").removeClass(Mercury.config.regions.className)
       value = jQuery('<div></div>').text(@element.val()).html()
-      @container.removeAttr(Mercury.config.regions.attribute)
       @container.html(value)
       Mercury.trigger('region:blurred', {region: @})
 
@@ -194,7 +237,7 @@ class @Mercury.Regions.Simple extends Mercury.Region
       @history.push(@contentAndSelection())
     else if keyCode
       # set a timeout for pushing to the history
-      @historyTimeout = setTimeout((=> @history.push(@contentAndSelection())), waitTime * 1000)
+      @historyTimeout = setTimeout(waitTime * 1000, => @history.push(@contentAndSelection()))
     else
       # push to the history immediately
       @history.push(@contentAndSelection())

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

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

data/{app → vendor}/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.position()
+    position = @button.offset()
     elementWidth = @element.width()
     elementHeight = @element.height()
     documentHeight = jQuery(document).height()

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

@@ -1,7 +1,6 @@
 class @Mercury.SnippetToolbar extends Mercury.Toolbar
 
   constructor: (@document, @options = {}) ->
-    @_boundEvents = []
     super(@options)
 
 
@@ -9,34 +8,29 @@ 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.snippets
+    for own buttonName, options of Mercury.config.toolbars.snippetable
       button = @buildButton(buttonName, options)
       button.appendTo(@element) if button
 
 
   bindEvents: ->
-    @bindReleasableEvent Mercury, 'show:toolbar', (event, options) =>
+    Mercury.on 'show:toolbar', (event, options) =>
       return unless options.snippet
       options.snippet.mouseout => @hide()
       @show(options.snippet)
 
-    @bindReleasableEvent Mercury, 'hide:toolbar', (event, options) =>
+    Mercury.on '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()
 
-
-  bindReleasableEvent: (target, eventName, handler)->
-    target.on eventName, handler
-    @_boundEvents.push [target, eventName, handler]
+    jQuery(@document).on 'scroll', =>
+      @position() if @visible
 
 
   show: (@snippet) ->
@@ -71,15 +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
-
-  release: ->
-    @element.off()
-    @element.remove()
-    target.off(eventName, handler) for [target, eventName, handler] in @_boundEvents
-    @_boundEvents = []
 

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

@@ -10,14 +10,6 @@ jQuery.extend Mercury.tableEditor,
     @rowCount = @getRowCount()
 
 
-  addColumnBefore: ->
-    @addColumn('before')
-
-
-  addColumnAfter: ->
-    @addColumn('after')
-
-
   addColumn: (position = 'after') ->
     sig = @cellSignatureFor(@cell)
 
@@ -50,14 +42,6 @@ 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/{app → vendor}/assets/javascripts/mercury/toolbar.button.js.coffee

@@ -34,25 +34,25 @@ class @Mercury.Toolbar.Button
 
         when 'palette'
           @element.addClass("mercury-button-palette")
-          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
+          url = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
+          @handled[type] = new Mercury.Palette(url, @name, @defaultDialogOptions())
 
         when 'select'
           @element.addClass("mercury-button-select").find('em').html(@title)
-          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
+          url = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
+          @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
-          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
+          @handled[type] = new Mercury.Panel(url, @name, @defaultDialogOptions())
 
         when 'modal'
-          @handled[type] = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
+          @handled[type] = if jQuery.isFunction(mixed) then mixed.apply(@, @name) else mixed
 
         when 'lightview'
-          @handled[type] = if jQuery.isFunction(mixed) then mixed.call(@, @name) else mixed
+          @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)
 
@@ -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,47 +89,32 @@ 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
 
-  handleModal: (event) ->
-    Mercury.modal(@handled.modal, {title: @summary || @title, handler: @name})
-    return true
+          when 'mode'
+            handled = true
+            Mercury.trigger('mode', {mode: mixed})
 
+          when 'modal'
+            handled = true
+            Mercury.modal(@handled.modal, {title: @summary || @title, handler: @name})
 
-  handleLightview: (event) ->
-    Mercury.lightview(@handled.lightview, {title: @summary || @title, handler: @name, closeButton: true})
-    return true
+          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()
 
-  handleDialog: (event, type) ->
-    event.stopPropagation()
-    @handled[type].toggle()
-    return true
+      Mercury.trigger('action', {action: @name}) unless handled
+      Mercury.trigger('focus:frame') if @options['regions'] && @options['regions'].length
 
 
   defaultDialogOptions: ->

data/{app → vendor}/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/{app → vendor}/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', visibility: 'hidden', display: 'block'})
-    @container.css({visibility: 'visible'})
+    @container.css({whiteSpace: 'normal'})
     @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 jQuery(window).width() == @container.outerWidth() then @trigger.show() else @trigger.hide()
+    if @containerWidth > jQuery(window).width() then @trigger.show() else @trigger.hide()
     @hide()
 
 
   position: (keepVisible) ->
     @element.css({top: 0, left: 0, display: 'block', visibility: 'hidden'})
-    position = @trigger.position()
+    position = @trigger.offset()
     width = @element.width()
 
     position.left = position.left - width + @trigger.width() if position.left + width > jQuery(window).width()

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

@@ -8,7 +8,7 @@ class @Mercury.Toolbar
 
   build: ->
     @element = jQuery('<div>', {class: 'mercury-toolbar-container', style: 'width:10000px'})
-    @element.css({width: '100%'})
+    @element.css({display: 'none'}) unless @visible
     @element.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
 
     for own toolbarName, buttons of Mercury.config.toolbars
@@ -28,7 +28,7 @@ class @Mercury.Toolbar
 
       toolbar.addClass('disabled') if Mercury.config.toolbars['primary'] && toolbarName != 'primary'
 
-    @element.css({display: 'none'}) unless @visible
+    @element.css({width: '100%'})
 
 
   buildButton: (name, options) ->
@@ -56,13 +56,13 @@ class @Mercury.Toolbar
       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
+          toolbar.removeClass('disabled') if regions.split(',').indexOf(options.region.type) > -1
 
     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
+          toolbar.addClass('disabled') if regions.split(',').indexOf(options.region.type) > -1
 
     @element.on 'click', ->
       Mercury.trigger('hide:dialogs')
@@ -71,12 +71,8 @@ class @Mercury.Toolbar
       event.preventDefault()
 
 
-  height: (force = false) ->
-    if @visible || force then @element.outerHeight() else 0
-
-
-  top: ->
-    if @visible then @element.offset().top else 0
+  height: ->
+    if @visible then @element.outerHeight() else 0
 
 
   show: ->