diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2012-04-26 18:23:31 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2012-04-26 18:23:31 +0200 |
| commit | c4372dd38a4d109b4f3881ea63b667e33adbe503 (patch) | |
| tree | e8e6dae1229a68c26b7a348c73dc0c8c77da97e5 /extensions/Vector/modules | |
| parent | cf566324cfb218f0c7323d97d2a103bbb8d60ba4 (diff) | |
Update to MediaWiki 1.18.3
Diffstat (limited to 'extensions/Vector/modules')
5 files changed, 13 insertions, 7 deletions
diff --git a/extensions/Vector/modules/ext.vector.collapsibleNav.js b/extensions/Vector/modules/ext.vector.collapsibleNav.js index 9a9b77f7..6e72ef84 100644 --- a/extensions/Vector/modules/ext.vector.collapsibleNav.js +++ b/extensions/Vector/modules/ext.vector.collapsibleNav.js @@ -1,7 +1,7 @@ /* * Collapisble navigation for Vector */ -( function( $ ) { +jQuery( function( $ ) { /* Browser Support */ @@ -9,7 +9,6 @@ // Left-to-right languages 'ltr': { // Collapsible Nav is broken in Opera < 9.6 and Konqueror < 4 - 'msie': [['>=', 7]], 'opera': [['>=', 9.6]], 'konqueror': [['>=', 4.0]], 'blackberry': false, @@ -19,7 +18,6 @@ }, // Right-to-left languages 'rtl': { - 'msie': [['>=', 7]], 'opera': [['>=', 9.6]], 'konqueror': [['>=', 4.0]], 'blackberry': false, @@ -225,4 +223,4 @@ } return false; } ); -} )( jQuery ); +} ); diff --git a/extensions/Vector/modules/ext.vector.editWarning.js b/extensions/Vector/modules/ext.vector.editWarning.js index d7494c70..5b97670d 100644 --- a/extensions/Vector/modules/ext.vector.editWarning.js +++ b/extensions/Vector/modules/ext.vector.editWarning.js @@ -30,7 +30,7 @@ // Check if the current values of some form elements are the same as // the original values if ( - wgAction == 'submit' || + mw.config.get( 'wgAction' ) == 'submit' || $( '#wpTextbox1' ).data( 'origtext' ) != $( '#wpTextbox1' ).val() || $( '#wpSummary' ).data( 'origtext' ) != $( '#wpSummary' ).val() ) { diff --git a/extensions/Vector/modules/ext.vector.expandableSearch.js b/extensions/Vector/modules/ext.vector.expandableSearch.js index 850ff74f..619ea9c2 100644 --- a/extensions/Vector/modules/ext.vector.expandableSearch.js +++ b/extensions/Vector/modules/ext.vector.expandableSearch.js @@ -1,7 +1,7 @@ /* * Expandable search for Vector */ -$( document ).ready( function() { +jQuery( document ).ready( function( $ ) { /* Browser Support */ diff --git a/extensions/Vector/modules/ext.vector.footerCleanup.js b/extensions/Vector/modules/ext.vector.footerCleanup.js index eb9b3dd2..2df26540 100644 --- a/extensions/Vector/modules/ext.vector.footerCleanup.js +++ b/extensions/Vector/modules/ext.vector.footerCleanup.js @@ -1,7 +1,7 @@ /* * Footer cleanup for Vector */ -$( document ).ready( function() { +jQuery( document ).ready( function( $ ) { $( '#editpage-copywarn' ) .add( '.editOptions' ) .wrapAll( '<div id="editpage-bottom"></div>' ); diff --git a/extensions/Vector/modules/ext.vector.simpleSearch.js b/extensions/Vector/modules/ext.vector.simpleSearch.js index 01ef14ea..8af1f9a1 100644 --- a/extensions/Vector/modules/ext.vector.simpleSearch.js +++ b/extensions/Vector/modules/ext.vector.simpleSearch.js @@ -2,6 +2,14 @@ jQuery( document ).ready( function( $ ) { + // Ensure that the thing is actually present! + if ($('#simpleSearch').length == 0) { + // Don't try to set anything up if simpleSearch is disabled sitewide. + // The loader code loads us if the option is present, even if we're + // not actually enabled (anymore). + return; + } + // Compatibility map var map = { 'browsers': { |