mercury-rails 0.2.3 → 0.3.1

data/vendor/assets/javascripts/mercury/locales/swedish_chef.locale.js.coffee

@@ -0,0 +1,213 @@
+Mercury.I18n['swedish_chef'] =
+  # ## Javascript Strings
+
+  # ### Default Configuration
+  "Save": "Sefe-a"
+  "Save this page": "Sefe-a thees pege-a"
+  "Preview": "Prefeeoo"
+  "Preview this page": "Prefeeoo thees pege-a"
+  "Undo": "Undu"
+  "Undo your last action": "Undu yuoor lest ecshun"
+  "Redo": "Redu"
+  "Redo your last action": "Redu yuoor lest ecshun"
+  "Link": "Leenk"
+  "Insert Link": "Insert Leenk"
+  "Media": "Medeea"
+  "Insert Media (images and videos)": "Insert Medeea (imeges und feedeus)"
+  "Table": "Teble-a"
+  "Insert Table": "Insert Teble-a"
+  "Character": "Cherecter"
+  "Special Characters": "Speceeel Cherecters"
+  "Snippet": "Sneeppet"
+  "Snippet Panel": "Sneeppet Punel"
+  "History": "Heestury"
+  "Page Version History": "Pege-a Ferseeun Heestury"
+  "Notes": "Nutes"
+  "Page Notes": "Pege-a Nutes"
+  "Style": "Style-a"
+  "Block Format": "Bluck Furmet"
+  "Background Color": "Beckgruoond Culur"
+  "Text Color": "Text Culur"
+  "Bold": "Buld"
+  "Italicize": "Iteleecize-a"
+  "Overline": "Ooferleene-a"
+  "Strikethrough": "Streekethruoogh"
+  "Underline": "Underleene-a"
+  "Subscript": "Soobscreept"
+  "Superscript": "Sooperscreept"
+  "Align Left": "Eleegn Lefft"
+  "Center": "Center"
+  "Align Right": "Eleegn Reeght"
+  "Justify Full": "Joosteeffy Fooll"
+  "Unordered List": "Unurdered Leest"
+  "Numbered List": "Noombered Leest"
+  "Decrease Indentation": "Decreese-a Indenteshun"
+  "Increase Indentation": "Increese-a Indenteshun"
+  "Insert Table Row": "Insert Teble-a Roo"
+  "Insert a table row before the cursor": "Insert a teble-a roo beffure-a zee coorsur"
+  "Insert a table row after the cursor": "Insert a teble-a roo effter zee coorsur"
+  "Delete Table Row": "Delete-a Teble-a Roo"
+  "Delete this table row": "Delete-a thees teble-a roo"
+  "Insert Table Column": "Insert Teble-a Culoomn"
+  "Insert a table column before the cursor": "Insert a teble-a culoomn beffure-a zee coorsur"
+  "Insert a table column after the cursor": "Insert a teble-a culoomn effter zee coorsur"
+  "Delete Table Column": "Delete-a Teble-a Culoomn"
+  "Delete this table column": "Delete-a thees teble-a culoomn"
+  "Increase Cell Columns": "Increese-a Cell Culoomns"
+  "Decrease Cell Columns": "Decreese-a Cell Culoomns"
+  "Increase Cell Rows": "Increese-a Cell Roos"
+  "Decrease Cell Rows": "Decreese-a Cell Roos"
+  "Horizontal Rule": "Hureezuntel Roole-a"
+  "Insert a horizontal rule": "Insert a hureezuntel roole-a"
+  "Remove Formatting": "Remufe-a Furmetteeng"
+  "Remove formatting for the selection": "Remufe-a furmetteeng fur zee selecshun"
+  "Edit HTML": "Ideet HTML"
+  "Edit the HTML content": "Ideet zee HTML cuntent"
+  "Edit Snippet Settings": "Ideet Sneeppet Setteengs"
+  "Remove Snippet": "Remufe-a Sneeppet"
+
+  # ### General
+  # Error Messages
+  "Mercury.Regions.%s is unsupported in this client. Supported browsers are %s.": "Mercury.Regions.%s is unsooppurted in thees cleeent. Sooppurted broosers ere-a %s Bork Bork Bork!"
+  "Mercury.PageEditor can only be instantiated once.": "Mercury.PageEditor cun oonly be-a instunteeeted oonce-a. Bork Bork Bork!"
+  "Opera isn't a fully supported browser, your results may not be optimal.": "Opera isn't a foolly sooppurted brooser, yuoor resoolts mey nut be-a oopteemel."
+  "Mercury.PageEditor failed to load: %s\n\nPlease try refreshing.": "Mercury.PegeEdeetur feeeled tu lued: %s\n\nPleese-a try reffresheeng."
+  "Region type is malformed, no data-type provided, or \"%s\" is unknown for the \"%s\" region.": "Regeeun type-a is melffurmed, nu deta-type-a prufeeded, oor \"%s\" is unknoon fur zee \"%s\" regeeun."
+  "Mercury was unable to save to the url: %s": "Mercury ves uneble-a tu sefe-a tu zee url: %s"
+  # Confirmations
+  "You have unsaved changes.  Are you sure you want to leave without saving them first?": "Yuoo hefe-a unsefed chunges.  Ere-a yuoo soore-a yuoo vunt tu leefe-a veethuoot sefeeng zeem furst?"
+
+  # ### Toolbar / Buttons
+  # Error Messages
+  "Unknown button type \"%s\" used for the \"%s\" button.": "Unknoon boottun type-a \"%s\" used fur zee \"%s\" boottun."
+  "Unknown button structure -- please provide an array, object, or string for \"%s\".": "Unknoon boottun strooctoore-a -- pleese-a prufeede-a un errey, oobject, oor streeng fur \"%s\"."
+
+  # ### Modals / Dialogs / Etc.
+  # Error Messages
+  "Mercury was unable to load %s for the \"%s\" dialog.": "Mercury ves uneble-a tu lued %s fur zee \"%s\" deeelug."
+  "Mercury was unable to load %s for the lightview.": "Mercury ves uneble-a tu lued %s fur zee leeghtfioo."
+  "Mercury was unable to load %s for the modal.": "Mercury ves uneble-a tu lued %s fur zee mudel."
+
+  # ### Snippets
+  # Error Messages
+  "Error loading the preview for the \"%s\" snippet.": "Irrur luedeeng zee prefeeoo fur zee \"%s\" sneeppet."
+  # Misc
+  "Snippet Options": "Sneeppet Oopshuns"
+
+  # ### Uploader
+  # Error Messages
+  "Unable to process response: %s": "Uneble-a tu prucess respunse-a: %s"
+  "Error: Unable to upload the file": "Irrur: Uneble-a tu uplued zee feele-a"
+  "Malformed response from server": "Melffurmed respunse-a frum serfer"
+  "Too large": "Tuu lerge-a"
+  "Unsupported format": "Unsooppurted furmet"
+  # Statuses
+  "Processing...": "Prucesseeng..."
+  "Uploading...": "Upluedeeng..."
+  "Aborted": "Eburted"
+  "Successfully uploaded...": "Sooccessffoolly uplueded..."
+  "Name: %s": "Neme-a: %s"
+  "Size: %s": "Seeze-a: %s"
+  "Type: %s": "Type-a: %s"
+
+  # Inserting Media
+  "Error: The provided youtube share url was invalid.": "Irrur: Zee prufeeded youtube shere-a url ves infeleed."
+  "Error: The provided vimeo url was invalid.": "Irrur: Zee prufeeded vimeo url ves infeleed."
+
+  # Statusbar
+  "Path:": "Pet:"
+
+
+  # ## HTML / Template Strings
+
+  # ### Modals
+  # Insert Link Modal (link.html)
+  "Link Content": "Leenk Cuntent"
+  "Standard Links": "Stunderd Leenks"
+  "URL": "URL"
+  "Index / Bookmark Links": "Index / Buukmerk Leenks"
+  "Existing Links": "Ixeesting Leenks"
+  "Bookmark": "Buukmerk"
+  "Options": "Oopshuns"
+  "Link Target": "Leenk Terget"
+  "Self (the same window or tab)": "Selff (zee seme-a veendoo oor teb)"
+  "Blank (a new window or tab)": "Blunk (a noo veendoo oor teb)"
+  "Top (removes any frames)": "Tup (remufes uny fremes)"
+  "Popup Window (javascript new window popup)": "Pupoop Veendoo (jefescreept noo veendoo pupoop)"
+  "Popup Width": "Pupoop Veedt"
+  "Popup Height": "Pupoop Heeeght"
+  "Insert Link": "Insert Leenk"
+
+  # Insert Media Modal (media.html)
+  "Images": "Imeges"
+  "Videos": "Feedeus"
+  "YouTube Share URL": "YouTube Shere-a URL"
+  "Vimeo URL": "Vimeo URL"
+  "Alignment": "Eleegnment"
+  "None": "Nune-a"
+  "Left": "Lefft"
+  "Right": "Reeght"
+  "Top": "Tup"
+  "Middle": "Meeddle-a"
+  "Bottom": "Buttum"
+  "Absolute Middle": "Ebsuloote-a Meeddle-a"
+  "Absolute Bottom": "Ebsuloote-a Buttum"
+  "Width": "Veedt"
+  "Height": "Heeeght"
+  "Insert Media": "Insert Medeea"
+
+  # Insert Table Modal (table.html)
+  "Rows": "Roos"
+  "Add Before": "Edd Beffure-a"
+  "Add After": "Edd Effter"
+  "Remove": "Remufe-a"
+  "Columns": "Culoomns"
+  "Row Span": "Roo Spun"
+  "Column Span": "Culoomn Spun"
+  "Options": "Oopshuns"
+  "Alignment": "Eleegnment"
+  "Border": "Burder"
+  "Spacing": "Speceeng"
+  "Insert Table": "Insert Teble-a"
+
+  # HTML Editor Modal (htmleditor.html)
+  "HTML Editor": "HTML Ideetur"
+  "Save and Replace": "Sefe-a und Replece-a"
+
+  # ### Dialogs / Etc.
+  # Color Palettes (forecolor.html, backcolor.html)
+  "Last Color Picked": "Lest Culur Peecked"
+
+  # Block Format Select (formatblock.html)
+  "Heading 1": "Heedeeng 1"
+  "Heading 2": "Heedeeng 2"
+  "Heading 3": "Heedeeng 3"
+  "Heading 4": "Heedeeng 4"
+  "Heading 5": "Heedeeng 5"
+  "Heading 6": "Heedeeng 6"
+  "Paragraph": "Peregreph"
+  "Blockquote": "Bluckqooute-a"
+  "Formatted": "Furmetted"
+
+  # About Mercury Panel (about.html)
+  "Project Home": "Pruject Hume-a"
+  "Project Source": "Pruject Suoorce-a"
+
+  # ### Demo / Placeholder / Defaults
+  "The history panel is expected to be implemented with a server back end.  Since this is a demo, we didn't include it.": "Zee heestury punel is ixpected tu be-a implemented veet a serfer beck ind.  Seence-a thees is a demu, ve-a deedn't incloode-a it."
+
+  "The notes panel is expected to be implemented with a server back end.  Since this is a demo, we didn't include it.": "Zee nutes punel is ixpected tu be-a implemented veet a serfer beck ind.  Seence-a thees is a demu, ve-a deedn't incloode-a it."
+
+  "Snippet Name": "Sneeppet Neme-a"
+  "A one or two line long description of what this snippet does.": "A oone-a oor tvu leene-a lung descreepshun ooff vhet thees sneeppet dues."
+
+  "First Name": "Furst Neme-a"
+  "Favorite Beer": "Fefureete-a Beer"
+  "Insert Snippet": "Insert Sneeppet"
+
+
+  # ## Custom Regional Overrides (eg. swedish_chef-BORK)
+  _BORK_:
+    "Save": "Bork!"
+    "Snippet Options": "Bork Oopshuns"
+    "Insert Link": "Bork! Leenk"

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

@@ -1,5 +1,4 @@
 # ## Require all the dependencies
-#= require mercury/dependencies/jquery-1.6
 #= require mercury/dependencies/jquery-ui-1.8.13.custom
 #= require mercury/dependencies/jquery.additions
 #= require mercury/dependencies/jquery.htmlClean
@@ -31,34 +30,80 @@
 #= require_tree ./regions
 #= require_tree ./dialogs
 #= require_tree ./modals
+#= require ./finalize
 #
 @Mercury ||= {}
-jQuery.extend @Mercury, {
-  version: '0.2.3'
-
-  # No IE support yet because it doesn't follow the W3C standards for HTML5 contentEditable (aka designMode).
-  supported: document.getElementById && document.designMode && !jQuery.browser.konqueror && !jQuery.browser.msie
+jQuery.extend @Mercury,
+  version: '0.3.0'
 
   # Mercury object namespaces
-  Regions: {}
-  modalHandlers: {}
-  lightviewHandlers: {}
-  dialogHandlers: {}
-  preloadedViews: {}
+  Regions: Mercury.Regions || {}
+  modalHandlers: Mercury.modalHandlers || {}
+  lightviewHandlers: Mercury.lightviewHandlers || {}
+  dialogHandlers: Mercury.dialogHandlers || {}
+  preloadedViews: Mercury.preloadedViews || {}
+
+  # Custom ajax headers
+  ajaxHeaders: ->
+    headers = {}
+    headers[Mercury.config.csrfHeader] = Mercury.csrfToken
+    return headers
+
 
-  # Custom event and logging methods
-  bind: (eventName, callback) ->
-    jQuery(top).bind("mercury:#{eventName}", callback)
+  # Custom event methods
+  on: (eventName, callback) ->
+    jQuery(window).on("mercury:#{eventName}", callback)
 
 
   trigger: (eventName, options) ->
     Mercury.log(eventName, options)
-    jQuery(top).trigger("mercury:#{eventName}", options)
+    jQuery(window).trigger("mercury:#{eventName}", options)
+
+
+  # Alerting and logging methods
+  notify: (args...) ->
+    window.alert(Mercury.I18n.apply(@, args))
+
+
+  warn: (message, severity = 0) ->
+    if console
+      try console.warn(message)
+      catch e1
+        if severity >= 1
+          try console.debug(message) catch e2
+    else if severity >= 1
+      Mercury.notify(message)
+
+
+  deprecated: (message)->
+    message = "#{message} -- #{console.trace()}" if console && console.trace
+    #throw "deprecated: #{message}"
+    Mercury.warn("deprecated: #{message}", 1)
 
 
   log: ->
     if Mercury.debug && console
       return if arguments[0] == 'hide:toolbar' || arguments[0] == 'show:toolbar'
-      try console.debug(arguments) catch e
+      try console.debug(arguments)
+      catch e
+
+
+  # I18n / Translation methods
+  locale: ->
+    return Mercury.determinedLocale if Mercury.determinedLocale
+    if Mercury.config.localization.enabled
+      locale = []
+      if navigator.language && (locale = navigator.language.toString().split('-')).length
+        topLocale = Mercury.I18n[locale[0]] || {}
+        subLocale = if locale.length > 1 then topLocale["_#{locale[1].toUpperCase()}_"]
+      if !Mercury.I18n[locale[0]]
+        locale = Mercury.config.localization.preferredLocale.split('-')
+        topLocale = Mercury.I18n[locale[0]] || {}
+        subLocale = if locale.length > 1 then topLocale["_#{locale[1].toUpperCase()}_"]
+    return Mercury.determinedLocale = {top: topLocale || {}, sub: subLocale || {}}
+
 
-}
+  I18n: (sourceString, args...) ->
+    locale = Mercury.locale()
+    translation = (locale.sub[sourceString] || locale.top[sourceString] || sourceString || '').toString()
+    return if args.length then translation.printf.apply(translation, args) else translation

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

@@ -2,14 +2,15 @@
   Mercury.modal.show(url, options)
   return Mercury.modal
 
-jQuery.extend Mercury.modal, {
-
+jQuery.extend Mercury.modal,
   minWidth: 400
 
   show: (@url, @options = {}) ->
     Mercury.trigger('focus:window')
     @initialize()
     if @visible then @update() else @appear()
+    if @options.content
+      setTimeout 500, => @loadContent(@options.content)
 
 
   initialize: ->
@@ -28,23 +29,28 @@ jQuery.extend Mercury.modal, {
 
     @titleElement = @element.find('.mercury-modal-title')
     @contentContainerElement = @element.find('.mercury-modal-content-container')
+
     @contentElement = @element.find('.mercury-modal-content')
 
     @element.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
     @overlay.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
 
-    @titleElement.find('span').html(@options.title)
-
 
   bindEvents: ->
-    Mercury.bind 'refresh', => @resize(true)
-    Mercury.bind 'resize', => @position()
+    Mercury.on 'refresh', => @resize(true)
+    Mercury.on 'resize', => @position()
 
-    @overlay.click => @hide()
+    @overlay.on 'click', =>
+      @hide() if @options.allowHideUsingOverlay
 
-    @titleElement.find('a').click => @hide()
+    @titleElement.find('a').on 'click', =>
+      @hide()
 
-    jQuery(document).bind 'keydown', (event) =>
+    @element.on 'ajax:beforeSend', (event, xhr, options) =>
+      options.success = (content) =>
+        @loadContent(content)
+
+    jQuery(document).on 'keydown', (event) =>
        @hide() if event.keyCode == 27 && @visible
 
 
@@ -84,7 +90,7 @@ jQuery.extend Mercury.modal, {
         @contentElement.css({height: height - titleHeight, overflow: 'visible'})
         controlHeight = if @contentControl.length then @contentControl.outerHeight() else 0
         @contentPane.css({height: height - titleHeight - controlHeight - 40})
-        @contentPane.find('.mercury-modal-pane').css({width: width - 40})
+        @contentPane.find('.mercury-display-pane').css({width: width - 40})
       else
         @contentElement.css({height: height - titleHeight, overflow: 'auto'})
 
@@ -107,7 +113,7 @@ jQuery.extend Mercury.modal, {
       @contentElement.css({height: height - titleHeight, overflow: 'visible'})
       controlHeight = if @contentControl.length then @contentControl.outerHeight() else 0
       @contentPane.css({height: height - titleHeight - controlHeight - 40})
-      @contentPane.find('.mercury-modal-pane').css({width: width - 40})
+      @contentPane.find('.mercury-display-pane').css({width: width - 40})
     else
       @contentElement.css({height: height - titleHeight, overflow: 'auto'})
 
@@ -131,15 +137,16 @@ jQuery.extend Mercury.modal, {
     return unless @url
     @element.addClass('loading')
     if Mercury.preloadedViews[@url]
-      setTimeout((=> @loadContent(Mercury.preloadedViews[@url])), 10)
+      setTimeout(10, => @loadContent(Mercury.preloadedViews[@url]))
     else
       jQuery.ajax @url, {
-        type: @options.loadType || 'get'
+        headers: Mercury.ajaxHeaders()
+        type: @options.loadType || 'GET'
         data: @options.loadData
         success: (data) => @loadContent(data)
         error: =>
           @hide()
-          alert("Mercury was unable to load #{@url} for the modal.")
+          Mercury.notify("Mercury was unable to load %s for the modal.", @url)
       }
 
 
@@ -153,18 +160,24 @@ jQuery.extend Mercury.modal, {
     @contentElement.css({display: 'none', visibility: 'hidden'})
 
     # for complex modal content, we provide panes and controls
-    @contentPane = @element.find('.mercury-modal-pane-container')
-    @contentControl = @element.find('.mercury-modal-controls')
+    @contentPane = @element.find('.mercury-display-pane-container')
+    @contentControl = @element.find('.mercury-display-controls')
 
     @options.afterLoad.call(@) if @options.afterLoad
-    if @options.handler && Mercury.modalHandlers[@options.handler]
-      Mercury.modalHandlers[@options.handler].call(@)
+    if @options.handler
+      if Mercury.modalHandlers[@options.handler]
+        Mercury.modalHandlers[@options.handler].call(@)
+      else if Mercury.lightviewHandlers[@options.handler]
+        Mercury.lightviewHandlers[@options.handler].call(@)
 
+    @element.localize(Mercury.locale()) if Mercury.config.localization.enabled
     @resize()
 
 
   setTitle: ->
-    @titleElement.find('span').html(@options.title)
+    @titleElement.find('span').html(Mercury.I18n(@options.title))
+    closeButton = @titleElement.find('a')
+    if @options.closeButton == false then closeButton.hide() else closeButton.show()
 
 
   reset: ->
@@ -174,6 +187,8 @@ jQuery.extend Mercury.modal, {
 
   hide: ->
     return if @showing
+    @options = {}
+    @initialized = false
 
     Mercury.trigger('focus:frame')
     @element.hide()
@@ -181,5 +196,3 @@ jQuery.extend Mercury.modal, {
     @reset()
 
     @visible = false
-
-}

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

@@ -1,11 +1,10 @@
 @Mercury.modalHandlers.htmlEditor = ->
   # fill the text area with the content
   content = Mercury.region.content(null, true, false)
-#  content = jQuery.htmlClean(content, {format: true, replace: [], allowedClasses: ['mercury-snippet']})
   @element.find('textarea').val(content)
 
   # replace the contents on form submit
-  @element.find('form').submit (event) =>
+  @element.find('form').on 'submit', (event) =>
     event.preventDefault()
     value = @element.find('textarea').val().replace(/\n/g, '')
     Mercury.trigger('action', {action: 'replaceHTML', value: value})