http://www.mediawiki.org/wiki/Special:Code/MediaWiki/68841
Revision: 68841 Author: catrope Date: 2010-07-01 17:53:40 +0000 (Thu, 01 Jul 2010) Log Message: ----------- UsabilityInitiative: (bug 24208) "undefinedundefinedundefined" shown in special characters. Caused by a combination of user scripts adding stuff to Array.prototype and a bad for loop Modified Paths: -------------- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js trunk/extensions/UsabilityInitiative/js/plugins.combined.js trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php =================================================================== --- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php 2010-07-01 17:52:33 UTC (rev 68840) +++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php 2010-07-01 17:53:40 UTC (rev 68841) @@ -69,7 +69,7 @@ array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 36 ), array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 195 ), array( 'src' => 'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 53 ), - array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 70 ), + array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 71 ), array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 28 ), array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 98 ), array( 'src' => 'js/plugins/jquery.wikiEditor.preview.js', 'version' => 12 ), @@ -82,10 +82,10 @@ array( 'src' => 'js/thirdparty/contentCollector.js', 'version' => 2 ), ), 'combined' => array( - array( 'src' => 'js/plugins.combined.js', 'version' => 445 ), + array( 'src' => 'js/plugins.combined.js', 'version' => 446 ), ), 'minified' => array( - array( 'src' => 'js/plugins.combined.min.js', 'version' => 455 ), + array( 'src' => 'js/plugins.combined.min.js', 'version' => 456 ), ), ), ); Modified: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js =================================================================== --- trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js 2010-07-01 17:52:33 UTC (rev 68840) +++ trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js 2010-07-01 17:53:40 UTC (rev 68841) @@ -497,8 +497,8 @@ } if ( 'characters' in page ) { var html = ''; - for ( character in page.characters ) { - html += $.wikiEditor.modules.toolbar.fn.buildCharacter( page.characters[character], actions ); + for ( var i = 0; i < page.characters.length; i++ ) { + html += $.wikiEditor.modules.toolbar.fn.buildCharacter( page.characters[i], actions ); } $characters .html( html ) Modified: trunk/extensions/UsabilityInitiative/js/plugins.combined.js =================================================================== --- trunk/extensions/UsabilityInitiative/js/plugins.combined.js 2010-07-01 17:52:33 UTC (rev 68840) +++ trunk/extensions/UsabilityInitiative/js/plugins.combined.js 2010-07-01 17:53:40 UTC (rev 68841) @@ -6671,8 +6671,8 @@ } if ( 'characters' in page ) { var html = ''; - for ( character in page.characters ) { - html += $.wikiEditor.modules.toolbar.fn.buildCharacter( page.characters[character], actions ); + for ( var i = 0; i < page.characters.length; i++ ) { + html += $.wikiEditor.modules.toolbar.fn.buildCharacter( page.characters[i], actions ); } $characters .html( html ) Modified: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js =================================================================== --- trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js 2010-07-01 17:52:33 UTC (rev 68840) +++ trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js 2010-07-01 17:53:40 UTC (rev 68841) @@ -449,7 +449,7 @@ if('rows'in page){for(row in page.rows){html+=$.wikiEditor.modules.toolbar.fn.buildRow(context,page.rows[row])}} $page.html(html);break;case'characters':$page.addClass('page-characters');$characters=$('<div />').data('context',context).data('actions',{});var actions=$characters.data('actions');if('language'in page){$characters.attr('lang',page.language);} if('direction'in page){$characters.attr('dir',page.direction);} -if('characters'in page){var html='';for(character in page.characters){html+=$.wikiEditor.modules.toolbar.fn.buildCharacter(page.characters[character],actions);} +if('characters'in page){var html='';for(var i=0;i<page.characters.length;i++){html+=$.wikiEditor.modules.toolbar.fn.buildCharacter(page.characters[i],actions);} $characters.html(html).children().mousedown(function(e){context.fn.saveStuffForIE();e.preventDefault();return false;}).click(function(e){$.wikiEditor.modules.toolbar.fn.doAction($(this).parent().data('context'),$(this).parent().data('actions')[$(this).attr('rel')],$(this));e.preventDefault();return false;});} $page.append($characters);break;} return $page;},buildHeading:function(context,headings){var html='<tr>';for(heading in headings){html+='<th>'+$.wikiEditor.autoMsg(headings[heading],['html','text'])+'</th>';} _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs