mercury-rails 0.1.1 → 0.1.2

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

@@ -2,7 +2,7 @@
   Mercury.modal.show(url, options)
   return Mercury.modal
 
-$.extend Mercury.modal, {
+jQuery.extend Mercury.modal, {
 
   minWidth: 400
 
@@ -20,18 +20,18 @@ $.extend Mercury.modal, {
 
 
   build: ->
-    @element = $('<div>', {class: 'mercury-modal loading'})
+    @element = jQuery('<div>', {class: 'mercury-modal loading'})
     @element.html('<h1 class="mercury-modal-title"><span></span><a>&times;</a></h1>')
     @element.append('<div class="mercury-modal-content-container"><div class="mercury-modal-content"></div></div>')
 
-    @overlay = $('<div>', {class: 'mercury-modal-overlay'})
+    @overlay = jQuery('<div>', {class: 'mercury-modal-overlay'})
 
     @titleElement = @element.find('.mercury-modal-title')
     @contentContainerElement = @element.find('.mercury-modal-content-container')
     @contentElement = @element.find('.mercury-modal-content')
 
-    @element.appendTo($(@options.appendTo).get(0) ? 'body')
-    @overlay.appendTo($(@options.appendTo).get(0) ? 'body')
+    @element.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
+    @overlay.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
 
     @titleElement.find('span').html(@options.title)
 
@@ -62,7 +62,7 @@ $.extend Mercury.modal, {
     # TODO: resizing is a bit shitty when the modal has panes and is scrollable
     visibility = if keepVisible then 'visible' else 'hidden'
 
-    viewportHeight = $(window).height()
+    viewportHeight = jQuery(window).height()
     titleHeight = @titleElement.outerHeight()
 
     width = @contentElement.outerWidth()
@@ -75,7 +75,7 @@ $.extend Mercury.modal, {
     width = @minWidth if width < @minWidth
     height = viewportHeight - 20 if height > viewportHeight - 20 || @options.fullHeight
 
-    @element.stop().animate {left: ($(window).width() - width) / 2, width: width, height: height}, 200, 'easeInOutSine', =>
+    @element.stop().animate {left: (jQuery(window).width() - width) / 2, width: width, height: height}, 200, 'easeInOutSine', =>
       @contentElement.css({visibility: 'visible', display: 'block'})
       if @contentPane.length
         @contentElement.css({height: height - titleHeight, overflow: 'visible'})
@@ -87,8 +87,8 @@ $.extend Mercury.modal, {
 
 
   position: ->
-    viewportWidth = $(window).width()
-    viewportHeight = $(window).height()
+    viewportWidth = jQuery(window).width()
+    viewportHeight = jQuery(window).height()
 
     @contentPane.css({height: 'auto'}) if @contentPane
     @contentElement.css({height: 'auto'})
@@ -111,9 +111,9 @@ $.extend Mercury.modal, {
 
     @element.css {
       left: (viewportWidth - width) / 2
-      width: width,
-      height: height,
-      display: if @visible then 'block' else 'none',
+      width: width
+      height: height
+      display: if @visible then 'block' else 'none'
       visibility: 'visible'
     }
 
@@ -127,7 +127,7 @@ $.extend Mercury.modal, {
   load: ->
     @element.addClass('loading')
     @setTitle()
-    $.ajax @url, {
+    jQuery.ajax @url, {
       type: @options.loadType || 'get'
       data: @options.loadData
       success: (data) => @loadContent(data)

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

@@ -1,6 +1,6 @@
-@Mercury.modalHandlers.htmleditor = ->
+@Mercury.modalHandlers.htmlEditor = ->
   # fill the text area with the content
-  @element.find('textarea').val(Mercury.region.html(null, true, false))
+  @element.find('textarea').val(Mercury.region.content(null, true, false))
 
   # replace the contents on form submit
   @element.find('form').submit (event) =>

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

@@ -1,4 +1,4 @@
-@Mercury.modalHandlers.insertcharacter = ->
+@Mercury.modalHandlers.insertCharacter = ->
   @element.find('.character').click ->
-    Mercury.trigger('action', {action: 'insertHTML', value: "&#{$(@).attr('data-entity')};"})
+    Mercury.trigger('action', {action: 'insertHTML', value: "&#{jQuery(@).attr('data-entity')};"})
     Mercury.modal.hide()

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

@@ -1,10 +1,10 @@
-@Mercury.modalHandlers.insertlink = ->
+@Mercury.modalHandlers.insertLink = ->
   # make the inputs work with the radio buttons
   @element.find('label input').click (event) ->
-    $(@).closest('label').next('.selectable').focus()
+    jQuery(@).closest('label').next('.selectable').focus()
 
   @element.find('.selectable').focus ->
-    $(@).prev('label').find('input[type=radio]').prop("checked", true)
+    jQuery(@).prev('label').find('input[type=radio]').prop("checked", true)
 
   # show/hide the link target options on target change
   @element.find('#link_target').change =>
@@ -14,8 +14,8 @@
 
   # fill the existing bookmark select
   bookmarkSelect = @element.find('#link_existing_bookmark')
-  for link in $('a[name]', window.mercuryInstance.document)
-    bookmarkSelect.append($('<option>', {value: $(link).attr('name')}).text($(link).text()))
+  for link in jQuery('a[name]', window.mercuryInstance.document)
+    bookmarkSelect.append(jQuery('<option>', {value: jQuery(link).attr('name')}).text(jQuery(link).text()))
 
   # get the selection and initialize its information into the form
   if Mercury.region && Mercury.region.selection
@@ -76,7 +76,7 @@
           menubar: 'no',
           toolbar: 'no'
         }
-        attrs['href'] = "javascript:void(window.open('#{attrs['href']}', 'popup_window', '#{$.param(args).replace(/&/g, ',')}'))"
+        attrs['href'] = "javascript:void(window.open('#{attrs['href']}', 'popup_window', '#{jQuery.param(args).replace(/&/g, ',')}'))"
       else attrs['target'] = target if target
 
     value = {tagName: 'a', attrs: attrs, content: content}
@@ -86,4 +86,4 @@
     else
       Mercury.trigger('action', {action: 'insertLink', value: value})
 
-    @hide()
+    @hide()

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

@@ -1,10 +1,10 @@
-@Mercury.modalHandlers.insertmedia = ->
+@Mercury.modalHandlers.insertMedia = ->
   # make the inputs work with the radio buttons, and options
   @element.find('label input').click (event) ->
-    $(@).closest('label').next('.selectable').focus()
+    jQuery(@).closest('label').next('.selectable').focus()
 
   @element.find('.selectable').focus (event) =>
-    element = $(event.target)
+    element = jQuery(event.target)
     element.prev('label').find('input[type=radio]').prop("checked", true)
 
     @element.find(".media-options").hide()
@@ -50,7 +50,7 @@
 
       when 'youtube_url'
         code = @element.find('#media_youtube_url').val().replace('http://youtu.be/', '')
-        value = $('<iframe>', {
+        value = jQuery('<iframe>', {
           width: @element.find('#media_youtube_width').val() || 560,
           height: @element.find('#media_youtube_height').val() || 349,
           src: "http://www.youtube.com/embed/#{code}?wmode=transparent",
@@ -61,7 +61,7 @@
 
       when 'vimeo_url'
         code = @element.find('#media_vimeo_url').val().replace('http://vimeo.com/', '')
-        value = $('<iframe>', {
+        value = jQuery('<iframe>', {
           width: @element.find('#media_vimeo_width').val() || 400,
           height: @element.find('#media_vimeo_height').val() || 225,
           src: "http://player.vimeo.com/video/#{code}?title=1&byline=1&portrait=0&color=ffffff",

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

@@ -1,4 +1,4 @@
-@Mercury.modalHandlers.insertsnippet = ->
+@Mercury.modalHandlers.insertSnippet = ->
   @element.find('form').submit (event) =>
     event.preventDefault()
     serializedForm = @element.find('form').serializeObject()
@@ -8,5 +8,5 @@
       Mercury.snippet = null
     else
       snippet = Mercury.Snippet.create(@options.snippetName, serializedForm)
-    Mercury.trigger('action', {action: 'insertsnippet', value: snippet})
+    Mercury.trigger('action', {action: 'insertSnippet', value: snippet})
     @hide()

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

@@ -1,9 +1,9 @@
-@Mercury.modalHandlers.inserttable = ->
+@Mercury.modalHandlers.insertTable = ->
   table = @element.find('#table_display table')
 
   # make td's selectable
   table.click (event) =>
-    cell = $(event.target)
+    cell = jQuery(event.target)
     table = cell.closest('table')
     table.find('.selected').removeClass('selected')
     cell.addClass('selected')
@@ -16,19 +16,18 @@
 
   # make the buttons work
   @element.find('input.action').click (event) =>
-    action = $(event.target).attr('name')
+    action = jQuery(event.target).attr('name')
     switch action
-
-      when 'insertrowbefore' then Mercury.tableEditor.addRow('before')
-      when 'insertrowafter' then Mercury.tableEditor.addRow('after')
-      when 'deleterow' then Mercury.tableEditor.removeRow()
-      when 'insertcolumnbefore' then Mercury.tableEditor.addColumn('before')
-      when 'insertcolumnafter' then Mercury.tableEditor.addColumn('after')
-      when 'deletecolumn' then Mercury.tableEditor.removeColumn()
-      when 'increasecolspan' then Mercury.tableEditor.increaseColspan()
-      when 'decreasecolspan' then Mercury.tableEditor.decreaseColspan()
-      when 'increaserowspan' then Mercury.tableEditor.increaseRowspan()
-      when 'decreaserowspan' then Mercury.tableEditor.decreaseRowspan()
+      when 'insertRowBefore' then Mercury.tableEditor.addRow('before')
+      when 'insertRowAfter' then Mercury.tableEditor.addRow('after')
+      when 'deleteRow' then Mercury.tableEditor.removeRow()
+      when 'insertColumnBefore' then Mercury.tableEditor.addColumn('before')
+      when 'insertColumnAfter' then Mercury.tableEditor.addColumn('after')
+      when 'deleteColumn' then Mercury.tableEditor.removeColumn()
+      when 'increaseColspan' then Mercury.tableEditor.increaseColspan()
+      when 'decreaseColspan' then Mercury.tableEditor.decreaseColspan()
+      when 'increaseRowspan' then Mercury.tableEditor.increaseRowspan()
+      when 'decreaseRowspan' then Mercury.tableEditor.decreaseRowspan()
 
   # set the alignment
   @element.find('#table_alignment').change =>
@@ -48,7 +47,7 @@
     table.find('.selected').removeClass('selected')
     table.find('td, th').html(' ')
 
-    html = $('<div>').html(table).html()
+    html = jQuery('<div>').html(table).html()
     value = html.replace(/^\s+|\n/gm, '').replace(/(<\/.*?>|<table.*?>|<tbody>|<tr>)/g, '$1\n')
 
     Mercury.trigger('action', {action: 'insertHTML', value: value})

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

@@ -12,6 +12,7 @@ String::toHex = ->
 String::singleDiff = (that) ->
   diff = ''
   for char, index in that
+    break if char == 'each'
     if char != @[index]
       re = new RegExp(@substr(index).regExpEscape().replace(/^\s+|^( )+/g, '') + '$', 'm')
       diff = that.substr(index).replace(re, '')
@@ -26,7 +27,7 @@ String::regExpEscape = ->
 
 
 String::sanitizeHTML = ->
-  element = $('<div>').html(@.toString())
+  element = jQuery('<div>').html(@.toString())
   element.find('style').remove()
   content = element.text()
   content = content.replace(/\n+/g, '<br/>').replace(/.*<!--.*-->/g, '').replace(/^(<br\/>)+|(<br\/>\s*)+$/g, '')

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

@@ -10,15 +10,16 @@ class @Mercury.PageEditor
     window.mercuryInstance = @
     @regions = []
     @initializeInterface()
-    Mercury.csrfToken = token if token = $('meta[name="csrf-token"]').attr('content')
+    Mercury.csrfToken = token if token = jQuery('meta[name="csrf-token"]').attr('content')
 
 
   initializeInterface: ->
-    @focusableElement = $('<input>', {type: 'text', style: 'position:absolute;opacity:0'}).appendTo(@options.appendTo ? 'body')
-    @iframe = $('<iframe>', {class: 'mercury-iframe', seamless: 'true', frameborder: '0', src: 'about:blank', style: 'position:absolute;top:0;width:100%;visibility:hidden'})
+    @focusableElement = jQuery('<input>', {type: 'text', style: 'position:absolute;opacity:0'}).appendTo(@options.appendTo ? 'body')
+    @iframe = jQuery('<iframe>', {class: 'mercury-iframe', seamless: 'true', frameborder: '0', src: 'about:blank', style: 'position:absolute;top:0;width:100%;visibility:hidden'})
+    @iframe.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
+
     @iframe.load => @initializeFrame()
-    @iframe.attr('src', @iframeSrc())
-    @iframe.appendTo($(@options.appendTo).get(0) ? 'body')
+    @iframe.get(0).contentWindow.document.location.href = @iframeSrc()
 
     @toolbar = new Mercury.Toolbar(@options)
     @statusbar = new Mercury.Statusbar(@options)
@@ -28,14 +29,14 @@ class @Mercury.PageEditor
     try
       return if @iframe.data('loaded')
       @iframe.data('loaded', true)
-      @document = $(@iframe.get(0).contentWindow.document)
-      $("<style mercury-styles=\"true\">").html(Mercury.config.injectedStyles).appendTo(@document.find('head'))
+      @document = jQuery(@iframe.get(0).contentWindow.document)
+      jQuery("<style mercury-styles=\"true\">").html(Mercury.config.injectedStyles).appendTo(@document.find('head'))
 
       # jquery: make jQuery evaluate scripts within the context of the iframe window -- note that this means that we
       # can't use eval in mercury (eg. script tags in ajax responses) because it will eval in the wrong context (you can
       # use top.Mercury though, if you keep it in mind)
       iframeWindow = @iframe.get(0).contentWindow
-      $.globalEval = (data) -> (iframeWindow.execScript || (data) -> iframeWindow["eval"].call(iframeWindow, data))(data) if (data && /\S/.test(data))
+      jQuery.globalEval = (data) -> (iframeWindow.execScript || (data) -> iframeWindow["eval"].call(iframeWindow, data))(data) if (data && /\S/.test(data))
 
       @bindEvents()
       @initializeRegions()
@@ -47,7 +48,7 @@ class @Mercury.PageEditor
 
 
   initializeRegions: ->
-    @buildRegion($(region)) for region in $('.mercury-region', @document)
+    @buildRegion(jQuery(region)) for region in jQuery('.mercury-region', @document)
     for region in @regions
       if region.focus
         region.focus()
@@ -71,51 +72,50 @@ class @Mercury.PageEditor
 
 
   bindEvents: ->
-    Mercury.bind 'initialize:frame', => setTimeout(@initializeFrame, 100)
+    Mercury.bind 'initialize:frame', => setTimeout(@initializeFrame, 1000)
     Mercury.bind 'focus:frame', => @iframe.focus()
     Mercury.bind 'focus:window', => setTimeout((=> @focusableElement.focus()), 10)
 
     Mercury.bind 'action', (event, options) =>
-      @save() if options.action == 'save'
+       @save() if options.action == 'save'
 
     @document.mousedown (event) ->
       Mercury.trigger('hide:dialogs')
-      Mercury.trigger('unfocus:regions') unless $(event.target).closest('.mercury-region').get(0) == Mercury.region.element.get(0)
+      Mercury.trigger('unfocus:regions') unless jQuery(event.target).closest('.mercury-region').get(0) == Mercury.region.element.get(0)
 
-    $(window).resize => @resize()
+    jQuery(window).resize => @resize()
     window.onbeforeunload = @beforeUnload
 
 
   resize: ->
-    width = $(window).width()
-    height = $(window).height()
+    width = jQuery(window).width()
+    height = @statusbar.top()
     toolbarHeight = @toolbar.height()
-    statusbarHeight = @statusbar.height()
 
-    Mercury.displayRect = {top: toolbarHeight, left: 0, width: width, height: height - statusbarHeight - toolbarHeight}
+    Mercury.displayRect = {top: toolbarHeight, left: 0, width: width, height: height - toolbarHeight}
 
     @iframe.css {
-      top: toolbarHeight,
-      width: width,
-      height: height - statusbarHeight - toolbarHeight
+      top: toolbarHeight
+      left: 0
+      height: height - toolbarHeight
     }
 
     Mercury.trigger('resize')
 
 
   iframeSrc: (url = null) ->
-    (url ? window.location.href).replace(/([http|https]:\/\/.[^\/]*)\/edit\/?(.*)/i, "$1/$2")
+    (url ? window.location.href).replace(/([http|https]:\/\/.[^\/]*)\/editor\/?(.*)/i, "$1/$2")
 
 
   hijackLinks: ->
-    for link in $('a', @document)
+    for link in jQuery('a', @document)
       ignored = false
       for classname in @options.ignoredLinks || []
-        if $(link).hasClass(classname)
+        if jQuery(link).hasClass(classname)
           ignored = true
           continue
-      if !ignored && (link.target == '' || link.target == '_self') && !$(link).closest('.mercury-region').length
-        $(link).attr('target', '_top')
+      if !ignored && (link.target == '' || link.target == '_self') && !jQuery(link).closest('.mercury-region').length
+        jQuery(link).attr('target', '_top')
 
 
   beforeUnload: ->
@@ -128,8 +128,8 @@ class @Mercury.PageEditor
     url = @saveUrl ? @iframeSrc()
     data = @serialize()
     Mercury.log('saving', data)
-    data = $.toJSON(data) unless @options.saveStyle == 'form'
-    $.ajax url, {
+    data = jQuery.toJSON(data) unless @options.saveStyle == 'form'
+    jQuery.ajax url, {
       type: 'POST'
       data: {content: data}
       success: =>

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

@@ -5,8 +5,8 @@ class @Mercury.Palette extends Mercury.Dialog
 
 
   build: ->
-    @element = $('<div>', {class: "mercury-palette mercury-#{@name}-palette loading", style: 'display:none'})
-    @element.appendTo($(@options.appendTo).get(0) ? 'body')
+    @element = jQuery('<div>', {class: "mercury-palette mercury-#{@name}-palette loading", style: 'display:none'})
+    @element.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
 
 
   bindEvents: ->
@@ -19,11 +19,11 @@ class @Mercury.Palette extends Mercury.Dialog
     position = @button.offset()
     width = @element.width()
 
-    position.left = position.left - width + @button.width() if position.left + width > $(window).width()
+    position.left = position.left - width + @button.width() if position.left + width > jQuery(window).width()
 
     @element.css {
-      top: position.top + @button.height(),
-      left: position.left,
-      display: if keepVisible then 'block' else 'none',
+      top: position.top + @button.height()
+      left: position.left
+      display: if keepVisible then 'block' else 'none'
       visibility: 'visible'
     }

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

@@ -5,11 +5,11 @@ class @Mercury.Panel extends Mercury.Dialog
 
 
   build: ->
-    @element = $('<div>', {class: 'mercury-panel loading', style: 'display:none;'})
-    @titleElement = $("<h1>#{@options.title}</h1>").appendTo(@element)
-    @paneElement = $('<div>', {class: 'mercury-panel-pane'}).appendTo(@element)
+    @element = jQuery('<div>', {class: 'mercury-panel loading', style: 'display:none;'})
+    @titleElement = jQuery("<h1>#{@options.title}</h1>").appendTo(@element)
+    @paneElement = jQuery('<div>', {class: 'mercury-panel-pane'}).appendTo(@element)
 
-    @element.appendTo($(@options.appendTo).get(0) ? 'body');
+    @element.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
 
 
   bindEvents: ->

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

@@ -36,7 +36,7 @@ class @Mercury.Region
     @element.mousemove (event) =>
       return if @previewing
       return unless Mercury.region == @
-      snippet = $(event.target).closest('.mercury-snippet')
+      snippet = jQuery(event.target).closest('.mercury-snippet')
       if snippet.length
         @snippet = snippet
         Mercury.trigger('show:toolbar', {type: 'snippet', snippet: @snippet})
@@ -46,17 +46,17 @@ class @Mercury.Region
       Mercury.trigger('hide:toolbar', {type: 'snippet', immediately: false})
 
 
-  html: (value = null, filterSnippets = false) ->
+  content: (value = null, filterSnippets = false) ->
     if value != null
       @element.html(value)
     else
       # sanitize the html before we return it
-      container = $('<div>').appendTo(@document.createDocumentFragment())
+      container = jQuery('<div>').appendTo(@document.createDocumentFragment())
       container.html(@element.html().replace(/^\s+|\s+$/g, ''))
 
       # replace snippet contents to be an identifier
       if filterSnippets then for snippet, index in container.find('.mercury-snippet')
-        snippet = $(snippet)
+        snippet = jQuery(snippet)
         snippet.attr({contenteditable: null, 'data-version': null})
         snippet.html("[#{snippet.data('snippet')}]")
 
@@ -83,21 +83,21 @@ class @Mercury.Region
 
 
   pushHistory: ->
-    @history.push(@html())
+    @history.push(@content())
 
 
   snippets: ->
     snippets = {}
     for element in @element.find('[data-snippet]')
-      snippet = Mercury.Snippet.find($(element).data('snippet'))
-      snippet.setVersion($(element).data('version'))
+      snippet = Mercury.Snippet.find(jQuery(element).data('snippet'))
+      snippet.setVersion(jQuery(element).data('version'))
       snippets[snippet.identity] = snippet.serialize()
     return snippets
 
 
   serialize: ->
     return {
-      type: @type,
-      value: @html(null, true)
+      type: @type
+      value: @content(null, true)
       snippets: @snippets()
     }