bettertabs 1.3.4 → 1.3.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bettertabs (1.3.4)
+    bettertabs (1.3.5)
       jquery-rails
       rails (~> 3.1.0)
 

data/app/assets/javascripts/jquery.bettertabs.js

@@ -1,7 +1,7 @@
 (function() {
   /*!
    jQuery Bettertabs Plugin
-   version: 1.3.4 (Sep-13-2011)
+   version: 1.3.5 (Sep-13-2011)
    @requires jQuery v1.3 or later
    
    Examples and documentation at: https://github.com/agoragames/bettertabs
@@ -70,11 +70,15 @@
             if (tab_type_of(this_link) === 'ajax' && !(this_link.data('content-loaded-already') != null)) {
               this_link.addClass('ajax-loading');
               this_tab_content.trigger('bettertabs-before-ajax-loading');
-              return this_tab_content.load(this_link.attr(ajax_url_attr), function() {
-                this_link.removeClass('ajax-loading');
-                this_link.data('content-loaded-already', true);
-                this_tab_content.trigger('bettertabs-after-ajax-loading');
-                return activate_tab_and_content();
+              return this_tab_content.load(this_link.attr(ajax_url_attr), function(responseText, textStatus, XMLHttpRequest) {
+                if (textStatus === 'error') {
+                  return window.location = this_link.attr('href');
+                } else {
+                  this_link.removeClass('ajax-loading');
+                  this_link.data('content-loaded-already', true);
+                  this_tab_content.trigger('bettertabs-after-ajax-loading');
+                  return activate_tab_and_content();
+                }
               });
             } else {
               return activate_tab_and_content();

data/app/assets/javascripts/jquery.bettertabs.js.coffee

@@ -1,6 +1,6 @@
 ###!
  jQuery Bettertabs Plugin
- version: 1.3.4 (Sep-13-2011)
+ version: 1.3.5 (Sep-13-2011)
  @requires jQuery v1.3 or later
  
  Examples and documentation at: https://github.com/agoragames/bettertabs
@@ -71,11 +71,14 @@ $.fn.bettertabs = ->
           if tab_type_of(this_link) is 'ajax' and not this_link.data('content-loaded-already')?
             this_link.addClass('ajax-loading')
             this_tab_content.trigger 'bettertabs-before-ajax-loading'
-            this_tab_content.load this_link.attr(ajax_url_attr), ->
-              this_link.removeClass('ajax-loading')
-              this_link.data('content-loaded-already', yes)
-              this_tab_content.trigger 'bettertabs-after-ajax-loading'
-              activate_tab_and_content()
+            this_tab_content.load this_link.attr(ajax_url_attr), (responseText, textStatus, XMLHttpRequest) ->
+              if textStatus is 'error'
+                window.location = this_link.attr('href')
+              else
+                this_link.removeClass('ajax-loading')
+                this_link.data('content-loaded-already', yes)
+                this_tab_content.trigger 'bettertabs-after-ajax-loading'
+                activate_tab_and_content()
           else
             activate_tab_and_content()
   return this

data/app/assets/javascripts/jquery.bettertabs.min.js

@@ -1,7 +1,7 @@
 (function(){
 /*!
    jQuery Bettertabs Plugin
-   version: 1.3.4 (Sep-13-2011)
+   version: 1.3.5 (Sep-13-2011)
    @requires jQuery v1.3 or later
 
    Examples and documentation at: https://github.com/agoragames/bettertabs
@@ -11,4 +11,4 @@
      http://www.opensource.org/licenses/mit-license.php
      http://www.gnu.org/licenses/gpl.html
   */
-var d,f,c,b,a,e;d=jQuery;a="data-tab-type";b="data-show-content-id";f="data-ajax-url";e=function(g){return g.attr(a)};c=function(g){return g.attr(b)};d.Bettertabs={change_browser_url:function(g){if((typeof history!=="undefined"&&history!==null)&&(history.replaceState!=null)){return history.replaceState(null,document.title,g)}},select_tab:function(h,g){return d("#"+g+"_"+h+"_tab a").click()}};d.fn.bettertabs=function(){this.each(function(){var g,i,k,h,j,l;l=d(this);i=l.find("ul.tabs > li");j=l.find("ul.tabs > li > a");h=l.children(".content");k=i.add(h);g=j.filter(".active");if(e(g)==="ajax"){g.data("content-loaded-already",true)}return j.click(function(p){var r,s,o,n,q,m;n=d(this);if(e(n)!=="link"){p.preventDefault();q=n.parent();if(!q.hasClass("active")&&!n.hasClass("ajax-loading")){m=h.filter("#"+(c(n)));s=i.filter(".active");o=h.filter(".active");r=function(){i.removeClass("active");j.removeClass("active");h.removeClass("active").addClass("hidden");q.addClass("active");n.addClass("active");m.removeClass("hidden").addClass("active");o.trigger("bettertabs-after-deactivate");m.trigger("bettertabs-after-activate");return d.Bettertabs.change_browser_url(n.attr("href"))};o.trigger("bettertabs-before-deactivate");m.trigger("bettertabs-before-activate");if(e(n)==="ajax"&&!(n.data("content-loaded-already")!=null)){n.addClass("ajax-loading");m.trigger("bettertabs-before-ajax-loading");return m.load(n.attr(f),function(){n.removeClass("ajax-loading");n.data("content-loaded-already",true);m.trigger("bettertabs-after-ajax-loading");return r()})}else{return r()}}}})});return this}}).call(this);
+var d,f,c,b,a,e;d=jQuery;a="data-tab-type";b="data-show-content-id";f="data-ajax-url";e=function(g){return g.attr(a)};c=function(g){return g.attr(b)};d.Bettertabs={change_browser_url:function(g){if((typeof history!=="undefined"&&history!==null)&&(history.replaceState!=null)){return history.replaceState(null,document.title,g)}},select_tab:function(h,g){return d("#"+g+"_"+h+"_tab a").click()}};d.fn.bettertabs=function(){this.each(function(){var g,i,k,h,j,l;l=d(this);i=l.find("ul.tabs > li");j=l.find("ul.tabs > li > a");h=l.children(".content");k=i.add(h);g=j.filter(".active");if(e(g)==="ajax"){g.data("content-loaded-already",true)}return j.click(function(p){var r,s,o,n,q,m;n=d(this);if(e(n)!=="link"){p.preventDefault();q=n.parent();if(!q.hasClass("active")&&!n.hasClass("ajax-loading")){m=h.filter("#"+(c(n)));s=i.filter(".active");o=h.filter(".active");r=function(){i.removeClass("active");j.removeClass("active");h.removeClass("active").addClass("hidden");q.addClass("active");n.addClass("active");m.removeClass("hidden").addClass("active");o.trigger("bettertabs-after-deactivate");m.trigger("bettertabs-after-activate");return d.Bettertabs.change_browser_url(n.attr("href"))};o.trigger("bettertabs-before-deactivate");m.trigger("bettertabs-before-activate");if(e(n)==="ajax"&&!(n.data("content-loaded-already")!=null)){n.addClass("ajax-loading");m.trigger("bettertabs-before-ajax-loading");return m.load(n.attr(f),function(u,v,t){if(v==="error"){return window.location=n.attr("href")}else{n.removeClass("ajax-loading");n.data("content-loaded-already",true);m.trigger("bettertabs-after-ajax-loading");return r()}})}else{return r()}}}})});return this}}).call(this);

data/doc/CHANGELOG.md

@@ -3,9 +3,11 @@ Bettertabs Changelog
 
 2011-09-13  Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
 
-  * Tag v1.3.4
+  * Tag v1.3.5
   * Add 'active' class to the link element inside the active tag as well as the li element (so it is now more easy to style)
   * When tab-type is ajax, mark the first active link as content-loaded-already to not be loaded again when click later
+  * Ajax error handling: when .load() callback returns a textStatus 'error', the browser is reloaded to better show the error
+  * Bugfix: include other params if present in the default tab link url
 
 2011-09-12  Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
 

data/lib/bettertabs/bettertabs_builder.rb

@@ -40,7 +40,7 @@ class BettertabsBuilder
     tab_text = get_tab_text(tab_id, args)
     raise "Bettertabs: #{tab_html_id_for(tab_id)} error. Used :partial option and a block of content at the same time." if block_given? and options[:partial]
     partial = options.delete(:partial) || tab_id.to_s unless block_given?
-    url = options.delete(:url) || { :"#{@bettertabs_id}_selected_tab" => tab_id }
+    url = options.delete(:url) || @template.params.merge(:"#{@bettertabs_id}_selected_tab" => tab_id)
     tab_type = (options.delete(:tab_type) || :static).to_sym
     raise "Bettertabs: #{tab_type.inspect} tab type not supported. Use one of #{TAB_TYPES.inspect} instead." unless TAB_TYPES.include?(tab_type)
     ajax_url = options.delete(:ajax_url) || url_for_ajax(url) if tab_type == :ajax

data/lib/bettertabs/version.rb

@@ -1,3 +1,3 @@
 module Bettertabs
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

data/spec/dummy/app/views/bettertabs/_ajax.html.haml

@@ -3,4 +3,6 @@
     Content for the ajax_tab_1
   = tab.ajax :ajax_tab_2 do
     Content for the ajax_tab_2
-  = tab.ajax :ajax_tab_3, partial: 'tab_content'
+  = tab.ajax :ajax_tab_3, partial: 'tab_content'
+  = tab.ajax :ajax_tab_with_error, 'raise a 500 error' do
+    = raise 'This tab should raise an error, how well was it handled?'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bettertabs
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156049080 !ruby/object:Gem::Requirement
+  requirement: &2156435120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156049080
+  version_requirements: *2156435120
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2156048500 !ruby/object:Gem::Requirement
+  requirement: &2156434520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156048500
+  version_requirements: *2156434520
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2156047820 !ruby/object:Gem::Requirement
+  requirement: &2156433360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156047820
+  version_requirements: *2156433360
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &2156047300 !ruby/object:Gem::Requirement
+  requirement: &2156432760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156047300
+  version_requirements: *2156432760
 description: ! 'Bettertabs is a Rails 3.1 engine that adds a helper and jQuery plugin
   to define the markup and behavior for a tabbed area in a easy and declarative way,
   using the appropiate JavaScript but ensuring accessibility and usability, no matter
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -751903292244497162
+      hash: -1078283048097430699
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -751903292244497162
+      hash: -1078283048097430699
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.6.2