| Index: branches/wmf/1.18wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js |
| — | — | @@ -564,7 +564,7 @@ |
| 565 | 565 | $block.find( '.articleFeedbackv5-tags ul' ).each( function () { |
| 566 | 566 | var info = $.articleFeedbackv5.currentBucket().tagInfo; |
| 567 | 567 | var tabIndex = 1; |
| 568 | | - for ( var i in info ) { |
| | 568 | + for ( var i = 0; i < info.length; i++ ) { |
| 569 | 569 | var key = info[i]; |
| 570 | 570 | var comm_def_msg = 'articlefeedbackv5-bucket2-' + key + '-comment-default'; |
| 571 | 571 | $.articleFeedbackv5.currentBucket().commentDefault[key] = mw.msg( comm_def_msg ); |
| — | — | @@ -1316,7 +1316,7 @@ |
| 1317 | 1317 | // Add the ratings from the options |
| 1318 | 1318 | $block.find( '.articleFeedbackv5-ratings' ).each( function () { |
| 1319 | 1319 | var info = $.articleFeedbackv5.currentBucket().ratingInfo; |
| 1320 | | - for ( var i in info ) { |
| | 1320 | + for ( var i = 0; i < info.length; i++ ) { |
| 1321 | 1321 | var key = info[i]; |
| 1322 | 1322 | var tip_msg = 'articlefeedbackv5-bucket5-' + key + '-tip'; |
| 1323 | 1323 | var label_msg = 'articlefeedbackv5-bucket5-' + key + '-label'; |
| — | — | @@ -1721,7 +1721,7 @@ |
| 1722 | 1722 | getFormData: function () { |
| 1723 | 1723 | var data = {}; |
| 1724 | 1724 | var info = $.articleFeedbackv5.currentBucket().ratingInfo; |
| 1725 | | - for ( var i in info ) { |
| | 1725 | + for ( var i = 0; i < info.length; i++ ) { |
| 1726 | 1726 | var key = info[i]; |
| 1727 | 1727 | data[key] = $.articleFeedbackv5.find( 'input[name="' + key + '"]' ).val(); |
| 1728 | 1728 | } |
| Index: branches/wmf/1.18wmf1/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.startup.js |
| — | — | @@ -62,16 +62,16 @@ |
| 63 | 63 | }; |
| 64 | 64 | |
| 65 | 65 | var enable = false; |
| 66 | | - for( var cat in categories['current'] ) { |
| | 66 | + for( var i = 0; i < categories['current'].length; i++ ) { |
| 67 | 67 | // Categories are configured with underscores, but article's categories are returned with |
| 68 | 68 | // spaces instead. Revert to underscores here for sane comparison. |
| 69 | | - categories['current'][cat] = categories['current'][cat].replace(/\s/gi, '_'); |
| | 69 | + categories['current'][i] = categories['current'][i].replace(/\s/gi, '_'); |
| 70 | 70 | // Check exclusion - exclusion overrides everything else |
| 71 | | - if( $.inArray( categories['current'][cat], categories.exclude ) > -1 ) { |
| | 71 | + if( $.inArray( categories['current'][i], categories.exclude ) > -1 ) { |
| 72 | 72 | // Blacklist overrides everything else |
| 73 | 73 | return; |
| 74 | 74 | } |
| 75 | | - if( $.inArray( categories['current'][cat], categories.include ) > -1 ) { |
| | 75 | + if( $.inArray( categories['current'][i], categories.include ) > -1 ) { |
| 76 | 76 | // One match is enough for include, however we are iterating on the 'current' |
| 77 | 77 | // categories, and others might be blacklisted - so continue iterating |
| 78 | 78 | enable = true; |
| Property changes on: branches/wmf/1.18wmf1/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 79 | 79 | Merged /trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5.php:r106695-106698 |
| Property changes on: branches/wmf/1.18wmf1/extensions/ArticleFeedbackv5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 80 | 80 | Merged /trunk/extensions/ArticleFeedbackv5:r106695-106698 |