kiteditor 1.0.12 → 1.0.13

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

@@ -25,6 +25,7 @@ jQuery.extend Mercury.uploader,
 
   supported: ->
     xhr = new XMLHttpRequest
+    fileReader = window.FileReader
 
     if window.Uint8Array && window.ArrayBuffer && !XMLHttpRequest.prototype.sendAsBinary
       XMLHttpRequest::sendAsBinary = (datastr) ->
@@ -32,13 +33,8 @@ jQuery.extend Mercury.uploader,
         ui8a[index] = (datastr.charCodeAt(index) & 0xff) for data, index in datastr
         @send(ui8a.buffer)
 
-    return !!(xhr.upload && xhr.sendAsBinary && (Mercury.uploader.fileReaderSupported() || Mercury.uploader.formDataSupported()))
+    return !!(xhr.upload && xhr.sendAsBinary && fileReader)
 
-  fileReaderSupported: ->
-    !!(window.FileReader)
-  
-  formDataSupported: ->
-    !!(window.FormData)
 
   build: ->
     @element = jQuery('<div>', {class: 'mercury-uploader', style: 'display:none'})
@@ -90,11 +86,8 @@ jQuery.extend Mercury.uploader,
 
 
   loadImage: ->
-    if Mercury.uploader.fileReaderSupported()
-      @file.readAsDataURL (result) =>
-        @element.find('.mercury-uploader-preview b').html(jQuery('<img>', {src: result}))
-        @upload()
-    else
+    @file.readAsDataURL (result) =>
+      @element.find('.mercury-uploader-preview b').html(jQuery('<img>', {src: result}))
       @upload()
 
 
@@ -128,28 +121,16 @@ jQuery.extend Mercury.uploader,
     xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest')
     xhr.setRequestHeader(Mercury.config.csrfHeader, Mercury.csrfToken)
 
-    # Homespun multipart uploads. Chrome 18, Firefox 11.
-    #
-    if Mercury.uploader.fileReaderSupported()
-      @file.readAsBinaryString (result) =>
-        
-        multipart = new Mercury.uploader.MultiPartPost(Mercury.config.uploading.inputName, @file, result)
+    @file.readAsBinaryString (result) =>
+      # build the multipart post string
+      multipart = new Mercury.uploader.MultiPartPost(Mercury.config.uploading.inputName, @file, result)
 
-        # update the content size so we can calculate
-        @file.updateSize(multipart.delta)
-
-        # set the content type and send
-        xhr.setRequestHeader('Content-Type', 'multipart/form-data; boundary=' + multipart.boundary)
-        xhr.sendAsBinary(multipart.body)
-    
-    # FormData based. Safari 5.1.2.
-    #
-    else
-      formData = new FormData()
-      formData.append(Mercury.config.uploading.inputName, @file.file, @file.file.name)
-
-      xhr.send(formData)
+      # update the content size so we can calculate
+      @file.updateSize(multipart.delta)
 
+      # set the content type and send
+      xhr.setRequestHeader('Content-Type', 'multipart/form-data; boundary=' + multipart.boundary)
+      xhr.sendAsBinary(multipart.body)
 
 
   updateStatus: (message, loaded) ->
@@ -161,7 +142,7 @@ jQuery.extend Mercury.uploader,
 
 
   hide: (delay = 0) ->
-    setTimeout =>
+    setTimeout delay * 1000, =>
       @element.animate {opacity: 0}, 200, 'easeInOutSine', =>
         @overlay.animate {opacity: 0}, 200, 'easeInOutSine', =>
           @overlay.hide()
@@ -169,7 +150,6 @@ jQuery.extend Mercury.uploader,
           @reset()
           @visible = false
           Mercury.trigger('focus:frame')
-    , delay * 1000
 
 
   reset: ->
@@ -200,10 +180,12 @@ jQuery.extend Mercury.uploader,
 class Mercury.uploader.File
 
   constructor: (@file) ->
-    @fullSize = @size = @file.size || @file.fileSize
-    @readableSize = @size.toBytes()
-    @name = @file.name || @file.fileName
-    @type = @file.type || @file.fileType
+    @size = @file.size
+    @fullSize = @file.size
+    @readableSize = @file.size.toBytes()
+    @name = @file.fileName
+    @name ||= @file.name 
+    @type = @file.type
 
     # add any errors if we need to
     errors = []

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

@@ -2,14 +2,40 @@
  * Mercury Editor is a CoffeeScript and jQuery based WYSIWYG editor.  Documentation and other useful information can be
  * found at https://github.com/jejacks0n/mercury
  *
- * Minimum jQuery requirements are 1.7
+ * Supported browsers:
+ *   - Firefox 4+
+ *   - Chrome 10+
+ *   - Safari 5+
+ *
+ * Copyright (c) 2011 Jeremy Jackson
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
  *= require_self
  *
+ * Minimum jQuery requirements are 1.7
+ *= require mercury/dependencies/jquery-1.7
+ *
  * You can include the Rails jQuery ujs script here to get some nicer behaviors in modals, panels and lightviews when
  * using :remote => true within the contents rendered in them.
  * require jquery_ujs
  *
- * Add any requires for the support libraries that integrate nicely with Mercury Editor.
+ * If you want to override Mercury functionality, you can do so in a custom file that binds to the mercury:loaded event,
+ * or do so at the end of the current file (mercury.js).  There's an example that will help you get started.
+ * require mercury_overrides
+ *
+ * Add all requires for the support libraries that integrate nicely with Mercury Editor.
  * require mercury/support/history
  *
  * Require Mercury Editor itself.
@@ -17,14 +43,10 @@
  *
  * Require any localizations you wish to support
  * Example: es.locale, or fr.locale -- regional dialects are in each language file so never en_US for instance.
- * Make sure you enable the localization feature in the configuration.
  * require mercury/locales/swedish_chef.locale
  *
  * Add all requires for plugins that extend or change the behavior of Mercury Editor.
  * require mercury/plugins/save_as_xml/plugin.js
- *
- * Require any files you want to use that either extend, or change the default Mercury behavior.
- * require mercury_overrides
  */
 window.Mercury = {
 
@@ -36,16 +58,16 @@ window.Mercury = {
     // behaviors.  Any top level object put here will create a new toolbar.  Buttons are simply nested inside the
     // toolbars, along with button groups.
     //
-    // Some toolbars are custom (the snippets toolbar for instance), and to denote that use _custom: true.  You can then
-    // build the toolbar yourself with it's own behavior.
+    // Some toolbars are custom (the snippetable toolbar for instance), and to denote that use _custom: true.  You can
+    // then build the toolbar yourself with it's own behavior.
     //
     // Buttons can be grouped, and a button group is simply a way to wrap buttons for styling -- they can also handle
-    // enabling or disabling all the buttons within it by using a context.  The table button group is a good example of
-    // this.
+    // enabling or disabling all the buttons within it by using a context.  The table button group is a good example
+    // of this.
     //
-    // It's important to note that each of the button names (keys), in each toolbar object must be unique, regardless of
-    // if it's in a button group, or nested, etc.  This is because styling is applied to them by name, and because their
-    // name is used in the event that's fired when you click on them.
+    // It's important to note that each of the button names (keys), in each toolbar object must be unique, regardless
+    // of if it's in a button group, or nested, etc.  This is because styling is applied to them by name, and because
+    // their name is used in the event that's fired when you click on them.
     //
     // Button format: `[label, description, {type: action, type: action, etc}]`
     //
@@ -75,8 +97,8 @@ window.Mercury = {
     //   1. a string, denoting the name of the mode
     //   note: it's assumed that when a specific mode is turned on, all other modes will be turned off, which happens
     //         automatically, thus putting the editor into a specific "state"
-    // - regions:   allows buttons to be enabled/disabled based on what region type has focus, expects:
-    //   1. an array of region types (eg. ['full', 'markdown'])
+    // - regions:   allows buttons to be enabled/disabled based on what region type has focus, expects the action to be:
+    //   1. an array of region types (eg. ['editable', 'markupable'])
     // - preload:   allows some dialog views to be loaded when the button is created instead of on first open, expects:
     //   1. a boolean true / false
     //   note: this is only used by panels, selects, and palettes
@@ -100,10 +122,10 @@ window.Mercury = {
           redo:                ['Redo', 'Redo your last action'],
           sep:                 ' '
           },
-        insertLink:            ['Link', 'Insert Link', { modal: '/mercury/modals/link.html', regions: ['full', 'markdown'] }],
-        insertMedia:           ['Media', 'Insert Media (images and videos)', { modal: '/mercury/modals/media.html', regions: ['full', 'markdown'] }],
-        insertTable:           ['Table', 'Insert Table', { modal: '/mercury/modals/table.html', regions: ['full', 'markdown'] }],
-        insertCharacter:       ['Character', 'Special Characters', { modal: '/mercury/modals/character.html', regions: ['full', 'markdown'] }],
+        insertLink:            ['Link', 'Insert Link', { modal: '/mercury/modals/link.html', regions: ['editable', 'markupable'] }],
+        insertMedia:           ['Media', 'Insert Media (images and videos)', { modal: '/mercury/modals/media.html', regions: ['editable', 'markupable'] }],
+        insertTable:           ['Table', 'Insert Table', { modal: '/mercury/modals/table.html', regions: ['editable', 'markupable'] }],
+        insertCharacter:       ['Character', 'Special Characters', { modal: '/mercury/modals/character.html', regions: ['editable', 'markupable'] }],
         snippetPanel:          ['Snippet', 'Snippet Panel', { panel: '/mercury/panels/snippets.html' }],
         sep2:                  ' ',
         historyPanel:          ['History', 'Page Version History', { panel: '/mercury/panels/history.html' }],
@@ -112,7 +134,7 @@ window.Mercury = {
         },
 
       editable: {
-        _regions:              ['full', 'markdown'],
+        _regions:              ['editable', 'markupable'],
         predefined:            {
           style:               ['Style', null, { select: '/mercury/selects/style.html', preload: true }],
           sep1:                ' ',
@@ -120,17 +142,17 @@ window.Mercury = {
           sep2:                '-'
           },
         colors:                {
-          backColor:           ['Background Color', null, { palette: '/mercury/palettes/backcolor.html', context: true, preload: true, regions: ['full'] }],
+          backColor:           ['Background Color', null, { palette: '/mercury/palettes/backcolor.html', context: true, preload: true, regions: ['editable'] }],
           sep1:                ' ',
-          foreColor:           ['Text Color', null, { palette: '/mercury/palettes/forecolor.html', context: true, preload: true, regions: ['full'] }],
+          foreColor:           ['Text Color', null, { palette: '/mercury/palettes/forecolor.html', context: true, preload: true, regions: ['editable'] }],
           sep2:                '-'
           },
         decoration:            {
           bold:                ['Bold', null, { context: true }],
           italic:              ['Italicize', null, { context: true }],
-          overline:            ['Overline', null, { context: true, regions: ['full'] }],
-          strikethrough:       ['Strikethrough', null, { context: true, regions: ['full'] }],
-          underline:           ['Underline', null, { context: true, regions: ['full'] }],
+          overline:            ['Overline', null, { context: true, regions: ['editable'] }],
+          strikethrough:       ['Strikethrough', null, { context: true, regions: ['editable'] }],
+          underline:           ['Underline', null, { context: true, regions: ['editable'] }],
           sep:                 '-'
           },
         script:                {
@@ -139,10 +161,10 @@ window.Mercury = {
           sep: '-'
           },
         justify:               {
-          justifyLeft:         ['Align Left', null, { context: true, regions: ['full'] }],
-          justifyCenter:       ['Center', null, { context: true, regions: ['full'] }],
-          justifyRight:        ['Align Right', null, { context: true, regions: ['full'] }],
-          justifyFull:         ['Justify Full', null, { context: true, regions: ['full'] }],
+          justifyLeft:         ['Align Left', null, { context: true, regions: ['editable'] }],
+          justifyCenter:       ['Center', null, { context: true, regions: ['editable'] }],
+          justifyRight:        ['Align Right', null, { context: true, regions: ['editable'] }],
+          justifyFull:         ['Justify Full', null, { context: true, regions: ['editable'] }],
           sep:                 '-'
           },
         list:                  {
@@ -157,12 +179,12 @@ window.Mercury = {
           },
         table:                 {
           _context:            true,
-          insertRowBefore:     ['Insert Table Row', 'Insert a table row before the cursor', { regions: ['full'] }],
-          insertRowAfter:      ['Insert Table Row', 'Insert a table row after the cursor', { regions: ['full'] }],
-          deleteRow:           ['Delete Table Row', 'Delete this table row', { regions: ['full'] }],
-          insertColumnBefore:  ['Insert Table Column', 'Insert a table column before the cursor', { regions: ['full'] }],
-          insertColumnAfter:   ['Insert Table Column', 'Insert a table column after the cursor', { regions: ['full'] }],
-          deleteColumn:        ['Delete Table Column', 'Delete this table column', { regions: ['full'] }],
+          insertRowBefore:     ['Insert Table Row', 'Insert a table row before the cursor', { regions: ['editable'] }],
+          insertRowAfter:      ['Insert Table Row', 'Insert a table row after the cursor', { regions: ['editable'] }],
+          deleteRow:           ['Delete Table Row', 'Delete this table row', { regions: ['editable'] }],
+          insertColumnBefore:  ['Insert Table Column', 'Insert a table column before the cursor', { regions: ['editable'] }],
+          insertColumnAfter:   ['Insert Table Column', 'Insert a table column after the cursor', { regions: ['editable'] }],
+          deleteColumn:        ['Delete Table Column', 'Delete this table column', { regions: ['editable'] }],
           sep1:                ' ',
           increaseColspan:     ['Increase Cell Columns', 'Increase the cells colspan'],
           decreaseColspan:     ['Decrease Cell Columns', 'Decrease the cells colspan and add a new cell'],
@@ -175,15 +197,15 @@ window.Mercury = {
           sep1:                '-'
           },
         formatting:            {
-          removeFormatting:    ['Remove Formatting', 'Remove formatting for the selection', { regions: ['full'] }],
+          removeFormatting:    ['Remove Formatting', 'Remove formatting for the selection', { regions: ['editable'] }],
           sep2:                ' '
           },
         editors:               {
-          htmlEditor:          ['Edit HTML', 'Edit the HTML content', { regions: ['full'] }]
+          htmlEditor:          ['Edit HTML', 'Edit the HTML content', { regions: ['editable'] }]
           }
         },
 
-      snippets: {
+      snippetable: {
         _custom:               true,
         actions:               {
           editSnippet:         ['Edit Snippet Settings'],
@@ -198,27 +220,28 @@ window.Mercury = {
     //
     // You can customize some aspects of how regions are found, identified, and saved.
     //
-    // attribute: Mercury identifies editable regions by a data-mercury attribute.  This attribute has to be added in
-    // your HTML in advance, and is the only real code/naming exposed in the implementation of Mercury.  To allow this
-    // to be as configurable as possible, you can set the name of this attribute.  If you change this, you should adjust
-    // the injected styles as well.
+    // className: Mercury identifies editable regions by a className.  This classname has to be added in your HTML in
+    // advance, and is the only real code/naming exposed in the implementation of Mercury.  To allow this to be as
+    // configurable as possible, you can set the name of the class.  When switching to preview mode, this configuration
+    // is also used to generate a class to indicate that Mercury is in preview mode by appending it with '-preview' (so
+    // by default it would be mercury-region-preview)
     //
     // identifier: This is used as a unique identifier for any given region (and thus should be unique to the page).
     // By default this is the id attribute but can be changed to a data attribute should you want to use something
     // custom instead.
     //
+    // determineType: This function is called after checking the data-type attribute for the correct field type. Use
+    // it if you want to programatically set the type based on inspection of the region.
+    //
     // dataAttributes: The dataAttributes is an array of data attributes that will be serialized and returned to the
     // server upon saving.  These attributes, when applied to a Mercury region element, will be automatically serialized
     // and submitted with the AJAX request sent when a page is saved.  These are expected to be HTML5 data attributes,
     // and 'data-' will automatically be prepended to each item in this directive. (ex. ['scope', 'version'])
-    //
-    // determineType: This function is called after checking the data-type attribute for the correct field type. Use
-    // it if you want to dynamically set the type based on inspection of the region.
     regions: {
-      attribute: 'data-mercury',
+      className: 'mercury-region',
       identifier: 'id',
-      dataAttributes: []
       // determineType: function(region){},
+      dataAttributes: []
       },
 
 
@@ -306,7 +329,7 @@ window.Mercury = {
     // If you want to add behaviors to specific region types, you can mix them into the actions property of any region
     // type.
     //
-    //     Mercury.Regions.Full.actions.htmlEditor = function() {}
+    //     Mercury.Regions.Editable.actions.htmlEditor = function() {}
     //
     // You can see how the behavior matches up directly with the button names.  It's also important to note that the
     // callback functions are executed within the scope of the given region, so you have access to all it's methods.
@@ -347,14 +370,12 @@ window.Mercury = {
     csrfSelector: 'meta[name="csrf-token"]',
     csrfHeader: 'X-CSRF-Token',
 
-
     // ## Editor URLs
     //
     // When loading a given page, you may want to tweak this regex.  It's to allow the url to differ from the page
     // you're editing, and the url at which you access it.
     editorUrlRegEx: /([http|https]:\/\/.[^\/]*)\/editor\/?(.*)/i,
 
-
     // ## Hijacking Links & Forms
     //
     // Mercury will hijack links and forms that don't have a target set, or the target is set to _self and will set it
@@ -427,16 +448,15 @@ window.Mercury = {
     // Mercury tries to stay as much out of your code as possible, but because regions appear within your document we
     // need to include a few styles to indicate regions, as well as the different states of them (eg. focused).  These
     // styles are injected into your document, and as simple as they might be, you may want to change them.
+    //
+    // {{regionClass}} will be automatically replaced with whatever you have set in the regions.class config directive.
     injectedStyles: '' +
-      '[data-mercury]       { min-height: 10px; outline: 1px dotted #09F } ' +
-      '[data-mercury]:focus { outline: none; -webkit-box-shadow: 0 0 10px #09F, 0 0 1px #045; box-shadow: 0 0 10px #09F, 0 0 1px #045 }' +
-      '[data-mercury].focus { outline: none; -webkit-box-shadow: 0 0 10px #09F, 0 0 1px #045; box-shadow: 0 0 10px #09F, 0 0 1px #045 }' +
-      '[data-mercury]:after { content: "."; display: block; visibility: hidden; clear: both; height: 0; overflow: hidden; }' +
-      '[data-mercury] table { border: 1px dotted red; min-width: 6px; }' +
-      '[data-mercury] th    { border: 1px dotted red; min-width: 6px; }' +
-      '[data-mercury] td    { border: 1px dotted red; min-width: 6px; }' +
-      '[data-mercury] .mercury-textarea       { border: 0; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; resize: none; }' +
-      '[data-mercury] .mercury-textarea:focus { outline: none; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }'
+      '.{{regionClass}} { min-height: 10px; outline: 1px dotted #09F } ' +
+      '.{{regionClass}}:focus, .{{regionClass}}.focus { outline: none; -webkit-box-shadow: 0 0 10px #09F, 0 0 1px #045; box-shadow: 0 0 10px #09F, 0 0 1px #045 }' +
+      '.{{regionClass}}:after { content: "."; display: block; visibility: hidden; clear: both; height: 0; overflow: hidden; }' +
+      '.{{regionClass}} table, .{{regionClass}} td, .{{regionClass}} th { border: 1px dotted red; min-width: 6px; }' +
+      '.mercury-textarea { border: 0; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; resize: none; }' +
+      '.mercury-textarea:focus { outline: none; }'
   },
 
   // ## Silent Mode
@@ -447,6 +467,13 @@ window.Mercury = {
   // ## Debug Mode
   //
   // Turning debug mode on will log events and other various things (using console.debug if available).
-  debug: false
+  debug: false,
+
+  // The onload method is provided as a callback in case you want to override default Mercury Editor behavior.  It will
+  // be called directly after the Mercury scripts have loaded, but before anything has been initialized.  It's a good
+  // place to add or change functionality.
+  onload: function() {
+    //Mercury.PageEditor.prototype.iframeSrc = function(url) { return '/testing'; }
+  },
 
 };

data/vendor/assets/javascripts/mercury_loader.js

@@ -0,0 +1,193 @@
+/*!
+ * Mercury Editor is a CoffeeScript and jQuery based WYSIWYG editor.  Documentation and other useful information can be
+ * found at https://github.com/jejacks0n/mercury
+ *
+ * Supported browsers:
+ *   - Firefox 4+
+ *   - Chrome 10+
+ *   - Safari 5+
+ *
+ * Copyright (c) 2011 Jeremy Jackson
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+// ## Default Packages
+//
+// Some default packages are provided for you.  If you want to define your own, feel free to do so before including this
+// script.  These, or your own packages can be specified to the loader in query params (read below for details).
+if (!window.mercuryPackages) window.mercuryPackages = {
+  development: {javascripts: 'mercury.js', stylesheets: 'mercury.css'},
+  bundled: {javascripts: 'javascripts/mercury.min.js,javascripts/mercury_dialogs.js', stylesheets: 'stylesheets/mercury.bundle.css'}
+};
+
+
+// ## Mercury Loader
+(function() {
+  // Useragent detection, which we use to determine if the client is supported.  We do this method instead of checking
+  // features because many of the features are supported in IE, but aren't implemented to the W3C spec.
+  var browser = {
+    webkit: /(webkit)[ \/]([\w.]+)/,
+    opera: /(opera)(?:.*version)?[ \/]([\w.]+)/,
+    msie: /(msie) ([\w.]+)/,
+    mozilla: /(mozilla)(?:.*? rv:([\w.]+))?/
+  };
+
+  var ua = navigator.userAgent.toLowerCase();
+  var match = browser.webkit.exec(ua) || browser.opera.exec(ua) || browser.msie.exec(ua) || ua.indexOf("compatible") < 0 && browser.mozilla.exec(ua) || [];
+  browser = {version: match[2] || "0" };
+  browser[match[1] || ""] = true;
+
+  // If the browser isn't supported, we don't try to do anything more.  We do direct userAgent detection here because IE
+  // thinks it's supported but isn't -- in part because it has it's own implementation of the contentEditable spec.
+  if (document.getElementsByTagName && document.getElementById && document.designMode && !browser.konqueror && !browser.msie) {
+    // supported
+  } else {
+    return;
+  }
+
+  // Default options, which can be overridden by specifying them in query params to the loader script.
+  // You can provide any additional options to the loader, and they will be passed to the PageEditor instance when it's
+  // created, so for instance you could put `visible=false`, and the editor be hidden after it's created.
+  var options = {
+    // A path or url from which the javascripts and css should be loaded.
+    src: '/assets',
+    // A value defined in the packages above.  Development is used by default.  If you want to provide your own package
+    // you can just define one before including this script.
+    pack: 'development'
+  };
+
+  // Hide the document during loading so there isn't a flicker while mercury is being loaded.
+  var head = document.getElementsByTagName("head")[0];
+  if (window == top) {
+    var style = document.createElement('style');
+    var rules = document.createTextNode('body{visibility:hidden;display:none}');
+    style.type = 'text/css';
+    if (style.styleSheet) style.styleSheet.cssText = rules.nodeValue;
+    else style.appendChild(rules);
+    head.appendChild(style);
+  }
+
+  // Because Mercury loads the document it's going to edit into an iframe we do some tweaks to the current document to
+  // make that feel more seamless.
+  function loadMercury() {
+    if (document.mercuryLoaded) return;
+    if (timer) window.clearTimeout(timer);
+    document.mercuryLoaded = true;
+
+    // If the current window is the top window, it means that Mercury hasn't been loaded yet.  So we load it.
+    if (window == top) {
+      var i;
+
+      // Find the loader script and determine what options were provided so the defaults can be overridden.  To provide
+      // options just pass them in as query params (eg. `mercury_loader.js?src=/asset_path&pack=bundled`)
+      var scripts = document.getElementsByTagName('script');
+      for (i = 0; i <= scripts.length - 1; i += 1) {
+        var match = scripts[i].src.match(/mercury_loader\.js\??(.*)?$/);
+        if (!match || !match[1]) continue;
+
+        match[1].replace(/([^&=]*)=([^&=]*)/g, function (m, attr, value) {
+          if (['true', 'false'].indexOf(value) >= 0) value = JSON.parse(value);
+          options[attr] = value;
+        });
+      }
+
+      var pack = window.mercuryPackages[options.pack];
+      setTimeout(function() {
+        // Once we're ready to load Mercury we clear the document contents, and add in the css and javascript tags.
+        // Once the script has loaded we display the body again, and instantiate a new instance of Mercury.PageEditor.
+        document.body.innerHTML = '<div style="height:0;overflow:hidden;">Mercury</div>';
+        for (i = 0; i <= document.styleSheets.length - 1; i += 1) {
+          document.styleSheets[i].disabled = true;
+        }
+
+        // Load all the stylesheets.
+        var stylesheets = pack.stylesheets.split(',');
+        for (i = 0; i <= stylesheets.length - 1; i += 1) {
+          var link = document.createElement('link');
+          link.href = options.src + '/' + stylesheets[i];
+          link.media = 'screen';
+          link.rel = 'stylesheet';
+          link.type = 'text/css';
+          head.appendChild(link);
+        }
+
+        // Load all the javascripts.
+        var javascripts = pack.javascripts.split(',');
+        var loaded = 0;
+        function loadScript(src) {
+          var script = document.createElement('script');
+          script.src = options.src + '/' + src;
+          script.type = 'text/javascript';
+          script.charset = 'utf-8';
+          head.appendChild(script);
+          script.onload = function() {
+            loaded += 1;
+            if (loaded >= javascripts.length) {
+              document.body.style.visibility = 'visible';
+              document.body.style.display = 'block';
+              // Instantiate the PageEditor, passing in the options that were provided to the loader.
+              new Mercury.PageEditor(null, options);
+              // If there's a mercuryLoaded function available, call it.   You can provide one before the loading script
+              // and it will be called after everything is loaded, but before everything is initialized.  You can bind
+              // to the mercury:ready event or use Mercury.bind('ready', function() {}).
+              if (typeof(window.mercuryLoaded) == 'function') {
+                window.mercuryLoaded();
+              }
+            } else {
+              loadScript(javascripts[loaded]);
+            }
+          };
+        }
+        loadScript(javascripts[loaded]);
+      }, 1);
+    } else if (top.Mercury) {
+      // Since this file will be included in the iframe as well, we use it to tell Mercury that the document is ready to
+      // be worked on.  By firing this event we're able to build the regions and get everything ready without having to
+      // wait for assets and slow javascripts to load or complete.
+      window.Mercury = top.Mercury;
+      Mercury.trigger('initialize:frame');
+    }
+  }
+
+  // This is a common technique for determining if the document has loaded yet, and is based on the methods used in
+  // Prototype.js.  The following portions just call loadMercury once it's appropriate to do so.
+  //
+  // Support for the DOMContentLoaded event is based on work by Dan Webb, Matthias Miller, Dean Edwards, John Resig,
+  // and Diego Perini.
+  var timer;
+  function checkReadyState() {
+    if (document.readyState === 'complete') {
+      document.stopObserving('readystatechange', checkReadyState);
+      loadMercury();
+    }
+  }
+
+  function pollDoScroll() {
+    try { document.documentElement.doScroll('left'); }
+    catch(e) {
+      timer = pollDoScroll.defer();
+      return;
+    }
+    loadMercury();
+  }
+
+  if (document.addEventListener) {
+    document.addEventListener('DOMContentLoaded', loadMercury, false);
+  } else {
+    document.observe('readystatechange', checkReadyState);
+    if (window == top) { timer = pollDoScroll.defer(); }
+  }
+})();

data/vendor/assets/javascripts/mercury_overrides.js

@@ -0,0 +1,6 @@
+/*!
+ * Mercury Editor is a Coffeescript and jQuery based WYSIWYG editor.  Documentation and other useful information can be
+ * found at https://github.com/jejacks0n/mercury
+ *
+ * This file is intended to provide a standard way to override or add JS that comes default with Mercury Editor.
+ */

data/{app → vendor}/assets/stylesheets/mercury/all_images.css.erb

@@ -74,10 +74,6 @@ form fieldset.buttons .commit input {
 .mercury-expander-button[data-button=historyPanel] em     { background-image: url(<%= asset_path 'mercury/toolbar/primary/historypanel.png' %>) }
 .mercury-primary-toolbar .mercury-notesPanel-button em,
 .mercury-expander-button[data-button=notesPanel] em       { background-image: url(<%= asset_path 'mercury/toolbar/primary/notespanel.png' %>) }
-.mercury-primary-toolbar .mercury-userPanel-button em,
-.mercury-expander-button[data-button=userPanel] em        { background-image: url(<%= asset_path 'mercury/toolbar/primary/user.png' %>) }
-.mercury-primary-toolbar .mercury-toolsPanel-button em,
-.mercury-expander-button[data-button=toolsPanel] em       { background-image: url(<%= asset_path 'mercury/toolbar/primary/tools.png' %>) }
 .mercury-editable-toolbar .mercury-button {
   background-image: url(<%= asset_path 'mercury/toolbar/editable/buttons.png' %>);
 }
@@ -86,8 +82,8 @@ form fieldset.buttons .commit input {
 }
 
 .mercury-snippet-toolbar .mercury-button {
-  background-image: url(<%= asset_path 'mercury/toolbar/snippets/buttons.png' %>);
+  background-image: url(<%= asset_path 'mercury/toolbar/snippetable/buttons.png' %>);
 }
 .mercury-snippet-toolbar .mercury-button em {
-  background-image: url(<%= asset_path 'mercury/toolbar/snippets/buttons.png' %>);
+  background-image: url(<%= asset_path 'mercury/toolbar/snippetable/buttons.png' %>);
 }