https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112462
Revision: 112462
Author: tstarling
Date: 2012-02-27 00:56:41 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
(bug 34538) Fixed compatibility with $wgResourceLoaderExperimentalAsyncLoading
in extensions N-Z. Followup from r111989 where I did A-M. Untested.
Modified Paths:
--------------
trunk/extensions/PageSchemas/PageSchemas.js
trunk/extensions/RecordAdmin/recordadmin.js
trunk/extensions/SignupAPI/includes/verification.js
trunk/extensions/Translate/resources/ext.translate.special.languagestats.js
trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.init.js
Modified: trunk/extensions/PageSchemas/PageSchemas.js
===================================================================
--- trunk/extensions/PageSchemas/PageSchemas.js 2012-02-27 00:51:49 UTC (rev
112461)
+++ trunk/extensions/PageSchemas/PageSchemas.js 2012-02-27 00:56:41 UTC (rev
112462)
@@ -6,8 +6,8 @@
*/
-var fieldNum = jQuery('.fieldBox:visible').length;
-var templateNum = jQuery('.templateBox:visible').length;
+var fieldNum;
+var templateNum;
jQuery.fn.editSchemaMakeTemplateDeleter = function() {
jQuery(this).click( function() {
@@ -80,6 +80,9 @@
}
jQuery(document).ready(function() {
+ fieldNum = jQuery('.fieldBox:visible').length;
+ templateNum = jQuery('.templateBox:visible').length;
+
// Add and delete buttons
jQuery(".deleteTemplate").editSchemaMakeTemplateDeleter();
jQuery(".editSchemaAddTemplate").editSchemaMakeTemplateAdder();
Modified: trunk/extensions/RecordAdmin/recordadmin.js
===================================================================
--- trunk/extensions/RecordAdmin/recordadmin.js 2012-02-27 00:51:49 UTC (rev
112461)
+++ trunk/extensions/RecordAdmin/recordadmin.js 2012-02-27 00:56:41 UTC (rev
112462)
@@ -22,4 +22,6 @@
}
}
};
-jQuery( '#editform' ).submit( raRecordForms );
+jQuery( document ).ready( function( $ ) {
+ $( '#editform' ).submit( raRecordForms );
+} );
Modified: trunk/extensions/SignupAPI/includes/verification.js
===================================================================
--- trunk/extensions/SignupAPI/includes/verification.js 2012-02-27 00:51:49 UTC
(rev 112461)
+++ trunk/extensions/SignupAPI/includes/verification.js 2012-02-27 00:56:41 UTC
(rev 112462)
@@ -1,78 +1,81 @@
//setup verification fields on the form
-function validateInput( fieldtype,fieldid ) {
- var inputVal = document.getElementById(fieldid).value;
- var valresult = document.getElementById(fieldid+'val');
- $.ajax({
- type: "POST",
- url: mw.util.wikiScript('api'),
- data: {'action':'validatesignup', 'format':'json',
'field':fieldtype, 'inputVal':inputVal },
- dataType: 'json',
- success: function( jsondata ){
- var image = "<img src='"+ imagePath +
jsondata.signup.icon +"'>";
- var message = jsondata.signup.result;
- valresult.innerHTML = image+message;
- }
- });
-}
+jQuery( document ).ready( function( $ ) {
-function passwordStrength() {
- var strength = document.getElementById('wpPassword2val');
- var strongRegex = new
RegExp("^(?=.{8,})(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*\\W).*$", "g");
- var mediumRegex = new
RegExp("^(?=.{7,})(((?=.*[A-Z])(?=.*[a-z]))|((?=.*[A-Z])(?=.*[0-9]))|((?=.*[a-z])(?=.*[0-9]))).*$",
"g");
- var enoughRegex = new RegExp("(?=.{6,}).*", "g");
- var pwd = document.getElementById("wpPassword2");
+ function validateInput( fieldtype,fieldid ) {
+ var inputVal = document.getElementById(fieldid).value;
+ var valresult = document.getElementById(fieldid+'val');
+ $.ajax({
+ type: "POST",
+ url: mw.util.wikiScript('api'),
+ data: {'action':'validatesignup', 'format':'json',
'field':fieldtype, 'inputVal':inputVal },
+ dataType: 'json',
+ success: function( jsondata ){
+ var image = "<img src='"+ imagePath +
jsondata.signup.icon +"'>";
+ var message = jsondata.signup.result;
+ valresult.innerHTML = image+message;
+ }
+ });
+ }
- if (pwd.value.length==0) {
- strength.innerHTML = mw.message( 'signupapi-enterpassword' );
- } else if (pwd.value.length<minlength) {
- strength.innerHTML = mw.message( 'signupapi-passwordtooshort',
minlength );
- $("#progress").progressbar({value: 10});
- $("div.ui-progressbar-value").css("background","red");
- } else if (strongRegex.test(pwd.value)) {
- strength.innerHTML = '<span style="color:green">'+mw.message(
'signupapi-strong' )+'</span>';
- $("#progress").progressbar({value: 100});
- $("div.ui-progressbar-value").css("background","green");
- } else if (mediumRegex.test(pwd.value)) {
- strength.innerHTML = '<span style="color:orange">'+mw.message(
'signupapi-medium' )+'</span>';
- $("#progress").progressbar({value: 60});
- $("div.ui-progressbar-value").css("background","orange");
- } else {
- strength.innerHTML = '<span style="color:red">'+mw.message(
'signupapi-weak' )+'</span>';
- $("#progress").progressbar({value: 30});
- $("div.ui-progressbar-value").css("background","red");
+ function passwordStrength() {
+ var strength = document.getElementById('wpPassword2val');
+ var strongRegex = new
RegExp("^(?=.{8,})(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*\\W).*$", "g");
+ var mediumRegex = new
RegExp("^(?=.{7,})(((?=.*[A-Z])(?=.*[a-z]))|((?=.*[A-Z])(?=.*[0-9]))|((?=.*[a-z])(?=.*[0-9]))).*$",
"g");
+ var enoughRegex = new RegExp("(?=.{6,}).*", "g");
+ var pwd = document.getElementById("wpPassword2");
+
+ if (pwd.value.length==0) {
+ strength.innerHTML = mw.message(
'signupapi-enterpassword' );
+ } else if (pwd.value.length<minlength) {
+ strength.innerHTML = mw.message(
'signupapi-passwordtooshort', minlength );
+ $("#progress").progressbar({value: 10});
+ $("div.ui-progressbar-value").css("background","red");
+ } else if (strongRegex.test(pwd.value)) {
+ strength.innerHTML = '<span
style="color:green">'+mw.message( 'signupapi-strong' )+'</span>';
+ $("#progress").progressbar({value: 100});
+ $("div.ui-progressbar-value").css("background","green");
+ } else if (mediumRegex.test(pwd.value)) {
+ strength.innerHTML = '<span
style="color:orange">'+mw.message( 'signupapi-medium' )+'</span>';
+ $("#progress").progressbar({value: 60});
+
$("div.ui-progressbar-value").css("background","orange");
+ } else {
+ strength.innerHTML = '<span
style="color:red">'+mw.message( 'signupapi-weak' )+'</span>';
+ $("#progress").progressbar({value: 30});
+ $("div.ui-progressbar-value").css("background","red");
+ }
}
-}
-function checkRetype( pass,retype ) {
- var valresult = document.getElementById('wpRetypeval');
- var image = "";
- var message = "";
- if ( pass==retype ) {
- image = "<img src='"+ imagePath +"MW-Icon-CheckMark.png'>";
- message = mw.message( 'signupapi-passwordsmatch' );
- }else {
- image = "<img src='"+ imagePath +"MW-Icon-NoMark.png'>";
- message = mw.message( 'signupapi-badretype' );
+ function checkRetype( pass,retype ) {
+ var valresult = document.getElementById('wpRetypeval');
+ var image = "";
+ var message = "";
+ if ( pass==retype ) {
+ image = "<img src='"+ imagePath
+"MW-Icon-CheckMark.png'>";
+ message = mw.message( 'signupapi-passwordsmatch' );
+ }else {
+ image = "<img src='"+ imagePath +"MW-Icon-NoMark.png'>";
+ message = mw.message( 'signupapi-badretype' );
+ }
+ valresult.innerHTML = image+message;
}
- valresult.innerHTML = image+message;
-}
-$('#wpName2').change(function() {validateInput("username","wpName2");});
-$('#wpPassword2').keyup(function() {passwordStrength();});
-$('#wpRetype').change(function()
{checkRetype(document.getElementById("wpPassword2").value,document.getElementById("wpRetype").value);});
-$('#wpEmail').change(function() {validateInput( "email","wpEmail" );});
+ $('#wpName2').change(function() {validateInput("username","wpName2");});
+ $('#wpPassword2').keyup(function() {passwordStrength();});
+ $('#wpRetype').change(function()
{checkRetype(document.getElementById("wpPassword2").value,document.getElementById("wpRetype").value);});
+ $('#wpEmail').change(function() {validateInput( "email","wpEmail" );});
-$('#wpName2').after('<span id="wpName2val" class="wpName2val"></span>');
-$('#wpPassword2').after('<span id="wpPassword2val"></span><div id="progress"
class="progress" style="width:30%; float: right;"></div>');
-$('#wpRetype').after('<span id="wpRetypeval" class="wpRetypeval"></span>');
-$('#wpEmail').after('<span id="wpEmailval" class="wpEmailval"></span>');
+ $('#wpName2').after('<span id="wpName2val" class="wpName2val"></span>');
+ $('#wpPassword2').after('<span id="wpPassword2val"></span><div
id="progress" class="progress" style="width:30%; float: right;"></div>');
+ $('#wpRetype').after('<span id="wpRetypeval"
class="wpRetypeval"></span>');
+ $('#wpEmail').after('<span id="wpEmailval" class="wpEmailval"></span>');
-$("#progress").progressbar();
-console.log();
-$('div.ui-progressbar').css('background','#F2F5F7');
+ $("#progress").progressbar();
+ console.log();
+ $('div.ui-progressbar').css('background','#F2F5F7');
-var imagePath = window.wgServer+window.wgExtensionAssetsPath +
"/SignupAPI/includes/images/";
-var minlength = window.wgMinimalPasswordLength;
+ var imagePath = window.wgServer+window.wgExtensionAssetsPath +
"/SignupAPI/includes/images/";
+ var minlength = window.wgMinimalPasswordLength;
+} );
Modified:
trunk/extensions/Translate/resources/ext.translate.special.languagestats.js
===================================================================
--- trunk/extensions/Translate/resources/ext.translate.special.languagestats.js
2012-02-27 00:51:49 UTC (rev 112461)
+++ trunk/extensions/Translate/resources/ext.translate.special.languagestats.js
2012-02-27 00:56:41 UTC (rev 112462)
@@ -73,17 +73,19 @@
// When hovering a row, adjust brightness of the last two custom-colored cells
as well
// See also translate.langstats.css for the highlighting for the other normal
rows
mw.loader.using( 'jquery.colorUtil' , function() {
- $( '.mw-sp-translate-table.wikitable tr' ).hover( function() {
- $( '> td.hover-color', this )
- // 30% more brightness
- .css( 'background-color', function( i, val ) {
- return $.colorUtil.getColorBrightness( val, +0.3 );
+ jQuery( document ).ready( function( $ ) {
+ $( '.mw-sp-translate-table.wikitable tr' ).hover( function() {
+ $( '> td.hover-color', this )
+ // 30% more brightness
+ .css( 'background-color', function( i, val ) {
+ return $.colorUtil.getColorBrightness( val,
+0.3 );
+ } );
+ }, function() {
+ $( '> td.hover-color', this )
+ // 30% less brightness
+ .css( 'background-color', function( i, val ) {
+ return $.colorUtil.getColorBrightness( val,
-0.3 );
+ } );
} );
- }, function() {
- $( '> td.hover-color', this )
- // 30% less brightness
- .css( 'background-color', function( i, val ) {
- return $.colorUtil.getColorBrightness( val, -0.3 );
- } );
} );
} );
Modified: trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.init.js
===================================================================
--- trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.init.js
2012-02-27 00:51:49 UTC (rev 112461)
+++ trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.init.js
2012-02-27 00:56:41 UTC (rev 112462)
@@ -1 +1,5 @@
-mw.loader.using( 'ext.wikiLove.local', jQuery.wikiLove.init );
+mw.loader.using( 'ext.wikiLove.local', function() {
+ jQuery( document ).ready( function() {
+ jQuery.wikiLove.init();
+ } );
+} );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
