| Index: trunk/extensions/Vector/modules/vector.simpleSearch.js |
| — | — | @@ -8,7 +8,7 @@ |
| 9 | 9 | |
| 10 | 10 | $( document ).ready( function() { |
| 11 | 11 | |
| 12 | | - var mod = { |
| | 12 | + var map = { |
| 13 | 13 | 'browsers': { |
| 14 | 14 | // Left-to-right languages |
| 15 | 15 | 'ltr': { |
| — | — | @@ -29,7 +29,7 @@ |
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | }; |
| 33 | | - if ( !$.wikiEditor.isSupported( mod ) ) { |
| | 33 | + if ( !$.client.test( map ) ) { |
| 34 | 34 | return true; |
| 35 | 35 | } |
| 36 | 36 | |
| — | — | @@ -37,7 +37,7 @@ |
| 38 | 38 | // if the placeholder attribute is supported, use it |
| 39 | 39 | if ( 'placeholder' in document.createElement( 'input' ) ) { |
| 40 | 40 | $( 'div#simpleSearch > input#searchInput' ) |
| 41 | | - .attr( 'placeholder', mw.usability.getMsg( 'vector-simplesearch-search' ) ); |
| | 41 | + .attr( 'placeholder', mediaWiki.msg.get( 'vector-simplesearch-search' ) ); |
| 42 | 42 | } else { |
| 43 | 43 | $( 'div#simpleSearch > input#searchInput' ) |
| 44 | 44 | .each( function() { |
| — | — | @@ -46,7 +46,7 @@ |
| 47 | 47 | .bind( 'blur', function() { |
| 48 | 48 | if ( $input.val().length == 0 ) { |
| 49 | 49 | $input |
| 50 | | - .val( mw.usability.getMsg( 'vector-simplesearch-search' ) ) |
| | 50 | + .val( mediaWiki.msg.get( 'vector-simplesearch-search' ) ) |
| 51 | 51 | .addClass( 'placeholder' ); |
| 52 | 52 | } |
| 53 | 53 | } ) |
| — | — | @@ -116,7 +116,7 @@ |
| 117 | 117 | $(this).show() |
| 118 | 118 | $label = $( '<div />' ) |
| 119 | 119 | .addClass( 'special-label' ) |
| 120 | | - .text( mw.usability.getMsg( 'vector-simplesearch-containing' ) ) |
| | 120 | + .text( mediaWiki.msg.get( 'vector-simplesearch-containing' ) ) |
| 121 | 121 | .appendTo( $(this) ); |
| 122 | 122 | $query = $( '<div />' ) |
| 123 | 123 | .addClass( 'special-query' ) |
| Index: trunk/extensions/Vector/Vector.hooks.php |
| — | — | @@ -23,8 +23,6 @@ |
| 24 | 24 | 'jquery.client', |
| 25 | 25 | 'jquery.cookie', |
| 26 | 26 | 'jquery.tabIndex', |
| 27 | | - 'jquery.collapsibleTabs', |
| 28 | | - 'jquery.delayedBind', |
| 29 | 27 | ), |
| 30 | 28 | ), |
| 31 | 29 | 'preferences' => array( |
| — | — | @@ -44,6 +42,10 @@ |
| 45 | 43 | 'name' => 'vector.collapsibleTabs', |
| 46 | 44 | 'resources' => array( |
| 47 | 45 | 'scripts' => 'extensions/Vector/modules/vector.collapsibleTabs.js', |
| | 46 | + 'dependencies' => array( |
| | 47 | + 'jquery.collapsibleTabs', |
| | 48 | + 'jquery.delayedBind', |
| | 49 | + ), |
| 48 | 50 | ), |
| 49 | 51 | ), |
| 50 | 52 | 'editwarning' => array( |
| — | — | @@ -69,7 +71,11 @@ |
| 70 | 72 | 'resources' => array( |
| 71 | 73 | 'scripts' => 'extensions/Vector/modules/vector.expandableSearch.js', |
| 72 | 74 | 'styles' => 'extensions/Vector/modules/vector.expandableSearch.css', |
| 73 | | - 'dependencies' => array( 'jquery.client' ), |
| | 75 | + 'dependencies' => array( |
| | 76 | + 'jquery.client', |
| | 77 | + 'jquery.expandableField', |
| | 78 | + 'jquery.delayedBind', |
| | 79 | + ), |
| 74 | 80 | ), |
| 75 | 81 | 'preferences' => array( |
| 76 | 82 | 'requirements' => array( 'vector-simplesearch' => true ), |
| — | — | @@ -90,6 +96,11 @@ |
| 91 | 97 | 'vector-simplesearch-search', |
| 92 | 98 | 'vector-simplesearch-containing', |
| 93 | 99 | ), |
| | 100 | + 'dependencies' => array( |
| | 101 | + 'jquery.client', |
| | 102 | + 'jquery.suggestions', |
| | 103 | + 'jquery.autoEllipsis', |
| | 104 | + ), |
| 94 | 105 | ), |
| 95 | 106 | 'preferences' => array( |
| 96 | 107 | 'requirements' => array( 'vector-simplesearch' => true, 'disablesuggest' => false ), |