http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94260
Revision: 94260
Author: hartman
Date: 2011-08-11 17:24:30 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
Remove 'private' version of mediawiki.Uri from MwEmbedSupport.
This may possibly break MwEmbedStandalone ? But who cares, it's about time this
stuff gets out the door, let this be the point where we remove all the cruft.
Modified Paths:
--------------
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
Removed Paths:
-------------
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/mediawiki/mediawiki.Uri.js
Modified:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
===================================================================
---
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
2011-08-11 17:21:31 UTC (rev 94259)
+++
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
2011-08-11 17:24:30 UTC (rev 94260)
@@ -36,8 +36,9 @@
),
'mediawiki.UtilitiesTime' => array( 'scripts' =>
'mediawiki/mediawiki.UtilitiesTime.js' ),
'mediawiki.client' => array( 'scripts' =>
'mediawiki/mediawiki.client.js' ),
- 'mediawiki.Uri' => array( 'scripts' => 'mediawiki/mediawiki.Uri.js' ),
- 'mediawiki.absoluteUrl' => array( 'scripts' =>
'mediawiki/mediawiki.absoluteUrl.js' ),
+ 'mediawiki.absoluteUrl' => array( 'scripts' =>
'mediawiki/mediawiki.absoluteUrl.js',
+ 'dependancies' => array( 'mediawiki.Uri' ),
+ ),
'mediawiki.language.parser' => array(
'scripts'=> 'mediawiki/mediawiki.language.parser.js',
Deleted:
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/mediawiki/mediawiki.Uri.js
===================================================================
---
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/mediawiki/mediawiki.Uri.js
2011-08-11 17:21:31 UTC (rev 94259)
+++
trunk/extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport/mediawiki/mediawiki.Uri.js
2011-08-11 17:24:30 UTC (rev 94260)
@@ -1,250 +0,0 @@
-/**
- * Library for simple URI parsing and manipulation. Requires jQuery.
- *
- * Do not expect full RFC 3986 compliance. Intended to be minimal, but
featureful.
- * The use cases we have in mind are constructing 'next page' or 'previous
page' URLs,
- * detecting whether we need to use cross-domain proxies for an API,
constructing simple
- * URL-based API calls, etc.
- *
- * Intended to compress very well if you use a JS-parsing minifier.
- *
- * Dependencies: mw, mw.Utilities, jQuery
- *
- * Example:
- *
- * var uri = new mw.Uri( 'http://foo.com/mysite/mypage.php?quux=2' );
- *
- * if ( uri.host == 'foo.com' ) {
- * uri.host = 'www.foo.com';
- * uri.extend( { bar: 1 } );
- *
- * $( 'a#id1' ).setAttr( 'href', uri );
- * // anchor with id 'id1' now links to
http://www.foo.com/mysite/mypage.php?bar=1&quux=2
- *
- * $( 'a#id2' ).setAttr( 'href', uri.clone().extend( { bar: 3, pif:
'paf' } ) );
- * // anchor with id 'id2' now links to
http://www.foo.com/mysite/mypage.php?bar=3&quux=2&pif=paf
- * }
- *
- * Parsing here is regex based, so may not work on all URIs, but is good
enough for most.
- *
- * Given a URI like
- *
'http://usr:[email protected]:81/dir/dir.2/index.htm?q1=0&&test1&test2=value+%28escaped%29#top':
- * The returned object will have the following properties:
- *
- * protocol 'http'
- * user 'usr'
- * password 'pwd'
- * host 'www.test.com'
- * port '81'
- * path '/dir/dir.2/index.htm'
- * query { q1: 0, test1: '', test2: 'value (escaped)' }
- * fragment 'top'
- *
- * n.b. 'password' is not technically allowed for HTTP URIs, but it is
possible with other sorts of URIs.
- *
- * You can modify the properties directly. Then use the toString() method to
extract the full URI string again.
- *
- * parsing based on parseUri 1.2.2 (c) Steven Levithan <stevenlevithan.com>
MIT License
- * http://stevenlevithan.com/demo/parseuri/js/
- *
- */
-
-( function( mw, $ ) {
- /**
- * Constructs URI object. Throws error if arguments are
illegal/impossible, or otherwise don't parse.
- * @constructor
- * @param {!Object|String} URI string, or an Object with appropriate
properties (especially another URI object to clone). Object must have non-blank
'protocol', 'host', and 'path' properties.
- * @param {Boolean} strict mode (when parsing a string)
- */
- mw.Uri = function( uri, strictMode ) {
- strictMode = !!strictMode;
- if ( mw.isFull( uri ) ) {
- if ( typeof uri === 'string' ) {
- this._parse( uri, strictMode );
- } else if ( typeof uri === 'object' ) {
- var _this = this;
- $.each( this._properties, function( i, property
) {
- _this[property] = uri[property];
- } );
- if ( ! mw.isDefined( this.query ) ) {
- this.query = {};
- }
- }
- }
- //if ( !( this.protocol && this.host && this.path ) ) {
- // throw new Error( "bad constructor arguments for " +
uri);
- //}
- };
-
- mw.Uri.prototype = {
-
- /**
- * Standard encodeURIComponent, with extra stuff to make all
browsers work similarly and more compliant with RFC 3986
- * @param {String} string
- * @return {String} encoded for URI
- */
- encode: function( component ) {
- return encodeURIComponent( component )
- .replace( /!/g, '%21')
- .replace( /'/g, '%27')
- .replace( /\(/g, '%28')
- .replace( /\)/g, '%29')
- .replace( /\*/g, '%2A')
- .replace( /%20/g, '+' );
- },
-
- /**
- * Standard decodeURIComponent, with '+' to space
- * @param {String} string encoded for URI
- * @return {String} decoded string
- */
- decode: function( component ) {
- return decodeURIComponent( component ).replace( /\+/g,
' ' );
- },
-
- // regular expressions to parse many common URIs.
- // @private
- _parser: {
- strict:
/^(?:([^:\/?#]+):)?(?:\/\/(?:(?:([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)?((?:[^?#\/]*\/)*[^?#]*)(?:\?([^#]*))?(?:#(.*))?/,
- loose:
/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?(?:(?:([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?((?:\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?[^?#\/]*)(?:\?([^#]*))?(?:#(.*))?/
- },
-
- /* the order here matches the order of captured matches in the
above parser regexes */
- // @private
- _properties: [
- "protocol", // http
- "user", // usr
- "password", // pwd
- "host", // www.test.com
- "port", // 81
- "path", // /dir/dir.2/index.htm
- "query", // q1=0&&test1&test2=value (will become {
q1: 0, test1: '', test2: 'value' } )
- "fragment" // top
- ],
-
- /**
- * Parse a string and set our properties accordingly.
- * @param {String} URI
- * @param {Boolean} strictness
- * @return {Boolean} success
- */
- _parse: function( str, strictMode ) {
- var matches = this._parser[ strictMode ? "strict" :
"loose" ].exec( str );
- var uri = this;
- $.each( uri._properties, function( i, property ) {
- uri[ property ] = matches[ i+1 ];
- } );
-
- // uri.query starts out as the query string; we will
parse it into key-val pairs then make
- // that object the "query" property.
- // we overwrite query in uri way to make cloning
easier, it can use the same list of properties.
- var query = {};
- // using replace to iterate over a string
- // JS 1.3 - function as parameter to replace
- // Note: uri does not work with repeated parameter
names (e.g. foo=1&foo=2 )
- if ( uri.query ) {
- uri.query.replace( /(?:^|&)([^&=]*)=?([^&]*)/g,
function ($0, $1, $2) {
- if ( $1 ) {
- query[ uri.decode( $1 ) ] =
uri.decode( $2 );
- }
- } );
- }
- this.query = query;
- },
-
- /**
- * Returns user and password portion of a URI.
- * @return {String}
- */
- getUserInfo: function() {
- var userInfo = '';
- if ( mw.isFull( this.user ) ) {
- userInfo += this.encode( this.user );
- if ( mw.isFull( this.password ) ) {
- userInfo += ':' + this.encode(
this.password );
- }
- }
- return userInfo;
- },
-
- /**
- * Gets host and port portion of a URI.
- * @return {String}
- */
- getHostPort: function() {
- return this.host
- + ( mw.isFull( this.port ) ? ':' + this.port
- : ''
- );
- },
-
- /**
- * Returns the userInfo and host and port portion of the URI.
- * In most real-world URLs, this is simply the hostname, but it
is more general.
- * @return {String}
- */
- getAuthority: function() {
- var userInfo = this.getUserInfo();
- return ( mw.isFull( userInfo ) ? userInfo + '@'
- : ''
- )
- + this.getHostPort();
- },
-
- /**
- * Returns the query arguments of the URL, encoded into a string
- * Does not preserve the order of arguments passed into the
URI. Does handle escaping.
- * @return {String}
- */
- getQueryString: function() {
- var pairs = [];
- var _this = this;
- $.each( this.query, function( key, value ) {
- pairs.push( _this.encode( key ) + '=' +
_this.encode( value ) );
- } );
- return pairs.join( '&' );
- },
-
- /**
- * Returns everything after the authority section of the URI
- * @return {String}
- */
- getRelativePath: function() {
- var queryString = this.getQueryString();
- return this.path
- + ( mw.isFull( queryString ) ? '?' + queryString
- : ''
- )
- + ( mw.isFull( this.fragment ) ? '#' +
this.encode( this.fragment )
- : ''
- );
- },
-
- /**
- * Gets the entire URI string. May not be precisely the same as
input due to order of query arguments.
- * @return {String} the URI string
- */
- toString: function() {
- return this.protocol + '://' + this.getAuthority() +
this.getRelativePath();
- },
-
- /**
- * Clone this URI
- * @return {Object} new URI object with same properties
- */
- clone: function() {
- return new mw.Uri( this );
- },
-
- /**
- * Extend the query -- supply query parameters to override or
add to ours
- * @param {Object} query parameters in key-val form to override
or add
- * @return {Object} this URI object
- */
- extend: function( parameters ) {
- $.extend( this.query, parameters );
- return this;
- }
- };
-
-} )( window.mediaWiki, jQuery );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
