http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84530
Revision: 84530
Author: catrope
Date: 2011-03-22 14:42:59 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
1.17wmf1: MFT r84474, r84529
Modified Paths:
--------------
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.css
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.js
Modified:
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.css
===================================================================
---
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.css
2011-03-22 14:38:20 UTC (rev 84529)
+++
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.css
2011-03-22 14:42:59 UTC (rev 84530)
@@ -23,6 +23,7 @@
display: none;
position: absolute;
top: 0;
+ bottom: 0;
left: 0;
right: 0;
background-color: #f9f9f9;
Modified:
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.js
===================================================================
---
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.js
2011-03-22 14:38:20 UTC (rev 84529)
+++
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.js
2011-03-22 14:42:59 UTC (rev 84530)
@@ -33,9 +33,11 @@
<button class="articleFeedback-submit
articleFeedback-visibleWith-form" type="submit" disabled><html:msg
key="form-panel-submit" /></button>\
<div class="articleFeedback-success
articleFeedback-visibleWith-form"><span><html:msg key="form-panel-success"
/></span></div>\
<div style="clear:both;"></div>\
- <div class="articleFeedback-expiry
articleFeedback-visibleWith-form">\
- <div class="articleFeedback-expiry-title"><html:msg
key="form-panel-expiry-title" /></div>\
- <div class="articleFeedback-expiry-message"><html:msg
key="form-panel-expiry-message" /></div>\
+ <div class="articleFeedback-notices
articleFeedback-visibleWith-form">\
+ <div class="articleFeedback-expiry">\
+ <div
class="articleFeedback-expiry-title"><html:msg key="form-panel-expiry-title"
/></div>\
+ <div
class="articleFeedback-expiry-message"><html:msg
key="form-panel-expiry-message" /></div>\
+ </div>\
</div>\
</div>\
<div class="articleFeedback-error"><div
class="articleFeedback-error-message"><html:msg key="error" /></div></div>\
@@ -142,8 +144,14 @@
} ),
'success': function( data ) {
var context = this;
- $.articleFeedback.fn.load.call( context
);
- context.$ui.find(
'.articleFeedback-lock' ).hide();
+ if ( 'error' in data ) {
+ mw.log( 'Form submission error'
);
+ mw.log( data.error );
+ context.$ui.find(
'.articleFeedback-error' ).show();
+ } else {
+ $.articleFeedback.fn.load.call(
context );
+ context.$ui.find(
'.articleFeedback-lock' ).hide();
+ }
},
'error': function() {
var context = this;
@@ -596,7 +604,7 @@
var context = $(this).data( 'articleFeedback-context' );
if ( !context ) {
// Create context
- context = { '$ui': $(this), 'options': { 'ratings': {},
'pitches': {}, 'bucket': 0 } };
+ context = { '$ui': $(this), 'options': { 'ratings': {},
'pitches': {}, 'bucket': 1 } };
// Allow customization through an options argument
if ( typeof args[0] === 'object' ) {
context = $.extend( true, context, { 'options':
args[0] } );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
