| Index: branches/wmf/1.18wmf1/extensions/Vector/modules/ext.vector.collapsibleTabs.js |
| — | — | @@ -1,7 +1,7 @@ |
| 2 | 2 | /* |
| 3 | 3 | * Collapsible tabs for Vector |
| 4 | 4 | */ |
| 5 | | -$(document).ready( function() { |
| | 5 | +jQuery(function( $ ) { |
| 6 | 6 | var rtl = $( 'body' ).is( '.rtl' ); |
| 7 | 7 | |
| 8 | 8 | // Overloading the moveToCollapsed function to animate the transition |
| Property changes on: branches/wmf/1.18wmf1/extensions/Vector/modules/ext.vector.collapsibleTabs.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 9 | 9 | Merged /trunk/extensions/Vector/modules/ext.vector.collapsibleTabs.js:r102962,102964 |
| Index: branches/wmf/1.18wmf1/extensions/CentralNotice/special/SpecialBannerController.php |
| — | — | @@ -70,7 +70,7 @@ |
| 71 | 71 | "' + bannerPage + '\"></script>';\n"; |
| 72 | 72 | $js .= <<<JAVASCRIPT |
| 73 | 73 | if ( document.cookie.indexOf( 'centralnotice_'+bannerType+'=hide' ) == -1 ) { |
| 74 | | - $( '#siteNotice' ).prepend( '<div id="centralNotice" class="' + |
| | 74 | + jQuery( '#siteNotice' ).prepend( '<div id="centralNotice" class="' + |
| 75 | 75 | ( wgNoticeToggleState ? 'expanded' : 'collapsed' ) + |
| 76 | 76 | ' cn-' + bannerType + '">'+bannerScript+'</div>' ); |
| 77 | 77 | } |
| — | — | @@ -137,7 +137,7 @@ |
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | | - $( document ).ready( function () { |
| | 141 | + jQuery( document ).ready( function ( $ ) { |
| 142 | 142 | // Initialize the query string vars |
| 143 | 143 | $.centralNotice.fn.getQueryStringVariables(); |
| 144 | 144 | if( $.centralNotice.data.getVars['banner'] ) { |
| — | — | @@ -184,7 +184,7 @@ |
| 185 | 185 | } |
| 186 | 186 | } |
| 187 | 187 | function hideBanner() { |
| 188 | | - $( '#centralNotice' ).hide(); // Hide current banner |
| | 188 | + jQuery( '#centralNotice' ).hide(); // Hide current banner |
| 189 | 189 | var bannerType = $.centralNotice.data.bannerType; |
| 190 | 190 | if ( bannerType === undefined ) bannerType = 'default'; |
| 191 | 191 | setBannerHidingCookie( bannerType ); // Hide future banners of the same type |
| Property changes on: branches/wmf/1.18wmf1/extensions/CentralNotice/special/SpecialBannerController.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 192 | 192 | Merged /trunk/extensions/CentralNotice/special/SpecialBannerController.php:r102962,102964 |