Skip to content
Commits on Mar 18, 2012
  1. @jejacks0n
  2. @jejacks0n
Commits on Mar 15, 2012
  1. @mixonic
  2. @mixonic

    Use FormBuilder as a fallback from lacking support for FileReader and…

    mixonic committed
    … multipart posts in Safari. Closes #37.
Commits on Mar 12, 2012
  1. @mixonic

    Merge save_failed trigger

    mixonic committed
  2. @mixonic

    Add save_failed trigger

    mixonic committed
  3. @mixonic
  4. @jejacks0n
  5. @jejacks0n

    resolved saveURL to saveUrl everywhere (including docs), and fixed an…

    jejacks0n committed
    … bug with the saveDataType addition.
Commits on Mar 5, 2012
  1. @mixonic
Commits on Feb 15, 2012
  1. @joelmoss
Commits on Feb 8, 2012
  1. @jejacks0n
  2. @jejacks0n
Commits on Jan 29, 2012
  1. @mixonic @jejacks0n
Commits on Jan 13, 2012
  1. @anoras

    Made RegEx used to extract iFrameSrc configurable so that custom rout…

    anoras committed
    …es can be used.
    
    Added "editorUrlRegex" to Mercury configuration to override default http://example.com/editor/* route.
    Added fallback to default route regex if no override is specified.
    
    This change allows custom routes to be used for the Mercury controller. For example:
    
     App.routes.draw do
       scope '/mercury' do
         match ':type/:resource' => "mercury#resource"
         match 'snippets/:name/options' => "mercury#snippet_options"
         match 'snippets/:name/preview' => "mercury#snippet_preview"
       end
    
       match '*path/edit' => "mercury#edit", :as => :mercury_editor
    end
    
    Can be used by configuring Mercury to use the following regex: /([http|https]:\/\/[^\/]*)\/(.*)\/edit\/?/i
    
    This commit resolves an issue of infinite recursive loading of the editor when using a route different from Mercury's default route.
Commits on Jan 2, 2012
  1. @jejacks0n

    added global handlers

    jejacks0n committed
  2. @jejacks0n

    PageEditor now always tells the server that it's mercury requesting t…

    jejacks0n committed
    …he page by appending a mercury_frame param.
Commits on Jan 1, 2012
  1. @jejacks0n
  2. @jejacks0n

    throw exception if data-type isn't provided or is unknown, and added …

    jejacks0n committed
    …a return false to the overline button context to make tests happier.
  3. @jejacks0n

    cleaned up a few todos.

    jejacks0n committed
Commits on Dec 31, 2011
  1. @jejacks0n
Commits on Nov 14, 2011
  1. @jejacks0n

    makes lightview first class interface element that can be used by but…

    jejacks0n committed
    …tons -- all existing modals can now be used in lightviews if you change the configuration.
  2. @jejacks0n

    jQuery 1.7 seems to show the elements if you're trying to call focus …

    jejacks0n committed
    …on anything inside of it.. it was making the editing existing images / videos modal load oddly.
Commits on Nov 13, 2011
  1. @jejacks0n

    updated jquery to 1.7 (we'll see how that goes for other people), and…

    jejacks0n committed
    … did some OCD style refactoring based on the changes event listeners in 1.7 and other aspects.
  2. @jejacks0n
Commits on Nov 12, 2011
  1. @jejacks0n
  2. @jejacks0n

    clicking on the modal overlay (masking layer) no longer closes the mo…

    jejacks0n committed
    …dals by default -- use the allowHideUsingOverlay option if you need that behavior now.
  3. @jejacks0n

    refocusing the iframe/region is not needed unless the button works fo…

    jejacks0n committed
    …r all region types (eg. region types not specified in configuration)
Commits on Nov 4, 2011
  1. @jejacks0n

    added better support for using :remote => true in modals, lightviews,…

    jejacks0n committed
    … and panels (it will be loaded into the respective open dialog)
Commits on Oct 31, 2011
  1. @jejacks0n
  2. @nreckart @jejacks0n

    makes modals, snippet previews, etc. work without rails ujs by settin…

    nreckart committed with jejacks0n
    …g headers on various ajax requests -- and having a Mercury.ajaxHeaders method that can easily be overridden.
  3. @jejacks0n
  4. @jejacks0n
Commits on Oct 30, 2011
  1. @jejacks0n

    made an adjustment to fix an issue with pressing a panel button befor…

    jejacks0n committed
    …e resize had been called.
Commits on Oct 29, 2011
  1. @jejacks0n

    adjusted how mercury tracks changes to better handle things that the …

    jejacks0n committed
    …browser might handle on keydown -- eg. meta+r
Something went wrong with that request. Please try again.