bettertabs 1.3.1 → 1.3.2

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- bettertabs (1.3.1)
4
+ bettertabs (1.3.2)
5
5
  jquery-rails
6
6
  rails (~> 3.1.0)
7
7
 
@@ -3,14 +3,15 @@
3
3
  jQuery Bettertabs Plugin
4
4
  version: 1.3.1 (Sep-13-2011)
5
5
  @requires jQuery v1.3 or later
6
-
6
+
7
7
  Examples and documentation at: https://github.com/agoragames/bettertabs
8
-
8
+
9
9
  Copyright (c) 2011 Mario Izquierdo (tothemario@gmail.com)
10
10
  Dual licensed under the MIT and GPL licenses:
11
11
  http://www.opensource.org/licenses/mit-license.php
12
12
  http://www.gnu.org/licenses/gpl.html
13
- */ var $, ajax_url_attr, content_id_from, show_content_id_attr, tab_type_attr, tab_type_of;
13
+ */
14
+ var $, ajax_url_attr, content_id_from, show_content_id_attr, tab_type_attr, tab_type_of;
14
15
  $ = jQuery;
15
16
  tab_type_attr = 'data-tab-type';
16
17
  show_content_id_attr = 'data-show-content-id';
@@ -23,7 +24,7 @@
23
24
  };
24
25
  $.Bettertabs = {
25
26
  change_browser_url: function(url) {
26
- if ((typeof history != "undefined" && history !== null) && (history.replaceState != null)) {
27
+ if ((typeof history !== "undefined" && history !== null) && (history.replaceState != null)) {
27
28
  return history.replaceState(null, document.title, url);
28
29
  }
29
30
  },
@@ -45,14 +46,16 @@
45
46
  if (tab_type_of(this_link) !== 'link') {
46
47
  event.preventDefault();
47
48
  this_tab = this_link.parent();
48
- if (!this_tab.is('.active') && !this_link.is('.ajax-loading')) {
49
+ if (!this_tab.hasClass('active') && !this_link.hasClass('ajax-loading')) {
49
50
  this_tab_content = tabs_contents.filter("#" + (content_id_from(this_link)));
50
51
  previous_active_tab = tabs.filter('.active');
51
52
  previous_active_tab_content = tabs_contents.filter('.active');
52
53
  activate_tab_and_content = function() {
53
54
  tabs.removeClass('active');
55
+ tabs_links.removeClass('active');
54
56
  tabs_contents.removeClass('active').addClass('hidden');
55
57
  this_tab.addClass('active');
58
+ this_link.addClass('active');
56
59
  this_tab_content.removeClass('hidden').addClass('active');
57
60
  previous_active_tab_content.trigger('bettertabs-after-deactivate');
58
61
  this_tab_content.trigger('bettertabs-after-activate');
@@ -43,17 +43,19 @@ $.fn.bettertabs = ->
43
43
 
44
44
  tabs_links.click (event) ->
45
45
  this_link = $(this)
46
- if tab_type_of(this_link) isnt 'link'
46
+ unless tab_type_of(this_link) is 'link'
47
47
  event.preventDefault()
48
48
  this_tab = this_link.parent()
49
- if not this_tab.is('.active') and not this_link.is('.ajax-loading')
49
+ if not this_tab.hasClass('active') and not this_link.hasClass('ajax-loading')
50
50
  this_tab_content = tabs_contents.filter "##{content_id_from this_link}"
51
51
  previous_active_tab = tabs.filter '.active'
52
52
  previous_active_tab_content = tabs_contents.filter '.active'
53
53
  activate_tab_and_content = ->
54
54
  tabs.removeClass('active')
55
+ tabs_links.removeClass('active')
55
56
  tabs_contents.removeClass('active').addClass('hidden')
56
57
  this_tab.addClass('active')
58
+ this_link.addClass('active')
57
59
  this_tab_content.removeClass('hidden').addClass('active')
58
60
  previous_active_tab_content.trigger 'bettertabs-after-deactivate'
59
61
  this_tab_content.trigger 'bettertabs-after-activate'
data/doc/CHANGELOG.md CHANGED
@@ -1,6 +1,11 @@
1
1
  Bettertabs Changelog
2
2
  ====================
3
3
 
4
+ 2011-09-13 Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
5
+
6
+ * Tag v1.3.2
7
+ * Update the jquery.bettertabs plugin to update the link .active class a well as li element
8
+
4
9
  2011-09-13 Mario Izquierdo Martinez <mizquierdo@majorleaguegaming.com>
5
10
 
6
11
  * Tag v1.3.1
@@ -15,11 +15,10 @@ You can then install CoffeeScript with npm:
15
15
  npm install coffee-script
16
16
 
17
17
 
18
- Then you will be able to compile `jquery.bettertabs.coffee` into `jquery.bettertabs.js` using the coffee command:
18
+ Then you will be able to compile `jquery.bettertabs.js.coffee` into `jquery.bettertabs.js` using the coffee command:
19
19
 
20
- coffee --watch --compile jquery.bettertabs.coffee
21
-
22
- With this, each time you save the `jquery.bettertabs.coffee` file, `jquery.bettertabs.js` will be automatically updated.
20
+ cd app/assets/javascripts
21
+ coffee --print jquery.bettertabs.js.coffee > jquery.bettertabs.js
23
22
 
24
23
 
25
24
  ## JavaScript Compressor ##
@@ -1,3 +1,3 @@
1
1
  module Bettertabs
2
- VERSION = "1.3.1"
2
+ VERSION = "1.3.2"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bettertabs
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.1
4
+ version: 1.3.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -14,7 +14,7 @@ default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
- requirement: &2156493880 !ruby/object:Gem::Requirement
17
+ requirement: &2152611360 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: 3.1.0
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *2156493880
25
+ version_requirements: *2152611360
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: jquery-rails
28
- requirement: &2156493160 !ruby/object:Gem::Requirement
28
+ requirement: &2152610340 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *2156493160
36
+ version_requirements: *2152610340
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: rspec-rails
39
- requirement: &2156492340 !ruby/object:Gem::Requirement
39
+ requirement: &2152609660 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: '0'
45
45
  type: :development
46
46
  prerelease: false
47
- version_requirements: *2156492340
47
+ version_requirements: *2152609660
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: haml-rails
50
- requirement: &2156491380 !ruby/object:Gem::Requirement
50
+ requirement: &2152608920 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
55
55
  version: '0'
56
56
  type: :development
57
57
  prerelease: false
58
- version_requirements: *2156491380
58
+ version_requirements: *2152608920
59
59
  description: ! 'Bettertabs is a Rails 3.1 engine that adds a helper and jQuery plugin
60
60
  to define the markup and behavior for a tabbed area in a easy and declarative way,
61
61
  using the appropiate JavaScript but ensuring accessibility and usability, no matter
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
145
145
  version: '0'
146
146
  segments:
147
147
  - 0
148
- hash: -3213150091351247240
148
+ hash: 4239099548208733678
149
149
  required_rubygems_version: !ruby/object:Gem::Requirement
150
150
  none: false
151
151
  requirements:
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
154
154
  version: '0'
155
155
  segments:
156
156
  - 0
157
- hash: -3213150091351247240
157
+ hash: 4239099548208733678
158
158
  requirements: []
159
159
  rubyforge_project:
160
160
  rubygems_version: 1.6.2