http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89139
Revision: 89139 Author: janpaul123 Date: 2011-05-29 22:49:54 +0000 (Sun, 29 May 2011) Log Message: ----------- Fix for when image loading fails Modified Paths: -------------- trunk/extensions/WikiLove/WikiLove.i18n.php trunk/extensions/WikiLove/WikiLove.php trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.core.js trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.css Modified: trunk/extensions/WikiLove/WikiLove.i18n.php =================================================================== --- trunk/extensions/WikiLove/WikiLove.i18n.php 2011-05-29 21:50:09 UTC (rev 89138) +++ trunk/extensions/WikiLove/WikiLove.i18n.php 2011-05-29 22:49:54 UTC (rev 89139) @@ -39,6 +39,8 @@ 'wikilove-err-msg' => 'Please enter a message.', 'wikilove-err-image' => 'Please select an image.', 'wikilove-err-sig' => 'Please do not include a signature in the message.', + 'wikilove-err-gallery' => 'Something went wrong when loading the images!', + 'wikilove-err-gallery-again' => 'Try again', ); /** Message documentation (Message documentation) Modified: trunk/extensions/WikiLove/WikiLove.php =================================================================== --- trunk/extensions/WikiLove/WikiLove.php 2011-05-29 21:50:09 UTC (rev 89138) +++ trunk/extensions/WikiLove/WikiLove.php 2011-05-29 22:49:54 UTC (rev 89139) @@ -112,7 +112,8 @@ 'wikilove-err-msg', 'wikilove-err-image', 'wikilove-err-sig', - 'wikilove-barnstar-header', + 'wikilove-err-gallery', + 'wikilove-err-gallery-again', ), 'dependencies' => array( 'jquery.ui.dialog', Modified: trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.core.js =================================================================== --- trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.core.js 2011-05-29 21:50:09 UTC (rev 89138) +++ trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.core.js 2011-05-29 22:49:54 UTC (rev 89139) @@ -68,6 +68,10 @@ <div id="mw-wikilove-subtype-description"></div>\ <label id="mw-wikilove-gallery-label"><html:msg key="wikilove-image"/></label>\ <div id="mw-wikilove-gallery">\ + <div id="mw-wikilove-gallery-error">\ + <html:msg key="wikilove-err-gallery"/>\ + <a href="#" id="mw-wikilove-gallery-error-again"><html:msg key="wikilove-err-gallery-again"/></a>\ + </div>\ <div id="mw-wikilove-gallery-spinner" class="mw-wikilove-spinner"></div>\ <div id="mw-wikilove-gallery-content"></div>\ </div>\ @@ -114,7 +118,7 @@ $( '#mw-wikilove-add-details' ).hide(); $( '#mw-wikilove-preview' ).hide(); $( '#mw-wikilove-types' ).replaceWith( $typeList ); - + $( '#mw-wikilove-gallery-error-again' ).click( $.wikiLove.showGallery ); $( '#mw-wikilove-types a' ).click( $.wikiLove.clickType ); $( '#mw-wikilove-subtype' ).change( $.wikiLove.changeSubtype ); $( '#mw-wikilove-preview-form' ).submit( $.wikiLove.submitPreview ); @@ -424,6 +428,7 @@ $( '#mw-wikilove-gallery-content' ).html( '' ); gallery = {}; $( '#mw-wikilove-gallery-spinner' ).fadeIn( 200 ); + $( '#mw-wikilove-gallery-error' ).hide(); if( typeof currentTypeOrSubtype.gallery.number == 'undefined' || currentTypeOrSubtype.gallery.number <= 0 @@ -458,10 +463,16 @@ dataType: 'json', type: 'POST', success: function( data ) { - if ( !data || !data.query || !data.query.pages || loadingType != currentTypeOrSubtype ) { + if ( !data || !data.query || !data.query.pages ) { + $( '#mw-wikilove-gallery-error' ).show(); + $( '#mw-wikilove-gallery-spinner' ).fadeOut( 200 ); return; } + if ( loadingType != currentTypeOrSubtype ) { + return; + } + $.each( data.query.pages, function( id, page ) { if ( page.imageinfo && page.imageinfo.length ) { // build an image tag with the correct url and width @@ -491,6 +502,10 @@ index++; } } ); + }, + error: function() { + $( '#mw-wikilove-gallery-error' ).show(); + $( '#mw-wikilove-gallery-spinner' ).fadeOut( 200 ); } }); }, Modified: trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.css =================================================================== --- trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.css 2011-05-29 21:50:09 UTC (rev 89138) +++ trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.css 2011-05-29 22:49:54 UTC (rev 89139) @@ -224,6 +224,14 @@ position: relative; } +/*#mw-wikilove-dialog #mw-wikilove-gallery*/ #mw-wikilove-gallery-error { + margin-left: 15px; +} + +/*#mw-wikilove-dialog #mw-wikilove-gallery #mw-wikilove-gallery-error*/ #mw-wikilove-gallery-error-again { + color: #0645AD; +} + /*#mw-wikilove-dialog*/ #mw-wikilove-gallery img { margin-right: 5px; margin-bottom: 5px; _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs