http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98073
Revision: 98073
Author: catrope
Date: 2011-09-25 17:59:01 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
MoodBar: Display an error message when the AJAX call fails. Probably needs a
better error message and/or better styling, but Brandon's not around to help me
now
Modified Paths:
--------------
trunk/extensions/MoodBar/MoodBar.i18n.php
trunk/extensions/MoodBar/MoodBar.php
trunk/extensions/MoodBar/modules/ext.moodBar.dashboard/ext.moodBar.dashboard.js
Modified: trunk/extensions/MoodBar/MoodBar.i18n.php
===================================================================
--- trunk/extensions/MoodBar/MoodBar.i18n.php 2011-09-25 17:49:14 UTC (rev
98072)
+++ trunk/extensions/MoodBar/MoodBar.i18n.php 2011-09-25 17:59:01 UTC (rev
98073)
@@ -85,9 +85,10 @@
'moodbar-feedback-permalink' => 'link to here',
'moodbar-feedback-noresults' => 'There are no comments that match your
filters.',
'moodbar-feedback-more' => 'More',
- 'moodbar-feedback-nomore' => 'There are no more results to show',
+ 'moodbar-feedback-nomore' => 'There are no more results to show.',
'moodbar-feedback-newer' => 'Newer',
'moodbar-feedback-older' => 'Older',
+ 'moodbar-feedback-ajaxerror' => 'An error occurred while fetching more
results.',
// Mood types
'moodbar-type-happy' => 'Happy',
'moodbar-type-sad' => 'Sad',
Modified: trunk/extensions/MoodBar/MoodBar.php
===================================================================
--- trunk/extensions/MoodBar/MoodBar.php 2011-09-25 17:49:14 UTC (rev
98072)
+++ trunk/extensions/MoodBar/MoodBar.php 2011-09-25 17:59:01 UTC (rev
98073)
@@ -119,7 +119,7 @@
$wgResourceModules['ext.moodBar.dashboard'] = $mbResourceTemplate + array(
'scripts' => 'ext.moodBar.dashboard/ext.moodBar.dashboard.js',
'dependencies' => array( 'mediawiki.util' ),
- 'messages' => array( 'moodbar-feedback-nomore' ),
+ 'messages' => array( 'moodbar-feedback-nomore',
'moodbar-feedback-ajaxerror' ),
);
$wgResourceModules['ext.moodBar.dashboard.styles'] = $mbResourceTemplate +
array(
Modified:
trunk/extensions/MoodBar/modules/ext.moodBar.dashboard/ext.moodBar.dashboard.js
===================================================================
---
trunk/extensions/MoodBar/modules/ext.moodBar.dashboard/ext.moodBar.dashboard.js
2011-09-25 17:49:14 UTC (rev 98072)
+++
trunk/extensions/MoodBar/modules/ext.moodBar.dashboard/ext.moodBar.dashboard.js
2011-09-25 17:59:01 UTC (rev 98073)
@@ -37,8 +37,14 @@
$.ajax( mw.util.wikiScript( 'api' ), {
'data': reqData,
'success': function( data ) {
+ // Remove the spinner and restore the "More"
link
+ $( '#fbd-list-more' )
+ .removeClass( 'mw-ajax-loader' )
+ .children( 'a' )
+ .css( 'visibility', 'visible' );
+
if ( !data || !data.query ||
!data.query.moodbarcomments ) {
- // TODO error
+ $( '#fbd-list-more' ).text( mw.msg(
'moodbar-feedback-ajaxerror' ) );
return;
}
@@ -62,17 +68,14 @@
$ul.append( comments[i].formatted );
}
- // Remove the spinner and restore the "More"
link
- $( '#fbd-list-more' )
- .removeClass( 'mw-ajax-loader' )
- .children( 'a' )
- .css( 'visibility', 'visible' );
if ( !moreResults ) {
$( '#fbd-list-more' ).text( mw.msg(
'moodbar-feedback-nomore' ) );
}
},
'error': function( jqXHR, textStatus, errorThrown ) {
- // TODO
+ $( '#fbd-list-more' )
+ .removeClass( 'mw-ajax-loader' )
+ .text( mw.msg(
'moodbar-feedback-ajaxerror' ) );
},
'dataType': 'json'
} );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
