https://www.mediawiki.org/wiki/Special:Code/MediaWiki/106402
Revision: 106402
Author: rmoen
Date: 2011-12-16 01:04:33 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
removeing wikipedia specific language from tooltip, remove document.ready wrap
on getUserInfo method & used in callback in inject method, change order of
which moodbar is initialized so that mediawiki.util is available in init
script. follow up to r105613
Modified Paths:
--------------
trunk/extensions/MoodBar/MoodBar.i18n.php
trunk/extensions/MoodBar/MoodBar.php
trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.core.js
trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.init.js
trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.tooltip.css
trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.tooltip.js
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-12-16 00:24:00 UTC (rev
106401)
+++ trunk/extensions/MoodBar/MoodBar.i18n.php 2011-12-16 01:04:33 UTC (rev
106402)
@@ -71,8 +71,7 @@
'moodbar-email-resend-confirmation' => 'Resend confirmation',
'moodbar-email-optout' => 'No thanks',
// MoodBar Tooltip
- 'moodbar-tooltip-title' => 'Let us know about your experience editing
Wikipedia.',
- 'moodbar-tooltip-subtitle' => 'Your feedback about editing Wikipedia
helps us make the site better.',
+ 'moodbar-tooltip-title' => 'Let us know about your experience editing
{{SITENAME}}.',
// Special:MoodBar
'right-moodbar-view' => 'View and export MoodBar feedback',
'right-moodbar-admin' => 'Alter visibility on the feedback dashboard',
@@ -260,7 +259,6 @@
'moodbar-email-resend-confirmation' => "Button text for resending
confirmation email. This message is used in
{{msg-mw|Moodbar-email-confirm-desc}}, so if you're updating this message,
update that one, too.",
'moodbar-email-optout' => 'Button text for email opt-out',
'moodbar-tooltip-title' => 'Text for title of moodbar tooltip',
- 'moodbar-tooltip-subtitle' => 'Text for subtitle of moodbar tooltip',
'right-moodbar-view' => '{{doc-right|moodbar-view}}',
'right-moodbar-admin' => '{{doc-right|moodbar-admin}}',
'moodbar-header-timestamp' => '{{Identical|Timestamp}}',
Modified: trunk/extensions/MoodBar/MoodBar.php
===================================================================
--- trunk/extensions/MoodBar/MoodBar.php 2011-12-16 00:24:00 UTC (rev
106401)
+++ trunk/extensions/MoodBar/MoodBar.php 2011-12-16 01:04:33 UTC (rev
106402)
@@ -89,10 +89,11 @@
'tooltip-p-moodbar-trigger-share',
'tooltip-p-moodbar-trigger-editing',
),
- 'position' => 'top',
+ 'position' => 'bottom',
'dependencies' => array(
'jquery.cookie',
'jquery.client',
+ 'mediawiki.util'
),
);
@@ -101,12 +102,10 @@
'scripts' => 'ext.moodBar/ext.moodBar.tooltip.js',
'messages' => array(
'moodbar-tooltip-title',
- 'moodbar-tooltip-subtitle',
),
- 'position' => 'top',
+ 'position' => 'bottom',
'dependencies' => array(
'jquery.cookie',
- 'jquery.client',
'ext.moodBar.init',
),
);
Modified: trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.core.js
===================================================================
--- trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.core.js
2011-12-16 00:24:00 UTC (rev 106401)
+++ trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.core.js
2011-12-16 01:04:33 UTC (rev 106402)
@@ -138,7 +138,7 @@
emailOptOut = ($.cookie(
mb.cookiePrefix() + 'emailOptOut' ) == '1');
if( emailOptOut === false) {
- if(userData.email !== "") {
//check for email address
+ if('email' in userData &&
userData.email !== "") { //check for email address
if('emailauthenticated'
in userData) { //they have confirmed
mb.showSuccess();
} else { //show email
confirmation form
@@ -483,18 +483,18 @@
validateFeedback: function() {
var comment = $( '#mw-moodBar-feedbackInput' ).val();
if( $.trim( comment ).length > 0 && comment.length <=
140 && $( '.mw-moodBar-selected').length ) {
- mb.ui.overlay.find(
'.mw-moodBar-formSubmit').removeAttr('disabled');
+ mb.ui.overlay.find(
'.mw-moodBar-formSubmit').prop('disabled', false);
} else {
- mb.ui.overlay.find(
'.mw-moodBar-formSubmit').attr({'disabled':'true'});
+ mb.ui.overlay.find(
'.mw-moodBar-formSubmit').prop('disabled', true);
}
},
validateEmail: function() {
var email = $( '#mw-moodBar-emailInput' ).val();
if( $.trim( email ).length > 0) { //find validate
email method
- mb.ui.overlay.find(
'.mw-moodBar-emailSubmit').removeAttr('disabled');
+ mb.ui.overlay.find(
'.mw-moodBar-emailSubmit').prop('disabled', false);
} else {
- mb.ui.overlay.find(
'.mw-moodBar-emailSubmit').attr({'disabled':'true'});
+ mb.ui.overlay.find(
'.mw-moodBar-emailSubmit').prop('disabled', true);
}
}
Modified: trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.init.js
===================================================================
--- trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.init.js
2011-12-16 00:24:00 UTC (rev 106401)
+++ trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.init.js
2011-12-16 01:04:33 UTC (rev 106402)
@@ -58,14 +58,14 @@
.appendTo( ui.pMoodbar );
// Inject portlet into document, when document is ready
- $( mb.inject );
+ // Send mb.getUserInfo as a callback to be ran after
MoodBar injection
+ $( mb.inject( mb.getUserInfo ) );
- // Assign user props to mb.userData object.
- mb.getUserInfo();
},
- inject: function() {
+ inject: function(getUserInfo) {
$( '#mw-head' ).append( mb.ui.pMoodbar );
+ getUserInfo(); //run the callback
},
getUserInfo: function() {
@@ -75,21 +75,17 @@
uiprop: 'email',
format: 'json'
};
- $(document).ready( function() {
- $.ajax( {
- 'type': 'POST',
- 'url': mw.util.wikiScript( 'api' ),
- 'data': query,
- 'success': function (data) {
- mb.userData =
data.query.userinfo;
- },
- 'error': function( jqXHR, textStatus,
errorThrown ) {
- mb.userData = null;
- },
- 'dataType': 'json'
- } );
- });
-
+ $.ajax( {
+ 'url': mw.util.wikiScript( 'api' ),
+ 'data': query,
+ 'success': function (data) {
+ mb.userData = data.query.userinfo;
+ },
+ 'error': function( jqXHR, textStatus,
errorThrown ) {
+ mb.userData = null;
+ },
+ 'dataType': 'json'
+ } );
}
};
Modified: trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.tooltip.css
===================================================================
--- trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.tooltip.css
2011-12-16 00:24:00 UTC (rev 106401)
+++ trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.tooltip.css
2011-12-16 01:04:33 UTC (rev 106402)
@@ -27,7 +27,6 @@
#moodbar-tooltip-overlay #moodbar-tooltip-title {
font-weight: bold;
font-size: 0.75em;
- margin-bottom: 10px;
}
#moodbar-tooltip-overlay #moodbar-tooltip-subtitle {
Modified: trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.tooltip.js
===================================================================
--- trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.tooltip.js
2011-12-16 00:24:00 UTC (rev 106401)
+++ trunk/extensions/MoodBar/modules/ext.moodBar/ext.moodBar.tooltip.js
2011-12-16 01:04:33 UTC (rev 106402)
@@ -39,9 +39,10 @@
.append(
$('<div>').attr('id',
'moodbar-tooltip-pointy')
).append(
- $('<div>').attr('id',
'moodbar-tooltip-title').text( mw.msg( 'moodbar-tooltip-title' ) )
- ).append(
- $('<div>').attr('id',
'moodbar-tooltip-subtitle').text( mw.msg( 'moodbar-tooltip-subtitle' ) )
+ $('<div>').attr('id',
'moodbar-tooltip-title')
+ .text( mw.msg(
'moodbar-tooltip-title' )
+ .replace( new
RegExp( $.escapeRE('{{SITENAME}}'), 'g' ), mw.config.get( 'wgSiteName' ) )
+ )
)
);
Modified:
trunk/extensions/MoodBar/modules/ext.moodBar.dashboard/ext.moodBar.dashboard.js
===================================================================
---
trunk/extensions/MoodBar/modules/ext.moodBar.dashboard/ext.moodBar.dashboard.js
2011-12-16 00:24:00 UTC (rev 106401)
+++
trunk/extensions/MoodBar/modules/ext.moodBar.dashboard/ext.moodBar.dashboard.js
2011-12-16 01:04:33 UTC (rev 106402)
@@ -33,9 +33,7 @@
* Select all comment type filters.
*/
function selectAllTypes() {
- $( '#fbd-filters-type-praise, #fbd-filters-type-confusion,
#fbd-filters-type-issues' ).each( function() {
- $(this).prop( 'checked', true);
- });
+ $( '#fbd-filters-type-praise, #fbd-filters-type-confusion,
#fbd-filters-type-issues' ).prop( 'checked', true);
}
/**
* Set the moodbar-feedback-types and moodbar-feedback-username cookies
based on formState.
@@ -546,9 +544,9 @@
function validateResponse($item) {
var response = $.trim( $item.find('.fbd-response-text').val()
);
if( response.length > 0 && response.length <= 5000 ) {
- $item.find( '.fbd-response-submit,
.fbd-response-preview').removeAttr('disabled');
+ $item.find( '.fbd-response-submit,
.fbd-response-preview').prop('disabled', false);
} else {
- $item.find( '.fbd-response-submit,
.fbd-response-preview').attr({'disabled':'true'});
+ $item.find( '.fbd-response-submit,
.fbd-response-preview').prop('disabled', true);
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
