mera 0.1.7 → 0.1.8

data/lib/assets/javascripts/mera.js

@@ -9,8 +9,14 @@
 
 $(function(){
 
-    $.mera = function(options){
-        $('a[data-skip-mera]').mera(options);
+    $.mera = {
+        init: function(options){
+            return $('a[data-skip-mera]').mera(options);
+        },
+
+        version: function(){
+            return "0.1.8";
+        }
     };
 
     jQuery.fn.mera = function(options) {
@@ -24,13 +30,14 @@ $(function(){
         $default = {
            before  : function(){$('body').hide();},
            after   : function(){$('body').fadeIn();},
-           error   : function(){window.location.replace('/404.html')},
+           error   : function(xhr, status, error){alert(error);},
            confirme : function(question){return confirm(question);},
-           compress: true,
-           autoload: true
+           compress: true
         };
         //get user options
         $options = $.extend({}, $default, options);
+        //get if data-update-only
+        $dataUpdateOnly = false;
 
         $this.click(function(){
            window.location.href = $(this).attr('href');
@@ -38,7 +45,7 @@ $(function(){
 
         //handle a click
         $('a:not([data-remote=true])').click(function(){
-            var hrefMera = $(this).attr('href');
+            var hrefMera       = $(this).attr('href');
 
             if($(this).attr('data-method') !== undefined){
                 $.rails.handleMethodRemote($(this));
@@ -77,6 +84,10 @@ $(function(){
             $options.after();
         });
 
+        $(window).on('ajax:error', function(event, xhr, status, error) {
+            $options.error(xhr, status, error);
+        });
+
         $.meraUpdater = function(data){
             var resBody = data.split(/.*<body.*>.*/)[1].split(/.*<\/body>.*/)[0];
             var resHead = data.split(/.*<head.*>.*/)[1].split(/.*<\/head>.*/)[0];
@@ -86,14 +97,7 @@ $(function(){
                 resHead = $.whiteSpaceRemover(resHead);
             }
 
-            if($options.autoload){
-                $('head').html(resHead);
-            } else {
-                if(!$.isHeadSame(resHead)){
-                    $('head').html(resHead);
-                }
-            }
-
+            $('head').html(resHead);
             $('body').html(resBody);
         };
 
@@ -105,11 +109,6 @@ $(function(){
             return data;
         };
 
-        $.isHeadSame = function(head) {
-            var ident = "head link, head meta, head script";
-            return $(ident).count == $(ident, $(head)).count;
-        };
-
         $.rails.handleMethodRemote = function(link) {
             var href = $.rails.href(link),
                 method = link.data('method'),
@@ -128,10 +127,19 @@ $(function(){
 
             form.hide().append(metadata_input).appendTo('body');
 
-            if(confirmLink !== undefined && $options.confirme(confirmLink)){
+            if(confirmLink !== undefined ){
+                if($options.confirme(confirmLink)){
+                    $.rails.handleRemote(form);
+                }
+            } else {
                 $.rails.handleRemote(form);
             }
-        }
+        };
 
     };
 });
+
+$(document).ready(function(){
+    $.mera.init();
+});
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mera
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails