bumped version -- 0.3.0

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mercury-rails (0.2.3)
+    mercury-rails (0.3.0)
       coffee-script
       paperclip
       rails (>= 3.1.0)

features/loading/loading.feature

@@ -19,4 +19,4 @@ Feature:
 
 
   Scenario: A user can expect to see the status bar
-    Then I should see "Mercury Editor v0.2.3" within the statusbar
+    Then I should see "Mercury Editor v0.3.0" within the statusbar

mercury-rails.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   # General Gem Information
   s.name        = 'mercury-rails'
   s.date        = '2011-11-15'
-  s.version     = '0.2.3'
+  s.version     = '0.3.0'
   s.authors     = ['Jeremy Jackson']
   s.email       = ['jejacks0n@gmail.com']
   s.homepage    = 'http://github.com/jejacks0n/mercury'

public/mercury/javascripts/mercury.js

@@ -328,12 +328,33 @@ window.Mercury = {
     // 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.
     behaviors: {
-      //exit: function() { window.location.href = window.mercuryInstance.iframeSrc() },
       //foreColor: function(selection, options) { selection.wrap('<span style="color:' + options.value.toHex() + '">', true) },
       htmlEditor: function() { Mercury.modal('/mercury/modals/htmleditor.html', { title: 'HTML Editor', fullHeight: true, handler: 'htmlEditor' }); }
       },
 
 
+    // ## Global Behaviors
+    //
+    // Global behaviors are much like behaviors, but are more "global".  Things like save, exit, etc. can be included
+    // here.  They'll only be called once, and execute within the scope of whatever editor is instantiated (eg.
+    // PageEditor).
+    //
+    // An example of changing how saving works:
+    //
+    //     save: function() {
+    //       var data = top.JSON.stringify(this.serialize(), null, '  ');
+    //       var content = '<textarea style="width:500px;height:200px" wrap="off">' + data + '</textarea>';
+    //       Mercury.modal(null, {title: 'Saving', closeButton: true, content: content})
+    //     }
+    //
+    // This is a nice way to add functionality, when the behaviors aren't region specific.  These can be triggered by a
+    // button, or manually with `Mercury.trigger('action', {action: 'barrelRoll'})`
+    globalBehaviors: {
+      exit: function() { window.location.href = this.iframeSrc() },
+      barrelRoll: function() { $('body').css({webkitTransform: 'rotate(360deg)'}) }
+      },
+
+
     // ## Ajax and CSRF Headers
     //
     // Some server frameworks require that you provide a specific header for Ajax requests.  The values for these CSRF
@@ -343,6 +364,11 @@ 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
     //
@@ -442,7 +468,7 @@ window.Mercury = {
   // place to add or change functionality.
   onload: function() {
     //Mercury.PageEditor.prototype.iframeSrc = function(url) { return '/testing'; }
-  }
+  },
 
 };
 /*!
@@ -13243,7 +13269,7 @@ Showdown.converter = function() {
   var __slice = Array.prototype.slice;
   this.Mercury || (this.Mercury = {});
   jQuery.extend(this.Mercury, {
-    version: '0.2.3',
+    version: '0.3.0',
     Regions: Mercury.Regions || {},
     modalHandlers: Mercury.modalHandlers || {},
     lightviewHandlers: Mercury.lightviewHandlers || {},
@@ -13432,7 +13458,7 @@ Showdown.converter = function() {
       if (window.mercuryInstance) {
         throw Mercury.I18n('Mercury.PageEditor can only be instantiated once.');
       }
-      if (this.options.visible !== false) {
+      if (!(this.options.visible === false || this.options.visible === 'no')) {
         this.options.visible = true;
       }
       this.visible = this.options.visible;
@@ -13463,7 +13489,7 @@ Showdown.converter = function() {
       this.iframe.on('load', __bind(function() {
         return this.initializeFrame();
       }, this));
-      return this.iframe.get(0).contentWindow.document.location.href = this.iframeSrc();
+      return this.iframe.get(0).contentWindow.document.location.href = this.iframeSrc(null, true);
     };
     PageEditor.prototype.initializeFrame = function() {
       var iframeWindow, stylesToInject;
@@ -13591,9 +13617,13 @@ Showdown.converter = function() {
         }
       }, this));
       Mercury.on('action', __bind(function(event, options) {
-        if (options.action === 'save') {
-          return this.save();
+        var action;
+        action = Mercury.config.globalBehaviors[options.action] || this[options.action];
+        if (typeof action !== 'function') {
+          return;
         }
+        options.already_handled = true;
+        return action.call(this, options);
       }, this));
       this.document.on('mousedown', function(event) {
         Mercury.trigger('hide:dialogs');
@@ -13669,12 +13699,21 @@ Showdown.converter = function() {
       });
       return Mercury.trigger('resize');
     };
-    PageEditor.prototype.iframeSrc = function(url) {
+    PageEditor.prototype.iframeSrc = function(url, params) {
+      var _ref;
       if (url == null) {
         url = null;
       }
-      url = (url != null ? url : window.location.href).replace(/([http|https]:\/\/.[^\/]*)\/editor\/?(.*)/i, "$1/$2");
-      return "" + url + (url.indexOf('?') > -1 ? '&' : '?') + "mercury_frame=true";
+      if (params == null) {
+        params = false;
+      }
+      url = (url != null ? url : window.location.href).replace((_ref = Mercury.editorUrlRegEx) != null ? _ref : Mercury.editorUrlRegEx = /([http|https]:\/\/.[^\/]*)\/editor\/?(.*)/i, "$1/$2");
+      url = url.replace(/[\?|\&]mercury_frame=true/gi, '');
+      if (params) {
+        return "" + url + (url.indexOf('?') > -1 ? '&' : '?') + "mercury_frame=true";
+      } else {
+        return url;
+      }
     };
     PageEditor.prototype.hijackLinksAndForms = function() {
       var classname, element, ignored, _i, _j, _len, _len2, _ref, _ref2, _results;
@@ -13732,11 +13771,11 @@ Showdown.converter = function() {
           _method: method
         },
         success: __bind(function() {
-          if (callback) {
-            callback();
-          }
           Mercury.changes = false;
-          return Mercury.trigger('saved');
+          Mercury.trigger('saved');
+          if (typeof callback === 'function') {
+            return callback();
+          }
         }, this),
         error: __bind(function() {
           return Mercury.notify('Mercury was unable to save to the url: %s', url);
@@ -14589,9 +14628,14 @@ Showdown.converter = function() {
       Mercury.trigger('focus:window');
       this.initialize();
       if (this.visible) {
-        return this.update();
+        this.update();
       } else {
-        return this.appear();
+        this.appear();
+      }
+      if (this.options.content) {
+        return setTimeout(500, __bind(function() {
+          return this.loadContent(this.options.content);
+        }, this));
       }
     },
     initialize: function() {
@@ -14831,7 +14875,14 @@ Showdown.converter = function() {
       return this.resize();
     },
     setTitle: function() {
-      return this.titleElement.find('span').html(Mercury.I18n(this.options.title));
+      var closeButton;
+      this.titleElement.find('span').html(Mercury.I18n(this.options.title));
+      closeButton = this.titleElement.find('a');
+      if (this.options.closeButton === false) {
+        return closeButton.hide();
+      } else {
+        return closeButton.show();
+      }
     },
     reset: function() {
       this.titleElement.find('span').html('');
@@ -14868,9 +14919,14 @@ Showdown.converter = function() {
       Mercury.trigger('focus:window');
       this.initialize();
       if (this.visible) {
-        return this.update();
+        this.update();
       } else {
-        return this.appear();
+        this.appear();
+      }
+      if (this.options.content) {
+        return setTimeout(500, __bind(function() {
+          return this.loadContent(this.options.content);
+        }, this));
       }
     },
     initialize: function() {
@@ -16240,7 +16296,9 @@ Showdown.converter = function() {
         this.pushHistory();
       }
       Mercury.log('execCommand', action, options.value);
-      return Mercury.changes = true;
+      if (!options.already_handled) {
+        return Mercury.changes = true;
+      }
     };
     Region.prototype.pushHistory = function() {
       return this.history.push(this.content());

public/mercury/javascripts/mercury_loader.js

@@ -99,6 +99,7 @@ if (!window.mercuryPackages) window.mercuryPackages = {
         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;
         });
       }

public/mercury/stylesheets/mercury.css

@@ -33,6 +33,7 @@
  *---------------------------------------------------------------------------*/
 
 html, body {
+  -webkit-transition: -webkit-transform 3s;
   margin: 0;
   padding: 0;
   overflow: hidden;
@@ -709,7 +710,9 @@ form fieldset.buttons .commit input:hover {
   float: left;
   margin-left: 10px;
 }
-
+#mercury_table #table_options .inputs:first-child label {
+  width: 36%
+}
 /*
  * Statusbar
  *----------------------------------------------------------------------------*/

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

@@ -34,7 +34,7 @@
 #
 @Mercury ||= {}
 jQuery.extend @Mercury,
-  version: '0.2.3'
+  version: '0.3.0'
 
   # Mercury object namespaces
   Regions: Mercury.Regions || {}