mercury-rails 0.2.0 → 0.2.3

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

@@ -21,7 +21,7 @@ class @Mercury.Regions.Markupable extends Mercury.Region
     @textarea.attr('class', @element.attr('class')).addClass('mercury-textarea')
     @textarea.css({border: 0, background: 'transparent', display: 'block', width: width, height: height, fontFamily: '"Courier New", Courier, monospace', fontSize: '14px'})
     @element.empty().append(@textarea)
-    @element.removeClass('mercury-region')
+    @element.removeClass(Mercury.config.regionClass)
 
     @previewElement = jQuery('<div>', @document)
     @element.append(@previewElement)

data/vendor/assets/javascripts/mercury/support/history.js

@@ -0,0 +1 @@
+(function(a,b){"use strict";var c=a.History=a.History||{};if(typeof c.Adapter!="undefined")throw new Error("History.js Adapter has already been loaded...");c.Adapter={handlers:{},_uid:1,uid:function(a){return a._uid||(a._uid=c.Adapter._uid++)},bind:function(a,b,d){var e=c.Adapter.uid(a);c.Adapter.handlers[e]=c.Adapter.handlers[e]||{},c.Adapter.handlers[e][b]=c.Adapter.handlers[e][b]||[],c.Adapter.handlers[e][b].push(d),a["on"+b]=function(a,b){return function(d){c.Adapter.trigger(a,b,d)}}(a,b)},trigger:function(a,b,d){d=d||{};var e=c.Adapter.uid(a),f,g;c.Adapter.handlers[e]=c.Adapter.handlers[e]||{},c.Adapter.handlers[e][b]=c.Adapter.handlers[e][b]||[];for(f=0,g=c.Adapter.handlers[e][b].length;f<g;++f)c.Adapter.handlers[e][b][f].apply(this,[d])},extractEventData:function(a,c){var d=c&&c[a]||b;return d},onDomLoad:function(b){var c=a.setTimeout(function(){b()},2e3);a.onload=function(){clearTimeout(c),b()}}},typeof c.init!="undefined"&&c.init()})(window),function(a,b){"use strict";var c=a.console||b,d=a.document,e=a.navigator,f=a.sessionStorage||!1,g=a.setTimeout,h=a.clearTimeout,i=a.setInterval,j=a.clearInterval,k=a.JSON,l=a.alert,m=a.History=a.History||{},n=a.history;k.stringify=k.stringify||k.encode,k.parse=k.parse||k.decode;if(typeof m.init!="undefined")throw new Error("History.js Core has already been loaded...");m.init=function(){return typeof m.Adapter=="undefined"?!1:(typeof m.initCore!="undefined"&&m.initCore(),typeof m.initHtml4!="undefined"&&m.initHtml4(),!0)},m.initCore=function(){if(typeof m.initCore.initialized!="undefined")return!1;m.initCore.initialized=!0,m.options=m.options||{},m.options.hashChangeInterval=m.options.hashChangeInterval||100,m.options.safariPollInterval=m.options.safariPollInterval||500,m.options.doubleCheckInterval=m.options.doubleCheckInterval||500,m.options.storeInterval=m.options.storeInterval||1e3,m.options.busyDelay=m.options.busyDelay||250,m.options.debug=m.options.debug||!1,m.options.initialTitle=m.options.initialTitle||d.title,m.intervalList=[],m.clearAllIntervals=function(){var a,b=m.intervalList;if(typeof b!="undefined"&&b!==null){for(a=0;a<b.length;a++)j(b[a]);m.intervalList=null}},m.debug=function(){(m.options.debug||!1)&&m.log.apply(m,arguments)},m.log=function(){var a=typeof c!="undefined"&&typeof c.log!="undefined"&&typeof c.log.apply!="undefined",b=d.getElementById("log"),e,f,g,h,i;a?(h=Array.prototype.slice.call(arguments),e=h.shift(),typeof c.debug!="undefined"?c.debug.apply(c,[e,h]):c.log.apply(c,[e,h])):e="\n"+arguments[0]+"\n";for(f=1,g=arguments.length;f<g;++f){i=arguments[f];if(typeof i=="object"&&typeof k!="undefined")try{i=k.stringify(i)}catch(j){}e+="\n"+i+"\n"}return b?(b.value+=e+"\n-----\n",b.scrollTop=b.scrollHeight-b.clientHeight):a||l(e),!0},m.getInternetExplorerMajorVersion=function(){var a=m.getInternetExplorerMajorVersion.cached=typeof m.getInternetExplorerMajorVersion.cached!="undefined"?m.getInternetExplorerMajorVersion.cached:function(){var a=3,b=d.createElement("div"),c=b.getElementsByTagName("i");while((b.innerHTML="<!--[if gt IE "+ ++a+"]><i></i><![endif]-->")&&c[0]);return a>4?a:!1}();return a},m.isInternetExplorer=function(){var a=m.isInternetExplorer.cached=typeof m.isInternetExplorer.cached!="undefined"?m.isInternetExplorer.cached:Boolean(m.getInternetExplorerMajorVersion());return a},m.emulated={pushState:!Boolean(a.history&&a.history.pushState&&a.history.replaceState&&!/ Mobile\/([1-7][a-z]|(8([abcde]|f(1[0-8]))))/i.test(e.userAgent)&&!/AppleWebKit\/5([0-2]|3[0-2])/i.test(e.userAgent)),hashChange:Boolean(!("onhashchange"in a||"onhashchange"in d)||m.isInternetExplorer()&&m.getInternetExplorerMajorVersion()<8)},m.enabled=!m.emulated.pushState,m.bugs={setHash:Boolean(!m.emulated.pushState&&e.vendor==="Apple Computer, Inc."&&/AppleWebKit\/5([0-2]|3[0-3])/.test(e.userAgent)),safariPoll:Boolean(!m.emulated.pushState&&e.vendor==="Apple Computer, Inc."&&/AppleWebKit\/5([0-2]|3[0-3])/.test(e.userAgent)),ieDoubleCheck:Boolean(m.isInternetExplorer()&&m.getInternetExplorerMajorVersion()<8),hashEscape:Boolean(m.isInternetExplorer()&&m.getInternetExplorerMajorVersion()<7)},m.isEmptyObject=function(a){for(var b in a)return!1;return!0},m.cloneObject=function(a){var b,c;return a?(b=k.stringify(a),c=k.parse(b)):c={},c},m.getRootUrl=function(){var a=d.location.protocol+"//"+(d.location.hostname||d.location.host);if(d.location.port||!1)a+=":"+d.location.port;return a+="/",a},m.getBaseHref=function(){var a=d.getElementsByTagName("base"),b=null,c="";return a.length===1&&(b=a[0],c=b.href.replace(/[^\/]+$/,"")),c=c.replace(/\/+$/,""),c&&(c+="/"),c},m.getBaseUrl=function(){var a=m.getBaseHref()||m.getBasePageUrl()||m.getRootUrl();return a},m.getPageUrl=function(){var a=m.getState(!1,!1),b=(a||{}).url||d.location.href,c;return c=b.replace(/\/+$/,"").replace(/[^\/]+$/,function(a,b,c){return/\./.test(a)?a:a+"/"}),c},m.getBasePageUrl=function(){var a=d.location.href.replace(/[#\?].*/,"").replace(/[^\/]+$/,function(a,b,c){return/[^\/]$/.test(a)?"":a}).replace(/\/+$/,"")+"/";return a},m.getFullUrl=function(a,b){var c=a,d=a.substring(0,1);return b=typeof b=="undefined"?!0:b,/[a-z]+\:\/\//.test(a)||(d==="/"?c=m.getRootUrl()+a.replace(/^\/+/,""):d==="#"?c=m.getPageUrl().replace(/#.*/,"")+a:d==="?"?c=m.getPageUrl().replace(/[\?#].*/,"")+a:b?c=m.getBaseUrl()+a.replace(/^(\.\/)+/,""):c=m.getBasePageUrl()+a.replace(/^(\.\/)+/,"")),c.replace(/\#$/,"")},m.getShortUrl=function(a){var b=a,c=m.getBaseUrl(),d=m.getRootUrl();return m.emulated.pushState&&(b=b.replace(c,"")),b=b.replace(d,"/"),m.isTraditionalAnchor(b)&&(b="./"+b),b=b.replace(/^(\.\/)+/g,"./").replace(/\#$/,""),b},m.store={},m.idToState=m.idToState||{},m.stateToId=m.stateToId||{},m.urlToId=m.urlToId||{},m.storedStates=m.storedStates||[],m.savedStates=m.savedStates||[],m.normalizeStore=function(){m.store.idToState=m.store.idToState||{},m.store.urlToId=m.store.urlToId||{},m.store.stateToId=m.store.stateToId||{}},m.getState=function(a,b){typeof a=="undefined"&&(a=!0),typeof b=="undefined"&&(b=!0);var c=m.getLastSavedState();return!c&&b&&(c=m.createStateObject()),a&&(c=m.cloneObject(c),c.url=c.cleanUrl||c.url),c},m.getIdByState=function(a){var b=m.extractId(a.url),c;if(!b){c=m.getStateString(a);if(typeof m.stateToId[c]!="undefined")b=m.stateToId[c];else if(typeof m.store.stateToId[c]!="undefined")b=m.store.stateToId[c];else{for(;;){b=(new Date).getTime()+String(Math.random()).replace(/\D/g,"");if(typeof m.idToState[b]=="undefined"&&typeof m.store.idToState[b]=="undefined")break}m.stateToId[c]=b,m.idToState[b]=a}}return b},m.normalizeState=function(a){var b,c;if(!a||typeof a!="object")a={};if(typeof a.normalized!="undefined")return a;if(!a.data||typeof a.data!="object")a.data={};b={},b.normalized=!0,b.title=a.title||"",b.url=m.getFullUrl(m.unescapeString(a.url||d.location.href)),b.hash=m.getShortUrl(b.url),b.data=m.cloneObject(a.data),b.id=m.getIdByState(b),b.cleanUrl=b.url.replace(/\??\&_suid.*/,""),b.url=b.cleanUrl,c=!m.isEmptyObject(b.data);if(b.title||c)b.hash=m.getShortUrl(b.url).replace(/\??\&_suid.*/,""),/\?/.test(b.hash)||(b.hash+="?"),b.hash+="&_suid="+b.id;return b.hashedUrl=m.getFullUrl(b.hash),(m.emulated.pushState||m.bugs.safariPoll)&&m.hasUrlDuplicate(b)&&(b.url=b.hashedUrl),b},m.createStateObject=function(a,b,c){var d={data:a,title:b,url:c};return d=m.normalizeState(d),d},m.getStateById=function(a){a=String(a);var c=m.idToState[a]||m.store.idToState[a]||b;return c},m.getStateString=function(a){var b,c,d;return b=m.normalizeState(a),c={data:b.data,title:a.title,url:a.url},d=k.stringify(c),d},m.getStateId=function(a){var b,c;return b=m.normalizeState(a),c=b.id,c},m.getHashByState=function(a){var b,c;return b=m.normalizeState(a),c=b.hash,c},m.extractId=function(a){var b,c,d;return c=/(.*)\&_suid=([0-9]+)$/.exec(a),d=c?c[1]||a:a,b=c?String(c[2]||""):"",b||!1},m.isTraditionalAnchor=function(a){var b=!/[\/\?\.]/.test(a);return b},m.extractState=function(a,b){var c=null,d,e;return b=b||!1,d=m.extractId(a),d&&(c=m.getStateById(d)),c||(e=m.getFullUrl(a),d=m.getIdByUrl(e)||!1,d&&(c=m.getStateById(d)),!c&&b&&!m.isTraditionalAnchor(a)&&(c=m.createStateObject(null,null,e))),c},m.getIdByUrl=function(a){var c=m.urlToId[a]||m.store.urlToId[a]||b;return c},m.getLastSavedState=function(){return m.savedStates[m.savedStates.length-1]||b},m.getLastStoredState=function(){return m.storedStates[m.storedStates.length-1]||b},m.hasUrlDuplicate=function(a){var b=!1,c;return c=m.extractState(a.url),b=c&&c.id!==a.id,b},m.storeState=function(a){return m.urlToId[a.url]=a.id,m.storedStates.push(m.cloneObject(a)),a},m.isLastSavedState=function(a){var b=!1,c,d,e;return m.savedStates.length&&(c=a.id,d=m.getLastSavedState(),e=d.id,b=c===e),b},m.saveState=function(a){return m.isLastSavedState(a)?!1:(m.savedStates.push(m.cloneObject(a)),!0)},m.getStateByIndex=function(a){var b=null;return typeof a=="undefined"?b=m.savedStates[m.savedStates.length-1]:a<0?b=m.savedStates[m.savedStates.length+a]:b=m.savedStates[a],b},m.getHash=function(){var a=m.unescapeHash(d.location.hash);return a},m.unescapeString=function(b){var c=b,d;for(;;){d=a.unescape(c);if(d===c)break;c=d}return c},m.unescapeHash=function(a){var b=m.normalizeHash(a);return b=m.unescapeString(b),b},m.normalizeHash=function(a){var b=a.replace(/[^#]*#/,"").replace(/#.*/,"");return b},m.setHash=function(a,b){var c,e,f;return b!==!1&&m.busy()?(m.pushQueue({scope:m,callback:m.setHash,args:arguments,queue:b}),!1):(c=m.escapeHash(a),m.busy(!0),e=m.extractState(a,!0),e&&!m.emulated.pushState?m.pushState(e.data,e.title,e.url,!1):d.location.hash!==c&&(m.bugs.setHash?(f=m.getPageUrl(),m.pushState(null,null,f+"#"+c,!1)):d.location.hash=c),m)},m.escapeHash=function(b){var c=m.normalizeHash(b);return c=a.escape(c),m.bugs.hashEscape||(c=c.replace(/\%21/g,"!").replace(/\%26/g,"&").replace(/\%3D/g,"=").replace(/\%3F/g,"?")),c},m.getHashByUrl=function(a){var b=String(a).replace(/([^#]*)#?([^#]*)#?(.*)/,"$2");return b=m.unescapeHash(b),b},m.setTitle=function(a){var b=a.title,c;b||(c=m.getStateByIndex(0),c&&c.url===a.url&&(b=c.title||m.options.initialTitle));try{d.getElementsByTagName("title")[0].innerHTML=b.replace("<","&lt;").replace(">","&gt;").replace(" & "," &amp; ")}catch(e){}return d.title=b,m},m.queues=[],m.busy=function(a){typeof a!="undefined"?m.busy.flag=a:typeof m.busy.flag=="undefined"&&(m.busy.flag=!1);if(!m.busy.flag){h(m.busy.timeout);var b=function(){var a,c,d;if(m.busy.flag)return;for(a=m.queues.length-1;a>=0;--a){c=m.queues[a];if(c.length===0)continue;d=c.shift(),m.fireQueueItem(d),m.busy.timeout=g(b,m.options.busyDelay)}};m.busy.timeout=g(b,m.options.busyDelay)}return m.busy.flag},m.busy.flag=!1,m.fireQueueItem=function(a){return a.callback.apply(a.scope||m,a.args||[])},m.pushQueue=function(a){return m.queues[a.queue||0]=m.queues[a.queue||0]||[],m.queues[a.queue||0].push(a),m},m.queue=function(a,b){return typeof a=="function"&&(a={callback:a}),typeof b!="undefined"&&(a.queue=b),m.busy()?m.pushQueue(a):m.fireQueueItem(a),m},m.clearQueue=function(){return m.busy.flag=!1,m.queues=[],m},m.stateChanged=!1,m.doubleChecker=!1,m.doubleCheckComplete=function(){return m.stateChanged=!0,m.doubleCheckClear(),m},m.doubleCheckClear=function(){return m.doubleChecker&&(h(m.doubleChecker),m.doubleChecker=!1),m},m.doubleCheck=function(a){return m.stateChanged=!1,m.doubleCheckClear(),m.bugs.ieDoubleCheck&&(m.doubleChecker=g(function(){return m.doubleCheckClear(),m.stateChanged||a(),!0},m.options.doubleCheckInterval)),m},m.safariStatePoll=function(){var b=m.extractState(d.location.href),c;if(!m.isLastSavedState(b))c=b;else return;return c||(c=m.createStateObject()),m.Adapter.trigger(a,"popstate"),m},m.back=function(a){return a!==!1&&m.busy()?(m.pushQueue({scope:m,callback:m.back,args:arguments,queue:a}),!1):(m.busy(!0),m.doubleCheck(function(){m.back(!1)}),n.go(-1),!0)},m.forward=function(a){return a!==!1&&m.busy()?(m.pushQueue({scope:m,callback:m.forward,args:arguments,queue:a}),!1):(m.busy(!0),m.doubleCheck(function(){m.forward(!1)}),n.go(1),!0)},m.go=function(a,b){var c;if(a>0)for(c=1;c<=a;++c)m.forward(b);else{if(!(a<0))throw new Error("History.go: History.go requires a positive or negative integer passed.");for(c=-1;c>=a;--c)m.back(b)}return m};if(m.emulated.pushState){var o=function(){};m.pushState=m.pushState||o,m.replaceState=m.replaceState||o}else m.onPopState=function(b,c){var e=!1,f=!1,g,h;return m.doubleCheckComplete(),g=m.getHash(),g?(h=m.extractState(g||d.location.href,!0),h?m.replaceState(h.data,h.title,h.url,!1):(m.Adapter.trigger(a,"anchorchange"),m.busy(!1)),m.expectedStateId=!1,!1):(e=m.Adapter.extractEventData("state",b,c)||!1,e?f=m.getStateById(e):m.expectedStateId?f=m.getStateById(m.expectedStateId):f=m.extractState(d.location.href),f||(f=m.createStateObject(null,null,d.location.href)),m.expectedStateId=!1,m.isLastSavedState(f)?(m.busy(!1),!1):(m.storeState(f),m.saveState(f),m.setTitle(f),m.Adapter.trigger(a,"statechange"),m.busy(!1),!0))},m.Adapter.bind(a,"popstate",m.onPopState),m.pushState=function(b,c,d,e){if(m.getHashByUrl(d)&&m.emulated.pushState)throw new Error("History.js does not support states with fragement-identifiers (hashes/anchors).");if(e!==!1&&m.busy())return m.pushQueue({scope:m,callback:m.pushState,args:arguments,queue:e}),!1;m.busy(!0);var f=m.createStateObject(b,c,d);return m.isLastSavedState(f)?m.busy(!1):(m.storeState(f),m.expectedStateId=f.id,n.pushState(f.id,f.title,f.url),m.Adapter.trigger(a,"popstate")),!0},m.replaceState=function(b,c,d,e){if(m.getHashByUrl(d)&&m.emulated.pushState)throw new Error("History.js does not support states with fragement-identifiers (hashes/anchors).");if(e!==!1&&m.busy())return m.pushQueue({scope:m,callback:m.replaceState,args:arguments,queue:e}),!1;m.busy(!0);var f=m.createStateObject(b,c,d);return m.isLastSavedState(f)?m.busy(!1):(m.storeState(f),m.expectedStateId=f.id,n.replaceState(f.id,f.title,f.url),m.Adapter.trigger(a,"popstate")),!0};if(f){try{m.store=k.parse(f.getItem("History.store"))||{}}catch(p){m.store={}}m.normalizeStore()}else m.store={},m.normalizeStore();m.Adapter.bind(a,"beforeunload",m.clearAllIntervals),m.Adapter.bind(a,"unload",m.clearAllIntervals),m.saveState(m.storeState(m.extractState(d.location.href,!0))),f&&(m.onUnload=function(){var a,b;try{a=k.parse(f.getItem("History.store"))||{}}catch(c){a={}}a.idToState=a.idToState||{},a.urlToId=a.urlToId||{},a.stateToId=a.stateToId||{};for(b in m.idToState){if(!m.idToState.hasOwnProperty(b))continue;a.idToState[b]=m.idToState[b]}for(b in m.urlToId){if(!m.urlToId.hasOwnProperty(b))continue;a.urlToId[b]=m.urlToId[b]}for(b in m.stateToId){if(!m.stateToId.hasOwnProperty(b))continue;a.stateToId[b]=m.stateToId[b]}m.store=a,m.normalizeStore(),f.setItem("History.store",k.stringify(a))},m.intervalList.push(i(m.onUnload,m.options.storeInterval)),m.Adapter.bind(a,"beforeunload",m.onUnload),m.Adapter.bind(a,"unload",m.onUnload));if(!m.emulated.pushState){m.bugs.safariPoll&&m.intervalList.push(i(m.safariStatePoll,m.options.safariPollInterval));if(e.vendor==="Apple Computer, Inc."||(e.appCodeName||"")==="Mozilla")m.Adapter.bind(a,"hashchange",function(){m.Adapter.trigger(a,"popstate")}),m.getHash()&&m.Adapter.onDomLoad(function(){m.Adapter.trigger(a,"hashchange")})}},m.init()}(window)

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

@@ -90,7 +90,6 @@ jQuery.extend Mercury.uploader, {
     jQuery.each ['onloadstart', 'onprogress', 'onload', 'onabort', 'onerror'], (index, eventName) =>
       xhr.upload[eventName] = (event) => @uploaderEvents[eventName].call(@, event)
     xhr.onload = (event) =>
-      console.debug(event)
       if (event.currentTarget.status >= 400)
         @updateStatus('Error: Unable to upload the file')
         alert("#{event.currentTarget.status}: Unable to process response")

data/vendor/assets/javascripts/mercury_loader.js

@@ -107,9 +107,9 @@ if (!window.mercuryPackages) window.mercuryPackages = {
       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 = ' ';
+        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
+          document.styleSheets[i].disabled = true;
         }
 
         // Load all the stylesheets.
@@ -137,7 +137,7 @@ if (!window.mercuryPackages) window.mercuryPackages = {
               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, {visible: true});
+              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() {}).
@@ -147,7 +147,7 @@ if (!window.mercuryPackages) window.mercuryPackages = {
             } else {
               loadScript(javascripts[loaded]);
             }
-          }
+          };
         }
         loadScript(javascripts[loaded]);
       }, 1);

data/vendor/assets/stylesheets/mercury/lightview.css

@@ -48,6 +48,14 @@
   white-space: nowrap;
   text-shadow: 1px 1px 2px rgba(100, 100, 100, .5);
 }
+.mercury-lightview h1.mercury-lightview-title a.mercury-lightview-close {
+  float: right;
+  width: 32px;
+  height: 42px;
+  margin: -14px -20px;
+  background: url(/assets/mercury/close.png) no-repeat center;
+}
+
 /*
  * Forms
  *----------------------------------------------------------------------------*/

data/vendor/assets/stylesheets/mercury/mercury.css

@@ -16,6 +16,18 @@ html, body {
   overflow: hidden;
 }
 
+.mercury-iframe {
+  position: absolute;
+  top: 0;
+  width: 100%;
+  visibility: hidden;
+}
+
+.mercury-focusable {
+  position: absolute;
+  opacity: 0;
+}
+
 
 /*
  * Forms

data/vendor/assets/stylesheets/mercury/modal.css

@@ -130,18 +130,6 @@
   border: 0;
   margin-top: -2px;
 }
-/* html sanitizer (when pasting from msword) */
-#mercury_sanitizer .information {
-  background: url(/assets/mercury/clippy.png) no-repeat top left;
-  min-height: 65px;
-  padding-left: 50px;
-  margin-bottom: 10px;
-}
-#mercury_sanitizer textarea {
-  width: 100%;
-  font-family: monospace;
-  white-space: pre;
-}
 /* character */
 #mercury_character .character {
   float: left;

data/vendor/assets/stylesheets/mercury/toolbar.css

@@ -14,6 +14,7 @@
   -webkit-user-select: none;
   -moz-user-select: none;
   user-select: none;
+  background: #DDD;
   background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, rgb(198,198,198)), color-stop(1, rgb(226,225,226)));
   background-image: -moz-linear-gradient(center bottom, rgb(198,198,198) 0%, rgb(226,225,226) 100%);
   border-bottom: 1px solid #727272;

data/vendor/assets/stylesheets/mercury_overrides.css

@@ -0,0 +1,17 @@
+/*!
+ * 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 the CSS that comes default with Mercury Editor, and
+ * includes an example button style, should you ever need to add new ones yourself.  Read the toolbar configuration in
+ * mercury.js for more on how to add your own buttons to the toolbar.
+ */
+
+/* Disable text sizing in webkit (ipad/iphone etc -- should apply to mercury only) */
+html { -webkit-text-size-adjust: none; }
+
+/* Button example */
+.mercury-primary-toolbar .mercury-inspector-button em,
+.mercury-expander-button[data-button="inspector"] em {
+  background-image: url(/assets/mercury/toolbar/primary/inspectorpanel.png);
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercury-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-25 00:00:00.000000000 -06:00
-default_executable: 
+date: 2011-10-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2185441740 !ruby/object:Gem::Requirement
+  requirement: &70222954560820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2185441740
+  version_requirements: *70222954560820
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2185441240 !ruby/object:Gem::Requirement
+  requirement: &70222954559760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2185441240
+  version_requirements: *70222954559760
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &2185440740 !ruby/object:Gem::Requirement
+  requirement: &70222954540560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2185440740
+  version_requirements: *70222954540560
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2185440220 !ruby/object:Gem::Requirement
+  requirement: &70222954525380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2185440220
+  version_requirements: *70222954525380
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2185439720 !ruby/object:Gem::Requirement
+  requirement: &70222954511000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2185439720
+  version_requirements: *70222954511000
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2185439220 !ruby/object:Gem::Requirement
+  requirement: &70222954506180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2185439220
+  version_requirements: *70222954506180
 - !ruby/object:Gem::Dependency
   name: rocco
-  requirement: &2185438700 !ruby/object:Gem::Requirement
+  requirement: &70222954502320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2185438700
+  version_requirements: *70222954502320
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2185438200 !ruby/object:Gem::Requirement
+  requirement: &70222954496080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2185438200
+  version_requirements: *70222954496080
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2185437700 !ruby/object:Gem::Requirement
+  requirement: &70222949933400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2185437700
+  version_requirements: *70222949933400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2185437160 !ruby/object:Gem::Requirement
+  requirement: &70222949929940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2185437160
+  version_requirements: *70222949929940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2185436660 !ruby/object:Gem::Requirement
+  requirement: &70222949924760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2185436660
+  version_requirements: *70222949924760
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &2185436160 !ruby/object:Gem::Requirement
+  requirement: &70222949920740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2185436160
+  version_requirements: *70222949920740
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2185435640 !ruby/object:Gem::Requirement
+  requirement: &70222949893740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2185435640
+  version_requirements: *70222949893740
 - !ruby/object:Gem::Dependency
   name: evergreen
-  requirement: &2185435140 !ruby/object:Gem::Requirement
+  requirement: &70222949888300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2185435140
+  version_requirements: *70222949888300
 description: A fully featured and advanced HTML5 WYSIWYG editor written in CoffeeScript
   on top of Rails 3.1
 email: jejacks0n@gmail.com
@@ -176,6 +175,7 @@ extra_rdoc_files:
 - README.md
 files:
 - LICENSE
+- POST_INSTALL
 - README.md
 - VERSION
 - annotated_source.template
@@ -184,12 +184,10 @@ files:
 - app/models/image.rb
 - app/views/layouts/mercury.html.erb
 - app/views/mercury/lightviews/about.html
-- app/views/mercury/lightviews/imageprocessor.html
 - app/views/mercury/modals/character.html
 - app/views/mercury/modals/htmleditor.html
 - app/views/mercury/modals/link.html
 - app/views/mercury/modals/media.html
-- app/views/mercury/modals/sanitizer.html
 - app/views/mercury/modals/table.html
 - app/views/mercury/palettes/backcolor.html
 - app/views/mercury/palettes/forecolor.html
@@ -198,15 +196,41 @@ files:
 - app/views/mercury/panels/snippets.html
 - app/views/mercury/selects/formatblock.html
 - app/views/mercury/selects/style.html
-- app/views/mercury/snippets/example.html.erb
-- app/views/mercury/snippets/example_options.html.erb
+- app/views/mercury/snippets/example/options.html.erb
+- app/views/mercury/snippets/example/preview.html.erb
 - config/engine.rb
 - config/routes.rb
 - db/migrate/20110526035601_create_images.rb
-- features/editing/basic.feature
+- 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/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/snippetable/advanced_editing.feature
+- features/regions/snippetable/basic_editing.feature
+- features/regions/snippetable/inserting_snippets.feature
+- features/saving/saving.feature
 - features/step_definitions/debug_steps.rb
+- features/step_definitions/mercury_steps.rb
 - features/step_definitions/web_steps.rb
 - features/support/env.rb
+- features/support/mercury_contents.rb
+- features/support/mercury_selectors.rb
 - features/support/paths.rb
 - features/support/selectors.rb
 - lib/generators/mercury/install/install_generator.rb
@@ -281,7 +305,7 @@ files:
 - spec/javascripts/templates/mercury/tooltip.html
 - spec/javascripts/templates/mercury/uploader.html
 - vendor/assets/images/mercury/button.png
-- vendor/assets/images/mercury/clippy.png
+- vendor/assets/images/mercury/close.png
 - vendor/assets/images/mercury/default-snippet.png
 - vendor/assets/images/mercury/loading-dark.gif
 - vendor/assets/images/mercury/loading-light.gif
@@ -304,6 +328,12 @@ files:
 - vendor/assets/images/mercury/toolbar/primary/undo.png
 - vendor/assets/images/mercury/toolbar/snippetable/buttons.png
 - vendor/assets/javascripts/mercury.js
+- vendor/assets/javascripts/mercury/dependencies/jquery-1.6.js
+- vendor/assets/javascripts/mercury/dependencies/jquery-ui-1.8.13.custom.js
+- vendor/assets/javascripts/mercury/dependencies/jquery.additions.js
+- vendor/assets/javascripts/mercury/dependencies/jquery.htmlClean.js
+- vendor/assets/javascripts/mercury/dependencies/liquidmetal.js
+- vendor/assets/javascripts/mercury/dependencies/showdown.js
 - vendor/assets/javascripts/mercury/dialog.js.coffee
 - vendor/assets/javascripts/mercury/dialogs/backcolor.js.coffee
 - vendor/assets/javascripts/mercury/dialogs/forecolor.js.coffee
@@ -325,6 +355,8 @@ files:
 - vendor/assets/javascripts/mercury/page_editor.js.coffee
 - vendor/assets/javascripts/mercury/palette.js.coffee
 - vendor/assets/javascripts/mercury/panel.js.coffee
+- vendor/assets/javascripts/mercury/plugins/save_as_xml/mercury/page_editor.js.coffee
+- vendor/assets/javascripts/mercury/plugins/save_as_xml/plugin.js
 - vendor/assets/javascripts/mercury/region.js.coffee
 - vendor/assets/javascripts/mercury/regions/editable.js.coffee
 - vendor/assets/javascripts/mercury/regions/markupable.js.coffee
@@ -333,6 +365,7 @@ files:
 - vendor/assets/javascripts/mercury/snippet.js.coffee
 - vendor/assets/javascripts/mercury/snippet_toolbar.js.coffee
 - vendor/assets/javascripts/mercury/statusbar.js.coffee
+- vendor/assets/javascripts/mercury/support/history.js
 - vendor/assets/javascripts/mercury/table_editor.js.coffee
 - vendor/assets/javascripts/mercury/toolbar.button.js.coffee
 - vendor/assets/javascripts/mercury/toolbar.button_group.js.coffee
@@ -340,11 +373,6 @@ files:
 - vendor/assets/javascripts/mercury/toolbar.js.coffee
 - vendor/assets/javascripts/mercury/tooltip.js.coffee
 - vendor/assets/javascripts/mercury/uploader.js.coffee
-- vendor/assets/javascripts/mercury_dependencies/jquery-1.6.js
-- vendor/assets/javascripts/mercury_dependencies/jquery-ui-1.8.13.custom.js
-- vendor/assets/javascripts/mercury_dependencies/jquery.additions.js
-- vendor/assets/javascripts/mercury_dependencies/liquidmetal.js
-- vendor/assets/javascripts/mercury_dependencies/showdown.js
 - vendor/assets/javascripts/mercury_loader.js
 - vendor/assets/stylesheets/mercury.css
 - vendor/assets/stylesheets/mercury/dialog.css
@@ -355,7 +383,7 @@ files:
 - vendor/assets/stylesheets/mercury/toolbar.css
 - vendor/assets/stylesheets/mercury/tooltip.css
 - vendor/assets/stylesheets/mercury/uploader.css
-has_rdoc: true
+- vendor/assets/stylesheets/mercury_overrides.css
 homepage: http://github.com/jejacks0n/mercury
 licenses:
 - MIT
@@ -371,7 +399,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2650267615471904873
+      hash: 849858484813898948
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -380,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A fully featured and advanced HTML5 WYSIWYG editor written in CoffeeScript