http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99446
Revision: 99446
Author: neilk
Date: 2011-10-10 23:29:07 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
ensure tests for mw.Uri work in non-browser environments
Modified Paths:
--------------
trunk/phase3/resources/mediawiki/mediawiki.Uri.js
trunk/phase3/tests/jasmine/spec/mediawiki.Uri.spec.js
Modified: trunk/phase3/resources/mediawiki/mediawiki.Uri.js
===================================================================
--- trunk/phase3/resources/mediawiki/mediawiki.Uri.js 2011-10-10 23:22:47 UTC
(rev 99445)
+++ trunk/phase3/resources/mediawiki/mediawiki.Uri.js 2011-10-10 23:29:07 UTC
(rev 99446)
@@ -275,9 +275,9 @@
return Uri;
};
- // inject the current document location, for relative URLs
- mw.Uri = mw.UriRelative( document.location.href );
+ // if we are running in a browser, inject the current document
location, for relative URLs
+ if ( document && document.location && document.location.href ) {
+ mw.Uri = mw.UriRelative( document.location.href );
+ }
-
-
} )( jQuery, mediaWiki );
Modified: trunk/phase3/tests/jasmine/spec/mediawiki.Uri.spec.js
===================================================================
--- trunk/phase3/tests/jasmine/spec/mediawiki.Uri.spec.js 2011-10-10
23:22:47 UTC (rev 99445)
+++ trunk/phase3/tests/jasmine/spec/mediawiki.Uri.spec.js 2011-10-10
23:29:07 UTC (rev 99446)
@@ -1,5 +1,10 @@
( function() {
+ // ensure we have a generic URI parser if not running in a browser
+ if ( !mw.Uri ) {
+ mw.Uri = mw.UriRelative( 'http://sample.com/' );
+ }
+
describe( "mw.Uri", function() {
describe( "should work well in loose and strict mode",
function() {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
