http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90063
Revision: 90063
Author: krinkle
Date: 2011-06-14 17:44:02 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
Remove redundant mediawiki.util directory
Modified Paths:
--------------
trunk/phase3/resources/Resources.php
trunk/phase3/tests/qunit/index.html
Added Paths:
-----------
trunk/phase3/resources/mediawiki/mediawiki.util.js
trunk/phase3/tests/qunit/suites/resources/mediawiki/mediawiki.util.js
Removed Paths:
-------------
trunk/phase3/resources/mediawiki.util/
trunk/phase3/tests/qunit/suites/resources/mediawiki.util/
Modified: trunk/phase3/resources/Resources.php
===================================================================
--- trunk/phase3/resources/Resources.php 2011-06-14 17:38:16 UTC (rev
90062)
+++ trunk/phase3/resources/Resources.php 2011-06-14 17:44:02 UTC (rev
90063)
@@ -446,7 +446,7 @@
),
),
'mediawiki.util' => array(
- 'scripts' => 'resources/mediawiki.util/mediawiki.util.js',
+ 'scripts' => 'resources/mediawiki/mediawiki.util.js',
'dependencies' => array(
'jquery.checkboxShiftClick',
'jquery.client',
Copied: trunk/phase3/resources/mediawiki/mediawiki.util.js (from rev 90054,
trunk/phase3/resources/mediawiki.util/mediawiki.util.js)
===================================================================
--- trunk/phase3/resources/mediawiki/mediawiki.util.js
(rev 0)
+++ trunk/phase3/resources/mediawiki/mediawiki.util.js 2011-06-14 17:44:02 UTC
(rev 90063)
@@ -0,0 +1,598 @@
+/**
+ * Utilities
+ */
+( function( $, mw ) {
+
+ mw.util = {
+
+ /* Initialisation */
+ /**
+ * @var boolean Wether or not already initialised
+ */
+ 'initialised' : false,
+ 'init' : function() {
+ if ( this.initialised === false ) {
+ this.initialised = true;
+
+ // Any initialisation after the DOM is ready
+ $( function() {
+
+ /* Set up $.messageBox */
+ $.messageBoxNew( {
+ 'id': 'mw-js-message',
+ 'parent': '#content'
+ } );
+
+ // Shortcut to client profile return
+ var profile = $.client.profile();
+
+ /* Set tooltipAccessKeyPrefix */
+
+ // Opera on any platform
+ if ( profile.name == 'opera' ) {
+ mw.util.tooltipAccessKeyPrefix
= 'shift-esc-';
+
+ // Chrome on any platform
+ } else if ( profile.name == 'chrome' ) {
+ // Chrome on Mac or Chrome on
other platform ?
+ mw.util.tooltipAccessKeyPrefix
= ( profile.platform == 'mac'
+ ? 'ctrl-option-' :
'alt-' );
+
+ // Non-Windows Safari with
webkit_version > 526
+ } else if ( profile.platform !== 'win'
+ && profile.name == 'safari'
+ && profile.layoutVersion > 526
) {
+ mw.util.tooltipAccessKeyPrefix
= 'ctrl-alt-';
+
+ // Safari/Konqueror on any platform, or
any browser on Mac
+ // (but not Safari on Windows)
+ } else if ( !( profile.platform ==
'win' && profile.name == 'safari' )
+ && (
profile.name == 'safari'
+ ||
profile.platform == 'mac'
+ ||
profile.name == 'konqueror' ) ) {
+ mw.util.tooltipAccessKeyPrefix
= 'ctrl-';
+
+ // Firefox 2.x
+ } else if ( profile.name == 'firefox'
&& profile.versionBase == '2' ) {
+ mw.util.tooltipAccessKeyPrefix
= 'alt-shift-';
+ }
+
+ /* Enable CheckboxShiftClick */
+ $(
'input[type=checkbox]:not(.noshiftselect)' ).checkboxShiftClick();
+
+ /* Emulate placeholder if not supported
by browser */
+ if ( !( 'placeholder' in
document.createElement( 'input' ) ) ) {
+ $( 'input[placeholder]'
).placeholder();
+ }
+
+ /* Fill $content var */
+ if ( $( '#bodyContent' ).length ) {
+ // Vector, Monobook, Chick etc.
+ mw.util.$content = $(
'#bodyContent' );
+
+ } else if ( $( '#mw_contentholder'
).length ) {
+ // Modern
+ mw.util.$content = $(
'#mw_contentholder' );
+
+ } else if ( $( '#article' ).length ) {
+ // Standard, CologneBlue
+ mw.util.$content = $(
'#article' );
+
+ } else {
+ // #content is present on
almost all if not all skins. Most skins (the above cases)
+ // have #content too, but as an
outer wrapper instead of the article text container.
+ // The skins that don't have an
outer wrapper do have #content for everything
+ // so it's a good fallback
+ mw.util.$content = $(
'#content' );
+ }
+
+ /* Enable makeCollapse */
+ $( '.mw-collapsible'
).makeCollapsible();
+
+ /* Table of Contents toggle */
+ var $tocContainer = $( '#toc' ),
+ $tocTitle = $( '#toctitle' ),
+ $tocToggleLink = $(
'#togglelink' );
+ // Only add it if there is a TOC and
there is no toggle added already
+ if ( $tocContainer.size() &&
$tocTitle.size() && !$tocToggleLink.size() ) {
+ var hideTocCookie =
$.cookie( 'mw_hidetoc' );
+ $tocToggleLink = $( '<a
href="#" class="internal" id="togglelink">' )
+ .text( mw.msg(
'hidetoc' ) )
+ .click(
function(e){
+
e.preventDefault();
+
mw.util.toggleToc( $(this) );
+ } );
+ $tocTitle.append(
$tocToggleLink.wrap( '<span class="toctoggle">' ).parent().prepend( ' ['
).append( '] ' ) );
+
+ if ( hideTocCookie == '1' ) {
+ // Cookie says user
want toc hidden
+ $tocToggleLink.click();
+ }
+ }
+ } );
+
+ return true;
+ }
+ return false;
+ },
+
+ /* Main body */
+
+ /**
+ * Encode the string like PHP's rawurlencode
+ *
+ * @param str string String to be encoded
+ */
+ 'rawurlencode' : function( str ) {
+ str = ( str + '' ).toString();
+ return encodeURIComponent( str )
+ .replace( /!/g, '%21' ).replace( /'/g, '%27'
).replace( /\(/g, '%28' )
+ .replace( /\)/g, '%29' ).replace( /\*/g, '%2A'
).replace( /~/g, '%7E' );
+ },
+
+ /**
+ * Encode page titles for use in a URL
+ * We want / and : to be included as literal characters in our
title URLs
+ * as they otherwise fatally break the title
+ *
+ * @param str string String to be encoded
+ */
+ 'wikiUrlencode' : function( str ) {
+ return this.rawurlencode( str )
+ .replace( /%20/g, '_' ).replace( /%3A/g, ':'
).replace( /%2F/g, '/' );
+ },
+
+ /**
+ * Get the link to a page name (relative to wgServer)
+ *
+ * @param str string Page name to get the link for.
+ * @return string Location for a page with name of 'str' or
boolean false on error.
+ */
+ 'wikiGetlink' : function( str ) {
+
+ return mw.config.get( 'wgArticlePath' ).replace( '$1',
this.wikiUrlencode( str ) );
+ },
+
+ /**
+ * Get address to a script in the wiki root.
+ * For index.php use mw.config.get( 'wgScript' )
+ *
+ * @param str string Name of script (eg. 'api'), defaults to
'index'
+ * @return string Address to script (eg. '/w/api.php' )
+ */
+ 'wikiScript' : function( str ) {
+ return mw.config.get( 'wgScriptPath' ) + '/' + ( str ||
'index' ) + mw.config.get( 'wgScriptExtension' );
+ },
+
+ /**
+ * Append a new style block to the head
+ *
+ * @param text string CSS to be appended
+ * @return CSSStyleSheet
+ */
+ 'addCSS' : function( text ) {
+ var s = document.createElement( 'style' );
+ s.type = 'text/css';
+ s.rel = 'stylesheet';
+ if ( s.styleSheet ) {
+ s.styleSheet.cssText = text; // IE
+ } else {
+ s.appendChild( document.createTextNode( text +
'' ) ); // Safari sometimes borks on null
+ }
+ document.getElementsByTagName('head')[0].appendChild( s
);
+ return s.sheet || s;
+ },
+
+ /**
+ * Hide/show the table of contents element
+ *
+ * @param $toggleLink jQuery A jQuery object of the toggle link.
+ * @param callback function Function to be called after the
toggle is
+ * completed (including the animation) (optional)
+ * @return mixed Boolean visibility of the toc (true if it's
visible)
+ * or Null if there was no table of contents.
+ */
+ 'toggleToc' : function( $toggleLink, callback ) {
+ var $tocList = $( '#toc ul:first' );
+
+ // This function shouldn't be called if there's no TOC,
+ // but just in case...
+ if ( $tocList.size() ) {
+ if ( $tocList.is( ':hidden' ) ) {
+ $tocList.slideDown( 'fast', callback );
+ $toggleLink.text( mw.msg( 'hidetoc' ) );
+ $( '#toc' ).removeClass( 'tochidden' );
+ $.cookie( 'mw_hidetoc', null, {
+ expires: 30,
+ path: '/'
+ } );
+ return true;
+ } else {
+ $tocList.slideUp( 'fast', callback );
+ $toggleLink.text( mw.msg( 'showtoc' ) );
+ $( '#toc' ).addClass( 'tochidden' );
+ $.cookie( 'mw_hidetoc', '1', {
+ expires: 30,
+ path: '/'
+ } );
+ return false;
+ }
+ } else {
+ return null;
+ }
+ },
+
+ /**
+ * Grab the URL parameter value for the given parameter.
+ * Returns null if not found.
+ *
+ * @param param string The parameter name.
+ * @param url string URL to search through (optional)
+ * @return mixed Parameter value or null.
+ */
+ 'getParamValue' : function( param, url ) {
+ url = url ? url : document.location.href;
+ // Get last match, stop at hash
+ var re = new RegExp( '[^#]*[&?]' + $.escapeRE( param )
+ '=([^&#]*)' );
+ var m = re.exec( url );
+ if ( m && m.length > 1 ) {
+ return decodeURIComponent( m[1] );
+ }
+ return null;
+ },
+
+ /**
+ * @var string
+ * Access key prefix. Will be re-defined based on
browser/operating system
+ * detection in mw.util.init().
+ */
+ 'tooltipAccessKeyPrefix' : 'alt-',
+
+ /**
+ * @var RegExp
+ * Regex to match accesskey tooltips.
+ */
+ 'tooltipAccessKeyRegexp':
/\[(ctrl-)?(alt-)?(shift-)?(esc-)?(.)\]$/,
+
+ /**
+ * Add the appropriate prefix to the accesskey shown in the
tooltip.
+ * If the nodeList parameter is given, only those nodes are
updated;
+ * otherwise, all the nodes that will probably have accesskeys
by
+ * default are updated.
+ *
+ * @param nodeList mixed A jQuery object, or array of elements
to update.
+ */
+ 'updateTooltipAccessKeys' : function( nodeList ) {
+ var $nodes;
+ if ( nodeList instanceof jQuery ) {
+ $nodes = nodeList;
+ } else if ( nodeList ) {
+ $nodes = $( nodeList );
+ } else {
+ // Rather than scanning all links, just the
elements that
+ // contain the relevant links
+ this.updateTooltipAccessKeys(
+ $( '#column-one a, #mw-head a,
#mw-panel a, #p-logo a' ) );
+
+ // these are rare enough that no such
optimization is needed
+ this.updateTooltipAccessKeys( $( 'input' ) );
+ this.updateTooltipAccessKeys( $( 'label' ) );
+ return;
+ }
+
+ $nodes.each( function ( i ) {
+ var tip = $(this).attr( 'title' );
+ if ( !!tip &&
mw.util.tooltipAccessKeyRegexp.exec( tip ) ) {
+ tip = tip.replace(
mw.util.tooltipAccessKeyRegexp,
+ '[' +
mw.util.tooltipAccessKeyPrefix + "$5]" );
+ $(this).attr( 'title', tip );
+ }
+ } );
+ },
+
+ /*
+ * @var jQuery
+ * A jQuery object that refers to the page-content element
+ * Populated by init().
+ */
+ '$content' : null,
+
+ /**
+ * Add a link to a portlet menu on the page, such as:
+ *
+ * p-cactions (Content actions), p-personal (Personal tools),
+ * p-navigation (Navigation), p-tb (Toolbox)
+ *
+ * The first three paramters are required, the others are
optional and
+ * may be null. Though providing an id and tooltip is
recommended.
+ *
+ * By default the new link will be added to the end of the
list. To
+ * add the link before a given existing item, pass the DOM node
+ * (document.getElementById( 'foobar' )) or the jQuery-selector
+ * ( '#foobar' ) of that item.
+ *
+ * @example mw.util.addPortletLink(
+ * 'p-tb', 'http://mediawiki.org/',
+ * 'MediaWiki.org', 't-mworg', 'Go to MediaWiki.org ',
'm', '#t-print'
+ * )
+ *
+ * @param portlet string ID of the target portlet (
'p-cactions' or 'p-personal' etc.)
+ * @param href string Link URL
+ * @param text string Link text
+ * @param id string ID of the new item, should be unique and
preferably have
+ * the appropriate prefix ( 'ca-', 'pt-', 'n-' or 't-' )
+ * @param tooltip string Text to show when hovering over the
link, without accesskey suffix
+ * @param accesskey string Access key to activate this link
(one character, try
+ * to avoid conflicts. Use $( '[accesskey=x]' ).get() in the
console to
+ * see if 'x' is already used.
+ * @param nextnode mixed DOM Node or jQuery-selector string of
the item that the new
+ * item should be added before, should be another item in the
same
+ * list, it will be ignored otherwise
+ *
+ * @return mixed The DOM Node of the added item (a ListItem or
Anchor element,
+ * depending on the skin) or null if no element was added to
the document.
+ */
+ 'addPortletLink' : function( portlet, href, text, id, tooltip,
accesskey, nextnode ) {
+
+ // Check if there's atleast 3 arguments to prevent a
TypeError
+ if ( arguments.length < 3 ) {
+ return null;
+ }
+ // Setup the anchor tag
+ var $link = $( '<a></a>' ).attr( 'href', href ).text(
text );
+ if ( tooltip ) {
+ $link.attr( 'title', tooltip );
+ }
+
+ // Some skins don't have any portlets
+ // just add it to the bottom of their 'sidebar' element
as a fallback
+ switch ( mw.config.get( 'skin' ) ) {
+ case 'standard' :
+ case 'cologneblue' :
+ $( '#quickbar' ).append( $link.after( '<br />'
) );
+ return $link[0];
+ case 'nostalgia' :
+ $( '#searchform' ).before( $link).before( '
| ' );
+ return $link[0];
+ default : // Skins like chick, modern, monobook,
myskin, simple, vector...
+
+ // Select the specified portlet
+ var $portlet = $( '#' + portlet );
+ if ( $portlet.length === 0 ) {
+ return null;
+ }
+ // Select the first (most likely only)
unordered list inside the portlet
+ var $ul = $portlet.find( 'ul' );
+
+ // If it didn't have an unordered list yet,
create it
+ if ( $ul.length === 0 ) {
+ // If there's no <div> inside, append
it to the portlet directly
+ if ( $portlet.find( 'div:first'
).length === 0 ) {
+ $portlet.append( '<ul></ul>' );
+ } else {
+ // otherwise if there's a div
(such as div.body or div.pBody)
+ // append the <ul> to last
(most likely only) div
+ $portlet.find( 'div' ).eq( -1
).append( '<ul></ul>' );
+ }
+ // Select the created element
+ $ul = $portlet.find( 'ul' ).eq( 0 );
+ }
+ // Just in case..
+ if ( $ul.length === 0 ) {
+ return null;
+ }
+
+ // Unhide portlet if it was hidden before
+ $portlet.removeClass( 'emptyPortlet' );
+
+ // Wrap the anchor tag in a <span> and create a
list item for it
+ // and back up the selector to the list item
+ var $item = $link.wrap(
'<li><span></span></li>' ).parent().parent();
+
+ // Implement the properties passed to the
function
+ if ( id ) {
+ $item.attr( 'id', id );
+ }
+ if ( accesskey ) {
+ $link.attr( 'accesskey', accesskey );
+ tooltip += ' [' + accesskey + ']';
+ $link.attr( 'title', tooltip );
+ }
+ if ( accesskey && tooltip ) {
+ this.updateTooltipAccessKeys( $link );
+ }
+
+ // Where to put our node ?
+ // - nextnode is a DOM element (before MW 1.17,
in wikibits.js, this was the only option)
+ if ( nextnode && nextnode.parentNode == $ul[0]
) {
+ $(nextnode).before( $item );
+
+ // - nextnode is a CSS selector for jQuery
+ } else if ( typeof nextnode == 'string' &&
$ul.find( nextnode ).length !== 0 ) {
+ $ul.find( nextnode ).eq( 0 ).before(
$item );
+
+
+ // If the jQuery selector isn't found within
the <ul>,
+ // or if nextnode was invalid or not passed at
all,
+ // then just append it at the end of the <ul>
(this is the default behaviour)
+ } else {
+ $ul.append( $item );
+ }
+
+
+ return $item[0];
+ }
+ },
+
+ /**
+ * Add a little box at the top of the screen to inform the user
of
+ * something, replacing any previous message.
+ * Calling with no arguments, with an empty string or null will
hide the message
+ *
+ * @param message mixed The DOM-element or HTML-string to be
put inside the message box.
+ * @param className string Used in adding a class; should
be different for each call
+ * to allow CSS/JS to hide different boxes. null = no class
used.
+ * @return boolean True on success, false on failure.
+ */
+ 'jsMessage' : function( message, className ) {
+
+ if ( !arguments.length || message === '' || message ===
null ) {
+
+ $( '#mw-js-message' ).empty().hide();
+ return true; // Emptying and hiding message is
intended behaviour, return true
+
+ } else {
+ // We special-case skin structures provided by
the software. Skins that
+ // choose to abandon or significantly modify
our formatting can just define
+ // an mw-js-message div to start with.
+ var $messageDiv = $( '#mw-js-message' );
+ if ( !$messageDiv.length ) {
+ $messageDiv = $( '<div
id="mw-js-message">' );
+ if ( mw.util.$content.parent().length )
{
+
mw.util.$content.parent().prepend( $messageDiv );
+ } else {
+ return false;
+ }
+ }
+
+ if ( className ) {
+ $messageDiv.attr( 'class',
'mw-js-message-' + className );
+ }
+
+ if ( typeof message === 'object' ) {
+ $messageDiv.empty();
+ $messageDiv.append( message ); //
Append new content
+ } else {
+ $messageDiv.html( message );
+ }
+
+ $messageDiv.slideDown();
+ return true;
+ }
+ },
+
+ /**
+ * Validate a string as representing a valid e-mail address
+ * according to HTML5 specification. Please note the
specification
+ * does not validate a domain with one character.
+ *
+ * @todo FIXME: should be moved to or replaced by a JavaScript
validation module.
+ *
+ * @param mailtxt string E-mail address to be validated.
+ * @return mixed Null if mailtxt was an empty string, otherwise
true/false
+ * is determined by validation.
+ */
+ 'validateEmail' : function( mailtxt ) {
+ if( mailtxt === '' ) {
+ return null;
+ }
+
+ /**
+ * HTML5 defines a string as valid e-mail address if it
matches
+ * the ABNF:
+ * 1 * ( atext / "." ) "@" ldh-str 1*( "." ldh-str
)
+ * With:
+ * - atext : defined in RFC 5322 section 3.2.3
+ * - ldh-str : defined in RFC 1034 section 3.5
+ *
+ * (see STD 68 / RFC 5234
http://tools.ietf.org/html/std68):
+ */
+
+ /**
+ * First, define the RFC 5322 'atext' which is pretty
easy :
+ * atext = ALPHA / DIGIT / ; Printable US-ASCII
+ "!" / "#" / ; characters
not including
+ "$" / "%" / ; specials.
Used for atoms.
+ "&" / "'" /
+ "*" / "+" /
+ "-" / "/" /
+ "=" / "?" /
+ "^" / "_" /
+ "`" / "{" /
+ "|" / "}" /
+ "~"
+ */
+ var rfc5322_atext = "a-z0-9!#$%&'*+\\-/=?^_`{|}~",
+
+ /**
+ * Next define the RFC 1034 'ldh-str'
+ * <domain> ::= <subdomain> | " "
+ * <subdomain> ::= <label> | <subdomain> "."
<label>
+ * <label> ::= <letter> [ [ <ldh-str> ] <let-dig> ]
+ * <ldh-str> ::= <let-dig-hyp> | <let-dig-hyp>
<ldh-str>
+ * <let-dig-hyp> ::= <let-dig> | "-"
+ * <let-dig> ::= <letter> | <digit>
+ */
+ rfc1034_ldh_str = "a-z0-9\\-",
+
+ HTML5_email_regexp = new RegExp(
+ // start of string
+ '^'
+ +
+ // User part which is liberal :p
+ '[' + rfc5322_atext + '\\.]+'
+ +
+ // 'at'
+ '@'
+ +
+ // Domain first part
+ '[' + rfc1034_ldh_str + ']+'
+ +
+ // Optional second part and following
are separated by a dot
+ '(?:\\.[' + rfc1034_ldh_str + ']+)*'
+ +
+ // End of string
+ '$',
+ // RegExp is case insensitive
+ 'i'
+ );
+ return (null !== mailtxt.match( HTML5_email_regexp ) );
+ },
+
+ /**
+ * Note: borrows from IP::isIPv4
+ *
+ * @param address string
+ * @param allowBlock boolean
+ * @return boolean
+ */
+ 'isIPv4Address' : function( address, allowBlock ) {
+ var block = allowBlock ? '(?:\\/(?:3[0-2]|[12]?\\d))?'
: '';
+ var RE_IP_BYTE =
'(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|0?[0-9]?[0-9])';
+ var RE_IP_ADD = '(?:' + RE_IP_BYTE + '\\.){3}' +
RE_IP_BYTE;
+ return typeof address === 'string' && address.search(
new RegExp( '^' + RE_IP_ADD + block + '$' ) ) != -1;
+ },
+ /**
+ * Note: borrows from IP::isIPv6
+ *
+ * @param address string
+ * @param allowBlock boolean
+ * @return boolean
+ */
+ 'isIPv6Address' : function( address, allowBlock ) {
+ if ( typeof address !== 'string' ) {
+ return false;
+ }
+ var block = allowBlock ?
'(?:\\/(?:12[0-8]|1[01][0-9]|[1-9]?\\d))?' : '';
+ var RE_IPV6_ADD =
+ '(?:' + // starts with "::" (including "::")
+ ':(?::|(?::' + '[0-9A-Fa-f]{1,4}' + '){1,7})' +
+ '|' + // ends with "::" (except "::")
+ '[0-9A-Fa-f]{1,4}' + '(?::' + '[0-9A-Fa-f]{1,4}' +
'){0,6}::' +
+ '|' + // contains no "::"
+ '[0-9A-Fa-f]{1,4}' + '(?::' + '[0-9A-Fa-f]{1,4}' +
'){7}' +
+ ')';
+ if ( address.search( new RegExp( '^' + RE_IPV6_ADD +
block + '$' ) ) != -1 ) {
+ return true;
+ }
+ RE_IPV6_ADD = // contains one "::" in the middle
(single '::' check below)
+ '[0-9A-Fa-f]{1,4}' + '(?:::?' +
'[0-9A-Fa-f]{1,4}' + '){1,6}';
+ return address.search( new RegExp( '^' + RE_IPV6_ADD +
block + '$' ) ) != -1
+ && address.search( /::/ ) != -1 &&
address.search( /::.*::/ ) == -1;
+ }
+
+ };
+
+ mw.util.init();
+
+} )( jQuery, mediaWiki );
\ No newline at end of file
Modified: trunk/phase3/tests/qunit/index.html
===================================================================
--- trunk/phase3/tests/qunit/index.html 2011-06-14 17:38:16 UTC (rev 90062)
+++ trunk/phase3/tests/qunit/index.html 2011-06-14 17:44:02 UTC (rev 90063)
@@ -25,7 +25,7 @@
<script
src="../../resources/jquery/jquery.makeCollapsible.js"></script>
<script
src="../../resources/jquery/jquery.mwPrototypes.js"></script>
<script
src="../../resources/jquery/jquery.placeholder.js"></script>
- <script src="../../resources/mediawiki.util/mediawiki.util.js"></script>
+ <script src="../../resources/mediawiki/mediawiki.util.js"></script>
<!-- MW: user.options -->
<script>
@@ -47,7 +47,7 @@
<script src="suites/resources/jquery/jquery.client.js"></script>
<script src="suites/resources/jquery/jquery.mwPrototypes.js"></script>
- <script
src="suites/resources/mediawiki.util/mediawiki.util.js"></script>
+ <script src="suites/resources/mediawiki/mediawiki.util.js"></script>
<script src="suites/resources/jquery/jquery.autoEllipsis.js"></script>
<script src="suites/resources/jquery/jquery.colorUtil.js"></script>
Copied: trunk/phase3/tests/qunit/suites/resources/mediawiki/mediawiki.util.js
(from rev 90054,
trunk/phase3/tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js)
===================================================================
--- trunk/phase3/tests/qunit/suites/resources/mediawiki/mediawiki.util.js
(rev 0)
+++ trunk/phase3/tests/qunit/suites/resources/mediawiki/mediawiki.util.js
2011-06-14 17:44:02 UTC (rev 90063)
@@ -0,0 +1,265 @@
+module( 'mediawiki.util.js' );
+
+test( '-- Initial check', function() {
+ expect(1);
+
+ ok( mw.util, 'mw.util defined' );
+});
+
+test( 'rawurlencode', function() {
+ expect(1);
+
+ equal( mw.util.rawurlencode( 'Test:A & B/Here' ),
'Test%3AA%20%26%20B%2FHere' );
+});
+
+test( 'wikiUrlencode', function() {
+ expect(1);
+
+ equal( mw.util.wikiUrlencode( 'Test:A & B/Here' ), 'Test:A_%26_B/Here'
);
+});
+
+test( 'wikiGetlink', function() {
+ expect(2);
+
+ // Not part of startUp module
+ mw.config.set( 'wgArticlePath', '/wiki/$1' );
+
+ var hrefA = mw.util.wikiGetlink( 'Sandbox' );
+ equal( hrefA, '/wiki/Sandbox', 'Simple title; Get link for "Sandbox"' );
+
+ var hrefB = mw.util.wikiGetlink( 'Foo:Sandbox ? 5+5=10 !
(test)/subpage' );
+ equal( hrefB, '/wiki/Foo:Sandbox_%3F_5%2B5%3D10_%21_%28test%29/subpage',
+ 'Advanced title; Get link for "Foo:Sandbox ? 5+5=10 !
(test)/subpage"' );
+});
+
+test( 'wikiScript', function() {
+ expect(2);
+
+ mw.config.set({
+ 'wgScript': '/w/index.php',
+ 'wgScriptPath': '/w',
+ 'wgScriptExtension': '.php'
+ });
+
+ equal( mw.util.wikiScript(), mw.config.get( 'wgScript' ), 'Defaults to
index.php and is equal to wgScript' );
+ equal( mw.util.wikiScript( 'api' ), '/w/api.php', 'API path' );
+
+});
+
+test( 'addCSS', function() {
+ expect(3);
+
+ var a = mw.util.addCSS( '#bodyContent { visibility: hidden; }' );
+ equal( typeof a, 'object', 'addCSS returned an object' );
+ strictEqual( a.disabled, false, 'property "disabled" is available and
set to false' );
+
+ var $b = $('#bodyContent');
+ equal( $b.css('visibility'), 'hidden', 'Added style properties are in
effect' );
+
+ // Clean up
+ $( a.ownerNode ).remove();
+});
+
+test( 'toggleToc', function() {
+ expect(3);
+
+ strictEqual( mw.util.toggleToc(), null, 'Return null if there is no
table of contents on the page.' );
+
+ var tocHtml =
+ '<table id="toc" class="toc"><tr><td>' +
+ '<div id="toctitle">' +
+ '<h2>Contents</h2>' +
+ '<span class="toctoggle"> [<a href="#"
class="internal" id="togglelink">Hide</a> ]</span>' +
+ '</div>' +
+ '<ul><li></li></ul>' +
+ '</td></tr></table>';
+ var $toc = $(tocHtml).appendTo( 'body' );
+ var $toggleLink = $( '#togglelink' );
+
+ // Toggle animation is asynchronous
+ // QUnit should not finish this test() untill they are all done
+ stop();
+
+ var actionC = function() {
+ start();
+
+ // Clean up
+ $toc.remove();
+ };
+ var actionB = function() {
+ strictEqual( mw.util.toggleToc( $toggleLink, actionC ), true,
'Return boolean true if the TOC is now visible.' );
+ };
+ var actionA = function() {
+ strictEqual( mw.util.toggleToc( $toggleLink, actionB ), false,
'Return boolean false if the TOC is now hidden.' );
+ };
+
+ actionA();
+});
+
+test( 'getParamValue', function() {
+ expect(2);
+
+ var url = 'http://mediawiki.org/?foo=wrong&foo=right#&foo=bad';
+
+ equal( mw.util.getParamValue( 'foo', url ), 'right', 'Use latest one,
ignore hash' );
+ strictEqual( mw.util.getParamValue( 'bar', url ), null, 'Return null
when not found' );
+});
+
+test( 'tooltipAccessKey', function() {
+ expect(3);
+
+ equal( typeof mw.util.tooltipAccessKeyPrefix, 'string',
'mw.util.tooltipAccessKeyPrefix must be a string' );
+ ok( mw.util.tooltipAccessKeyRegexp instanceof RegExp,
'mw.util.tooltipAccessKeyRegexp instance of RegExp' );
+ ok( mw.util.updateTooltipAccessKeys, 'mw.util.updateTooltipAccessKeys'
);
+});
+
+test( '$content', function() {
+ expect(2);
+
+ ok( mw.util.$content instanceof jQuery, 'mw.util.$content instance of
jQuery' );
+ strictEqual( mw.util.$content.length, 1, 'mw.util.$content must have
length of 1' );
+});
+
+test( 'addPortletLink', function() {
+ expect(5);
+
+ var A = mw.util.addPortletLink( 'p-tb',
'http://mediawiki.org/wiki/ResourceLoader',
+ 'ResourceLoader', 't-rl', 'More info about ResourceLoader on
MediaWiki.org ', 'l', '#t-specialpages' );
+
+ ok( $.isDomElement( A ), 'addPortletLink returns a valid DOM Element
according to $.isDomElement' );
+
+ var B = mw.util.addPortletLink( "p-tb", "http://mediawiki.org/";,
+ "MediaWiki.org", "t-mworg", "Go to MediaWiki.org ", "m", A );
+
+ equal( $( B ).attr( 'id' ), 't-mworg', 'Link has correct ID set' );
+ equal( $( B ).closest( '.portal' ).attr( 'id' ), 'p-tb', 'Link was
inserted within correct portlet' );
+ equal( $( B ).next().attr( 'id' ), 't-rl', 'Link is in the correct
position (by passing nextnode)' );
+
+ var C = mw.util.addPortletLink( "p-tb",
"http://mediawiki.org/wiki/RL/DM";,
+ "Default modules", "t-rldm", "List of all default modules ",
"d", "#t-rl" );
+
+ equal( $( C ).next().attr( 'id' ), 't-rl', 'Link is in the correct
position (by passing CSS selector)' );
+
+ // Clean up
+ $( [A, B, C] ).remove();
+});
+
+test( 'jsMessage', function() {
+ expect(1);
+
+ var a = mw.util.jsMessage( "MediaWiki is <b>Awesome</b>." );
+ ok( a, 'Basic checking of return value' );
+
+ // Clean up
+ $( '#mw-js-message' ).remove();
+});
+
+test( 'validateEmail', function() {
+ expect(6);
+
+ strictEqual( mw.util.validateEmail( "" ), null, 'Should return null for
empty string ' );
+ strictEqual( mw.util.validateEmail( "user@localhost" ), true, 'Return
true for a valid e-mail address' );
+
+ // testEmailWithCommasAreInvalids
+ strictEqual( mw.util.validateEmail( "user,[email protected]" ), false,
'Emails with commas are invalid' );
+ strictEqual( mw.util.validateEmail( "userfoo@ex,ample.org" ), false,
'Emails with commas are invalid' );
+
+ // testEmailWithHyphens
+ strictEqual( mw.util.validateEmail( "[email protected]" ), true,
'Emails may contain a hyphen' );
+ strictEqual( mw.util.validateEmail( "[email protected]" ), true,
'Emails may contain a hyphen' );
+});
+
+test( 'isIPv6Address', function() {
+ expect(40);
+
+ // Shortcuts
+ var assertFalseIPv6 = function( addy, summary ) {
+ return strictEqual( mw.util.isIPv6Address( addy ),
false, summary );
+ },
+ assertTrueIPv6 = function( addy, summary ) {
+ return strictEqual( mw.util.isIPv6Address( addy ),
true, summary );
+ };
+
+ // Based on IPTest.php > testisIPv6
+ assertFalseIPv6( ':fc:100::', 'IPv6 starting with lone ":"' );
+ assertFalseIPv6( 'fc:100:::', 'IPv6 ending with a ":::"' );
+ assertFalseIPv6( 'fc:300', 'IPv6 with only 2 words' );
+ assertFalseIPv6( 'fc:100:300', 'IPv6 with only 3 words' );
+
+ $.each(
+ ['fc:100::',
+ 'fc:100:a::',
+ 'fc:100:a:d::',
+ 'fc:100:a:d:1::',
+ 'fc:100:a:d:1:e::',
+ 'fc:100:a:d:1:e:ac::'], function( i, addy ){
+ assertTrueIPv6( addy, addy + ' is a valid IP' );
+ });
+
+ assertFalseIPv6( 'fc:100:a:d:1:e:ac:0::', 'IPv6 with 8 words ending
with "::"' );
+ assertFalseIPv6( 'fc:100:a:d:1:e:ac:0:1::', 'IPv6 with 9 words ending
with "::"' );
+
+ assertFalseIPv6( ':::' );
+ assertFalseIPv6( '::0:', 'IPv6 ending in a lone ":"' );
+
+ assertTrueIPv6( '::', 'IPv6 zero address' );
+ $.each(
+ ['::0',
+ '::fc',
+ '::fc:100',
+ '::fc:100:a',
+ '::fc:100:a:d',
+ '::fc:100:a:d:1',
+ '::fc:100:a:d:1:e',
+ '::fc:100:a:d:1:e:ac',
+
+ 'fc:100:a:d:1:e:ac:0'], function( i, addy ){
+ assertTrueIPv6( addy, addy + ' is a valid IP' );
+ });
+
+ assertFalseIPv6( '::fc:100:a:d:1:e:ac:0', 'IPv6 with "::" and 8 words'
);
+ assertFalseIPv6( '::fc:100:a:d:1:e:ac:0:1', 'IPv6 with 9 words' );
+
+ assertFalseIPv6( ':fc::100', 'IPv6 starting with lone ":"' );
+ assertFalseIPv6( 'fc::100:', 'IPv6 ending with lone ":"' );
+ assertFalseIPv6( 'fc:::100', 'IPv6 with ":::" in the middle' );
+
+ assertTrueIPv6( 'fc::100', 'IPv6 with "::" and 2 words' );
+ assertTrueIPv6( 'fc::100:a', 'IPv6 with "::" and 3 words' );
+ assertTrueIPv6( 'fc::100:a:d', 'IPv6 with "::" and 4 words' );
+ assertTrueIPv6( 'fc::100:a:d:1', 'IPv6 with "::" and 5 words' );
+ assertTrueIPv6( 'fc::100:a:d:1:e', 'IPv6 with "::" and 6 words' );
+ assertTrueIPv6( 'fc::100:a:d:1:e:ac', 'IPv6 with "::" and 7 words' );
+ assertTrueIPv6( '2001::df', 'IPv6 with "::" and 2 words' );
+ assertTrueIPv6( '2001:5c0:1400:a::df', 'IPv6 with "::" and 5 words' );
+ assertTrueIPv6( '2001:5c0:1400:a::df:2', 'IPv6 with "::" and 6 words' );
+
+ assertFalseIPv6( 'fc::100:a:d:1:e:ac:0', 'IPv6 with "::" and 8 words' );
+ assertFalseIPv6( 'fc::100:a:d:1:e:ac:0:1', 'IPv6 with 9 words' );
+});
+
+test( 'isIPv4Address', function() {
+ expect(11);
+
+ // Shortcuts
+ var assertFalseIPv4 = function( addy, summary ) {
+ return strictEqual( mw.util.isIPv4Address( addy ),
false, summary );
+ },
+ assertTrueIPv4 = function( addy, summary ) {
+ return strictEqual( mw.util.isIPv4Address( addy ),
true, summary );
+ };
+
+ // Based on IPTest.php > testisIPv4
+ assertFalseIPv4( false, 'Boolean false is not an IP' );
+ assertFalseIPv4( true, 'Boolean true is not an IP' );
+ assertFalseIPv4( '', 'Empty string is not an IP' );
+ assertFalseIPv4( 'abc', '"abc" is not an IP' );
+ assertFalseIPv4( ':', 'Colon is not an IP' );
+ assertFalseIPv4( '124.24.52', 'IPv4 not enough quads' );
+ assertFalseIPv4( '24.324.52.13', 'IPv4 out of range' );
+ assertFalseIPv4( '.24.52.13', 'IPv4 starts with period' );
+
+ assertTrueIPv4( '124.24.52.13', '124.24.52.134 is a valid IP' );
+ assertTrueIPv4( '1.24.52.13', '1.24.52.13 is a valid IP' );
+ assertFalseIPv4( '74.24.52.13/20', 'IPv4 ranges are not recogzized as
valid IPs' );
+});
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
