Index: trunk/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.php |
— | — | @@ -18,7 +18,7 @@ |
19 | 19 | |
20 | 20 | /* Configuration */ |
21 | 21 | // Bump the version number every time you change any of the .css/.js files |
22 | | -$wgCollapsibleTabsStyleVersion = 4; |
| 22 | +$wgCollapsibleTabsStyleVersion = 5; |
23 | 23 | |
24 | 24 | /* Setup */ |
25 | 25 | |
— | — | @@ -27,7 +27,7 @@ |
28 | 28 | 'path' => __FILE__, |
29 | 29 | 'name' => 'CollapsibleTabs', |
30 | 30 | 'author' => 'Adam Miller', |
31 | | - 'version' => '0.0.4', |
| 31 | + 'version' => '0.0.5', |
32 | 32 | 'url' => 'http://www.mediawiki.org/wiki/Extension:CollapsibleTabs', |
33 | 33 | 'descriptionmsg' => 'collapsibletabs-desc', |
34 | 34 | ); |
Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
— | — | @@ -60,7 +60,7 @@ |
61 | 61 | array( 'src' => 'js/plugins/jquery.async.js', 'version' => 3 ), |
62 | 62 | array( 'src' => 'js/plugins/jquery.autoEllipse.js', 'version' => 3 ), |
63 | 63 | array( 'src' => 'js/plugins/jquery.browser.js', 'version' => 3 ), |
64 | | - array( 'src' => 'js/plugins/jquery.collapsibleTabs.js', 'version' => 4 ), |
| 64 | + array( 'src' => 'js/plugins/jquery.collapsibleTabs.js', 'version' => 5 ), |
65 | 65 | array( 'src' => 'js/plugins/jquery.cookie.js', 'version' => 3 ), |
66 | 66 | array( 'src' => 'js/plugins/jquery.delayedBind.js', 'version' => 1 ), |
67 | 67 | array( 'src' => 'js/plugins/jquery.namespaceSelect.js', 'version' => 1 ), |
— | — | @@ -72,10 +72,10 @@ |
73 | 73 | array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 21 ), |
74 | 74 | ), |
75 | 75 | 'combined' => array( |
76 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 46 ), |
| 76 | + array( 'src' => 'js/plugins.combined.js', 'version' => 47 ), |
77 | 77 | ), |
78 | 78 | 'minified' => array( |
79 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 46 ), |
| 79 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 47 ), |
80 | 80 | ), |
81 | 81 | ), |
82 | 82 | ); |
Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.collapsibleTabs.js |
— | — | @@ -40,11 +40,11 @@ |
41 | 41 | collapsible: 'li.collapsible', |
42 | 42 | shifting: false, |
43 | 43 | expandCondition: function(eleWidth) { |
44 | | - return ( $('#left-navigation').position().left + $('#left-navigation').width() - 4) |
| 44 | + return ( $('#left-navigation').position().left + $('#left-navigation').width()) |
45 | 45 | < ($('#right-navigation').position().left - eleWidth); |
46 | 46 | }, |
47 | 47 | collapseCondition: function() { |
48 | | - return ( $('#left-navigation').position().left + $('#left-navigation').width() + 4) |
| 48 | + return ( $('#left-navigation').position().left + $('#left-navigation').width()) |
49 | 49 | > $('#right-navigation').position().left; |
50 | 50 | } |
51 | 51 | }, |