bettertabs 1.3.3 → 1.3.4

data/Gemfile.lock

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

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

@@ -1,7 +1,7 @@
 (function() {
   /*!
    jQuery Bettertabs Plugin
-   version: 1.3.3 (Sep-13-2011)
+   version: 1.3.4 (Sep-13-2011)
    @requires jQuery v1.3 or later
    
    Examples and documentation at: https://github.com/agoragames/bettertabs
@@ -34,12 +34,16 @@
   };
   $.fn.bettertabs = function() {
     this.each(function() {
-      var mytabs, tabs, tabs_and_contents, tabs_contents, tabs_links;
-      mytabs = $(this);
-      tabs = mytabs.find('ul.tabs > li');
-      tabs_links = mytabs.find('ul.tabs > li > a');
-      tabs_contents = mytabs.children('.content');
+      var active_tab_link, tabs, tabs_and_contents, tabs_contents, tabs_links, wrapper;
+      wrapper = $(this);
+      tabs = wrapper.find('ul.tabs > li');
+      tabs_links = wrapper.find('ul.tabs > li > a');
+      tabs_contents = wrapper.children('.content');
       tabs_and_contents = tabs.add(tabs_contents);
+      active_tab_link = tabs_links.filter('.active');
+      if (tab_type_of(active_tab_link) === 'ajax') {
+        active_tab_link.data('content-loaded-already', true);
+      }
       return tabs_links.click(function(event) {
         var activate_tab_and_content, previous_active_tab, previous_active_tab_content, this_link, this_tab, this_tab_content;
         this_link = $(this);

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

@@ -1,6 +1,6 @@
 ###!
  jQuery Bettertabs Plugin
- version: 1.3.3 (Sep-13-2011)
+ version: 1.3.4 (Sep-13-2011)
  @requires jQuery v1.3 or later
  
  Examples and documentation at: https://github.com/agoragames/bettertabs
@@ -35,11 +35,15 @@ $.Bettertabs =
 
 $.fn.bettertabs = ->
   @each ->
-    mytabs = $(this)
-    tabs = mytabs.find 'ul.tabs > li'
-    tabs_links = mytabs.find 'ul.tabs > li > a'
-    tabs_contents = mytabs.children '.content'
+    wrapper = $(this)
+    tabs = wrapper.find 'ul.tabs > li'
+    tabs_links = wrapper.find 'ul.tabs > li > a'
+    tabs_contents = wrapper.children '.content'
     tabs_and_contents = tabs.add tabs_contents
+    active_tab_link = tabs_links.filter '.active'
+    
+    # When tab-type is ajax, mark the first active link as content-loaded-already to not be loaded again when click later
+    active_tab_link.data('content-loaded-already', yes) if tab_type_of(active_tab_link) is 'ajax'
     
     tabs_links.click (event) ->
       this_link = $(this)

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

@@ -1,7 +1,7 @@
 (function(){
 /*!
    jQuery Bettertabs Plugin
-   version: 1.3.3 (Sep-13-2011)
+   version: 1.3.4 (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 k,h,j,g,i;k=d(this);h=k.find("ul.tabs > li");i=k.find("ul.tabs > li > a");g=k.children(".content");j=h.add(g);return i.click(function(o){var q,r,n,m,p,l;m=d(this);if(e(m)!=="link"){o.preventDefault();p=m.parent();if(!p.hasClass("active")&&!m.hasClass("ajax-loading")){l=g.filter("#"+(c(m)));r=h.filter(".active");n=g.filter(".active");q=function(){h.removeClass("active");i.removeClass("active");g.removeClass("active").addClass("hidden");p.addClass("active");m.addClass("active");l.removeClass("hidden").addClass("active");n.trigger("bettertabs-after-deactivate");l.trigger("bettertabs-after-activate");return d.Bettertabs.change_browser_url(m.attr("href"))};n.trigger("bettertabs-before-deactivate");l.trigger("bettertabs-before-activate");if(e(m)==="ajax"&&!(m.data("content-loaded-already")!=null)){m.addClass("ajax-loading");l.trigger("bettertabs-before-ajax-loading");return l.load(m.attr(f),function(){m.removeClass("ajax-loading");m.data("content-loaded-already",true);l.trigger("bettertabs-after-ajax-loading");return q()})}else{return q()}}}})});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(){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,13 +3,9 @@ Bettertabs Changelog
 
 2011-09-13  Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
 
-  * Tag v1.3.3
-  * Bugfix and update the jquery.bettertabs plugin to update the link .active class a well as li element
-
-2011-09-13  Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
-
-  * Tag v1.3.1
-  * Add 'active' class to the link element inside the active tag as well as the li element (more easy to style)
+  * Tag v1.3.4
+  * 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
 
 2011-09-12  Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
 

data/lib/bettertabs/version.rb

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

data/spec/dummy/app/controllers/bettertabs_controller.rb

@@ -10,6 +10,7 @@ class BettertabsController < ApplicationController
   end
   
   def ajax
+    sleep 1 # to better feel the loading time
     render partial: 'ajax' and return if request.xhr?
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bettertabs
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152821860 !ruby/object:Gem::Requirement
+  requirement: &2156049080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152821860
+  version_requirements: *2156049080
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2152807840 !ruby/object:Gem::Requirement
+  requirement: &2156048500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152807840
+  version_requirements: *2156048500
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152807060 !ruby/object:Gem::Requirement
+  requirement: &2156047820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152807060
+  version_requirements: *2156047820
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &2152805520 !ruby/object:Gem::Requirement
+  requirement: &2156047300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152805520
+  version_requirements: *2156047300
 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: 2066853603321649499
+      hash: -751903292244497162
 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: 2066853603321649499
+      hash: -751903292244497162
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.6.2