http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73051
Revision: 73051
Author: tparscal
Date: 2010-09-15 02:36:52 +0000 (Wed, 15 Sep 2010)
Log Message:
-----------
Resolved all dependencies - now any one module can be enabled. Replaced last
remaining references to mw.usability.*
Modified Paths:
--------------
trunk/extensions/Vector/Vector.hooks.php
trunk/extensions/Vector/modules/vector.simpleSearch.js
Modified: trunk/extensions/Vector/Vector.hooks.php
===================================================================
--- trunk/extensions/Vector/Vector.hooks.php 2010-09-15 02:34:31 UTC (rev
73050)
+++ trunk/extensions/Vector/Vector.hooks.php 2010-09-15 02:36:52 UTC (rev
73051)
@@ -23,8 +23,6 @@
'jquery.client',
'jquery.cookie',
'jquery.tabIndex',
- 'jquery.collapsibleTabs',
- 'jquery.delayedBind',
),
),
'preferences' => array(
@@ -44,6 +42,10 @@
'name' => 'vector.collapsibleTabs',
'resources' => array(
'scripts' =>
'extensions/Vector/modules/vector.collapsibleTabs.js',
+ 'dependencies' => array(
+ 'jquery.collapsibleTabs',
+ 'jquery.delayedBind',
+ ),
),
),
'editwarning' => array(
@@ -69,7 +71,11 @@
'resources' => array(
'scripts' =>
'extensions/Vector/modules/vector.expandableSearch.js',
'styles' =>
'extensions/Vector/modules/vector.expandableSearch.css',
- 'dependencies' => array( 'jquery.client' ),
+ 'dependencies' => array(
+ 'jquery.client',
+ 'jquery.expandableField',
+ 'jquery.delayedBind',
+ ),
),
'preferences' => array(
'requirements' => array( 'vector-simplesearch'
=> true ),
@@ -90,6 +96,11 @@
'vector-simplesearch-search',
'vector-simplesearch-containing',
),
+ 'dependencies' => array(
+ 'jquery.client',
+ 'jquery.suggestions',
+ 'jquery.autoEllipsis',
+ ),
),
'preferences' => array(
'requirements' => array( 'vector-simplesearch'
=> true, 'disablesuggest' => false ),
Modified: trunk/extensions/Vector/modules/vector.simpleSearch.js
===================================================================
--- trunk/extensions/Vector/modules/vector.simpleSearch.js 2010-09-15
02:34:31 UTC (rev 73050)
+++ trunk/extensions/Vector/modules/vector.simpleSearch.js 2010-09-15
02:36:52 UTC (rev 73051)
@@ -8,7 +8,7 @@
$( document ).ready( function() {
- var mod = {
+ var map = {
'browsers': {
// Left-to-right languages
'ltr': {
@@ -29,7 +29,7 @@
}
}
};
- if ( !$.wikiEditor.isSupported( mod ) ) {
+ if ( !$.client.test( map ) ) {
return true;
}
@@ -37,7 +37,7 @@
// if the placeholder attribute is supported, use it
if ( 'placeholder' in document.createElement( 'input' ) ) {
$( 'div#simpleSearch > input#searchInput' )
- .attr( 'placeholder', mw.usability.getMsg(
'vector-simplesearch-search' ) );
+ .attr( 'placeholder', mediaWiki.msg.get(
'vector-simplesearch-search' ) );
} else {
$( 'div#simpleSearch > input#searchInput' )
.each( function() {
@@ -46,7 +46,7 @@
.bind( 'blur', function() {
if ( $input.val().length == 0 )
{
$input
- .val(
mw.usability.getMsg( 'vector-simplesearch-search' ) )
+ .val(
mediaWiki.msg.get( 'vector-simplesearch-search' ) )
.addClass(
'placeholder' );
}
} )
@@ -116,7 +116,7 @@
$(this).show()
$label = $( '<div />' )
.addClass( 'special-label' )
- .text( mw.usability.getMsg(
'vector-simplesearch-containing' ) )
+ .text( mediaWiki.msg.get(
'vector-simplesearch-containing' ) )
.appendTo( $(this) );
$query = $( '<div />' )
.addClass( 'special-query' )
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
