mercury-rails 0.5.0 → 0.6.0

data/spec/javascripts/mercury/uploader_spec.js.coffee

@@ -288,27 +288,27 @@ describe "Mercury.uploader", ->
       @setTimeoutSpy.andCallFake(=>)
       Mercury.uploader.hide(1)
       expect(@setTimeoutSpy.callCount).toEqual(1)
-      expect(@setTimeoutSpy.argsForCall[0][0]).toEqual(1000)
+      expect(@setTimeoutSpy.argsForCall[0][1]).toEqual(1000)
 
     it "hides the overlay and element", ->
-      @setTimeoutSpy.andCallFake((timeout, callback) => callback())
+      @setTimeoutSpy.andCallFake((callback, timeout) => callback())
       Mercury.uploader.hide()
       expect($('#test .mercury-uploader').css('opacity')).toEqual('0')
       expect($('#test .mercury-uploader-overlay').css('opacity')).toEqual('0')
 
     it "calls reset", ->
-      @setTimeoutSpy.andCallFake((timeout, callback) => callback())
+      @setTimeoutSpy.andCallFake((callback, timeout) => callback())
       spy = spyOn(Mercury.uploader, 'reset').andCallFake(=>)
       Mercury.uploader.hide()
       expect(spy.callCount).toEqual(1)
 
     it "sets visible to false", ->
-      @setTimeoutSpy.andCallFake((timeout, callback) => callback())
+      @setTimeoutSpy.andCallFake((callback, timeout) => callback())
       Mercury.uploader.hide()
       expect(Mercury.uploader.visible).toEqual(false)
 
     it "focuses the frame", ->
-      @setTimeoutSpy.andCallFake((timeout, callback) => callback())
+      @setTimeoutSpy.andCallFake((callback, timeout) => callback())
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
       Mercury.uploader.hide()
       expect(spy.callCount).toEqual(1)

data/spec/javascripts/templates/mercury/page_editor.html

@@ -7,9 +7,9 @@
 <meta content="K6JhyfOVKJX8X2ZkiJXSf491fc1fF+k79wzrChHQa0g=" name="csrf-token" />
 
 <div id="page_editor_container"></div>
-<div id="region1" class="custom-region-class" data-type="editable"></div>
-<div id="region2" class="custom-region-class" data-type="editable"></div>
-<div id="region3" class="custom-region-class" data-type="editable">
+<div id="region1" custom-region-attribute="full"></div>
+<div id="region2" custom-region-attribute="full"></div>
+<div id="region3" custom-region-attribute="full">
   <a id="anchor1r" href="#" target="_top">1</a>
   <a id="anchor2r" href="#" target="_blank">2</a>
   <a id="anchor3r" href="#" target="_self">3</a>
@@ -19,7 +19,7 @@
   <form id="form3r" action="" target="_self"></form>
   <form id="form4r" action=""></form>
 </div>
-<div id="region4" class="custom-region-class"></div>
+<div id="region4" custom-region-attribute=""></div>
 
 <a id="anchor1" href="#" target="_top">1</a>
 <a id="anchor2" href="#" target="_blank">2</a>

data/spec/javascripts/templates/mercury/region.html

@@ -1,2 +1,2 @@
 <div id="region" data-scope="scope" data-version="1">contents</div>
-<div id="region_with_snippet">contents<div class="mercury-snippet" data-snippet="snippet_1" data-version="1">snippet</div></div>
+<div id="region_with_snippet">contents<div class="example-snippet" data-snippet="snippet_1" data-version="1">snippet</div></div>

data/spec/javascripts/templates/mercury/regions/full.html

@@ -0,0 +1 @@
+<div id="full_region1"></div>

data/spec/javascripts/templates/mercury/regions/image.html

@@ -1 +1 @@
-<img id="editable_region1" src="foo.jpg" />
+<img id="image_region1" src="foo.jpg" />

data/spec/javascripts/templates/mercury/regions/markdown.html

@@ -0,0 +1 @@
+<div id="markdown_region1"></div>

data/spec/javascripts/templates/mercury/regions/simple.html

@@ -1,3 +1 @@
-<div id="editable_region1">
-
-</div>
+<div id="simple_region1"></div>

data/spec/javascripts/templates/mercury/regions/snippets.html

@@ -0,0 +1,4 @@
+<div id="snippets_region1" data-mercury="snippets"></div>
+<div id="snippets_region2" data-mercury="snippets">
+  <div class="example-snippet" data-snippet="snippet_1">12</div>
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercury-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -220,7 +220,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: A fully featured and advanced HTML5 WYSIWYG editor written in CoffeeScript
-  on top of the Rails 3.1 asset stack
+  on top of the Rails asset pipeline
 email:
 - jejacks0n@gmail.com
 executables: []
@@ -265,7 +265,7 @@ files:
 - app/assets/images/mercury/toolbar/primary/save.png
 - app/assets/images/mercury/toolbar/primary/snippetpanel.png
 - app/assets/images/mercury/toolbar/primary/undo.png
-- app/assets/images/mercury/toolbar/snippetable/buttons.png
+- app/assets/images/mercury/toolbar/snippets/buttons.png
 - app/assets/javascripts/mercury/dependencies/jquery-1.7.js
 - app/assets/javascripts/mercury/dependencies/jquery-ui-1.8.13.custom.js
 - app/assets/javascripts/mercury/dependencies/jquery.additions.js
@@ -309,11 +309,11 @@ files:
 - app/assets/javascripts/mercury/plugins/save_as_xml/mercury/page_editor.js.coffee
 - app/assets/javascripts/mercury/plugins/save_as_xml/plugin.js
 - app/assets/javascripts/mercury/region.js.coffee
-- app/assets/javascripts/mercury/regions/editable.js.coffee
+- app/assets/javascripts/mercury/regions/full.coffee
 - app/assets/javascripts/mercury/regions/image.js.coffee
-- app/assets/javascripts/mercury/regions/markupable.js.coffee
+- app/assets/javascripts/mercury/regions/markdown.coffee
 - app/assets/javascripts/mercury/regions/simple.js.coffee
-- app/assets/javascripts/mercury/regions/snippetable.js.coffee
+- app/assets/javascripts/mercury/regions/snippets.js.coffee
 - app/assets/javascripts/mercury/select.js.coffee
 - app/assets/javascripts/mercury/snippet.js.coffee
 - app/assets/javascripts/mercury/snippet_toolbar.js.coffee
@@ -327,8 +327,6 @@ files:
 - app/assets/javascripts/mercury/tooltip.js.coffee
 - app/assets/javascripts/mercury/uploader.js.coffee
 - app/assets/javascripts/mercury.js
-- app/assets/javascripts/mercury_loader.js
-- app/assets/javascripts/mercury_overrides.js
 - app/assets/stylesheets/mercury/all_images.css.erb
 - app/assets/stylesheets/mercury/buttons.css
 - app/assets/stylesheets/mercury/dialog.css
@@ -341,7 +339,6 @@ files:
 - app/assets/stylesheets/mercury/tooltip.css
 - app/assets/stylesheets/mercury/uploader.css
 - app/assets/stylesheets/mercury.css
-- app/assets/stylesheets/mercury_overrides.css
 - app/controllers/mercury_controller.rb
 - app/views/layouts/mercury.html.erb
 - app/views/mercury/lightviews/about.html
@@ -367,28 +364,28 @@ files:
 - features/loading/loading.feature
 - features/loading/navigating.feature
 - features/loading/user_interface.feature
-- features/regions/editable/advanced_editing.feature
-- features/regions/editable/basic_editing.feature
-- features/regions/editable/inserting_links.feature
-- features/regions/editable/inserting_media.feature
-- features/regions/editable/inserting_snippets.feature
-- features/regions/editable/inserting_special_characters.feature
-- features/regions/editable/inserting_tables.feature
-- features/regions/editable/pasting.feature
-- features/regions/editable/uploading_images.feature
+- features/regions/full/advanced_editing.feature
+- features/regions/full/basic_editing.feature
+- features/regions/full/inserting_links.feature
+- features/regions/full/inserting_media.feature
+- features/regions/full/inserting_snippets.feature
+- features/regions/full/inserting_special_characters.feature
+- features/regions/full/inserting_tables.feature
+- features/regions/full/pasting.feature
+- features/regions/full/uploading_images.feature
 - features/regions/image/uploading_images.feature
-- features/regions/markupable/advanced_editing.feature
-- features/regions/markupable/basic_editing.feature
-- features/regions/markupable/inserting_links.feature
-- features/regions/markupable/inserting_media.feature
-- features/regions/markupable/inserting_snippets.feature
-- features/regions/markupable/inserting_special_characters.feature
-- features/regions/markupable/inserting_tables.feature
-- features/regions/markupable/uploading_images.feature
+- features/regions/markdown/advanced_editing.feature
+- features/regions/markdown/basic_editing.feature
+- features/regions/markdown/inserting_links.feature
+- features/regions/markdown/inserting_media.feature
+- features/regions/markdown/inserting_snippets.feature
+- features/regions/markdown/inserting_special_characters.feature
+- features/regions/markdown/inserting_tables.feature
+- features/regions/markdown/uploading_images.feature
 - features/regions/simple/basic_editing.feature
-- features/regions/snippetable/advanced_editing.feature
-- features/regions/snippetable/basic_editing.feature
-- features/regions/snippetable/inserting_snippets.feature
+- features/regions/snippets/advanced_editing.feature
+- features/regions/snippets/basic_editing.feature
+- features/regions/snippets/inserting_snippets.feature
 - features/saving/saving.feature
 - features/step_definitions/debug_steps.rb
 - features/step_definitions/generator_steps.rb
@@ -402,9 +399,9 @@ files:
 - features/support/selectors.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/javascripts/prototype.js
+- spec/dummy/app/assets/stylesheets/application.css.scss
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -424,18 +421,14 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/blank.html
-- spec/dummy/public/canvastest.html
 - spec/dummy/public/distro.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/frame.html
 - spec/dummy/public/images/bunny.gif
 - spec/dummy/public/images/bunny2.jpg
 - spec/dummy/public/index.html
-- spec/dummy/public/prototype.js
 - spec/dummy/script/rails
 - spec/javascripts/mercury/dialog_spec.js.coffee
 - spec/javascripts/mercury/dialogs/backcolor_spec.js.coffee
@@ -458,11 +451,11 @@ files:
 - spec/javascripts/mercury/palette_spec.js.coffee
 - spec/javascripts/mercury/panel_spec.js.coffee
 - spec/javascripts/mercury/region_spec.js.coffee
-- spec/javascripts/mercury/regions/editable_spec.js.coffee
+- spec/javascripts/mercury/regions/full_spec.js.coffee
 - spec/javascripts/mercury/regions/image_spec.js.coffee
-- spec/javascripts/mercury/regions/markupable_spec.js.coffee
+- spec/javascripts/mercury/regions/markdown_spec.js.coffee
 - spec/javascripts/mercury/regions/simple_spec.js.coffee
-- spec/javascripts/mercury/regions/snippetable_spec.js.coffee
+- spec/javascripts/mercury/regions/snippets_spec.js.coffee
 - spec/javascripts/mercury/select_spec.js.coffee
 - spec/javascripts/mercury/snippet_spec.js.coffee
 - spec/javascripts/mercury/snippet_toolbar_spec.js.coffee
@@ -493,10 +486,11 @@ files:
 - spec/javascripts/templates/mercury/palette.html
 - spec/javascripts/templates/mercury/panel.html
 - spec/javascripts/templates/mercury/region.html
-- spec/javascripts/templates/mercury/regions/editable.html
+- spec/javascripts/templates/mercury/regions/full.html
 - spec/javascripts/templates/mercury/regions/image.html
+- spec/javascripts/templates/mercury/regions/markdown.html
 - spec/javascripts/templates/mercury/regions/simple.html
-- spec/javascripts/templates/mercury/regions/snippetable.html
+- spec/javascripts/templates/mercury/regions/snippets.html
 - spec/javascripts/templates/mercury/select.html
 - spec/javascripts/templates/mercury/snippet.html
 - spec/javascripts/templates/mercury/snippet_toolbar.html
@@ -523,7 +517,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1621862695583781512
+      hash: -1612885216118549362
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -532,14 +526,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1621862695583781512
+      hash: -1612885216118549362
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: A fully featured and advanced HTML5 WYSIWYG editor written in CoffeeScript
-  on top of Rails 3.1
+summary: ! 'Mercury Editor: The Rails HTML5 WYSIWYG editor'
 test_files:
 - features/generators/authentication.feature
 - features/generators/images.feature
@@ -547,28 +540,28 @@ test_files:
 - features/loading/loading.feature
 - features/loading/navigating.feature
 - features/loading/user_interface.feature
-- features/regions/editable/advanced_editing.feature
-- features/regions/editable/basic_editing.feature
-- features/regions/editable/inserting_links.feature
-- features/regions/editable/inserting_media.feature
-- features/regions/editable/inserting_snippets.feature
-- features/regions/editable/inserting_special_characters.feature
-- features/regions/editable/inserting_tables.feature
-- features/regions/editable/pasting.feature
-- features/regions/editable/uploading_images.feature
+- features/regions/full/advanced_editing.feature
+- features/regions/full/basic_editing.feature
+- features/regions/full/inserting_links.feature
+- features/regions/full/inserting_media.feature
+- features/regions/full/inserting_snippets.feature
+- features/regions/full/inserting_special_characters.feature
+- features/regions/full/inserting_tables.feature
+- features/regions/full/pasting.feature
+- features/regions/full/uploading_images.feature
 - features/regions/image/uploading_images.feature
-- features/regions/markupable/advanced_editing.feature
-- features/regions/markupable/basic_editing.feature
-- features/regions/markupable/inserting_links.feature
-- features/regions/markupable/inserting_media.feature
-- features/regions/markupable/inserting_snippets.feature
-- features/regions/markupable/inserting_special_characters.feature
-- features/regions/markupable/inserting_tables.feature
-- features/regions/markupable/uploading_images.feature
+- features/regions/markdown/advanced_editing.feature
+- features/regions/markdown/basic_editing.feature
+- features/regions/markdown/inserting_links.feature
+- features/regions/markdown/inserting_media.feature
+- features/regions/markdown/inserting_snippets.feature
+- features/regions/markdown/inserting_special_characters.feature
+- features/regions/markdown/inserting_tables.feature
+- features/regions/markdown/uploading_images.feature
 - features/regions/simple/basic_editing.feature
-- features/regions/snippetable/advanced_editing.feature
-- features/regions/snippetable/basic_editing.feature
-- features/regions/snippetable/inserting_snippets.feature
+- features/regions/snippets/advanced_editing.feature
+- features/regions/snippets/basic_editing.feature
+- features/regions/snippets/inserting_snippets.feature
 - features/saving/saving.feature
 - features/step_definitions/debug_steps.rb
 - features/step_definitions/generator_steps.rb
@@ -582,9 +575,9 @@ test_files:
 - features/support/selectors.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/javascripts/prototype.js
+- spec/dummy/app/assets/stylesheets/application.css.scss
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -604,18 +597,14 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/blank.html
-- spec/dummy/public/canvastest.html
 - spec/dummy/public/distro.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/frame.html
 - spec/dummy/public/images/bunny.gif
 - spec/dummy/public/images/bunny2.jpg
 - spec/dummy/public/index.html
-- spec/dummy/public/prototype.js
 - spec/dummy/script/rails
 - spec/javascripts/mercury/dialog_spec.js.coffee
 - spec/javascripts/mercury/dialogs/backcolor_spec.js.coffee
@@ -638,11 +627,11 @@ test_files:
 - spec/javascripts/mercury/palette_spec.js.coffee
 - spec/javascripts/mercury/panel_spec.js.coffee
 - spec/javascripts/mercury/region_spec.js.coffee
-- spec/javascripts/mercury/regions/editable_spec.js.coffee
+- spec/javascripts/mercury/regions/full_spec.js.coffee
 - spec/javascripts/mercury/regions/image_spec.js.coffee
-- spec/javascripts/mercury/regions/markupable_spec.js.coffee
+- spec/javascripts/mercury/regions/markdown_spec.js.coffee
 - spec/javascripts/mercury/regions/simple_spec.js.coffee
-- spec/javascripts/mercury/regions/snippetable_spec.js.coffee
+- spec/javascripts/mercury/regions/snippets_spec.js.coffee
 - spec/javascripts/mercury/select_spec.js.coffee
 - spec/javascripts/mercury/snippet_spec.js.coffee
 - spec/javascripts/mercury/snippet_toolbar_spec.js.coffee
@@ -673,10 +662,11 @@ test_files:
 - spec/javascripts/templates/mercury/palette.html
 - spec/javascripts/templates/mercury/panel.html
 - spec/javascripts/templates/mercury/region.html
-- spec/javascripts/templates/mercury/regions/editable.html
+- spec/javascripts/templates/mercury/regions/full.html
 - spec/javascripts/templates/mercury/regions/image.html
+- spec/javascripts/templates/mercury/regions/markdown.html
 - spec/javascripts/templates/mercury/regions/simple.html
-- spec/javascripts/templates/mercury/regions/snippetable.html
+- spec/javascripts/templates/mercury/regions/snippets.html
 - spec/javascripts/templates/mercury/select.html
 - spec/javascripts/templates/mercury/snippet.html
 - spec/javascripts/templates/mercury/snippet_toolbar.html

data/app/assets/javascripts/mercury_loader.js

@@ -1,193 +0,0 @@
-/*!
- * 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(); }
-  }
-})();