Nischayn22 has uploaded a new change for review. https://gerrit.wikimedia.org/r/161807
Change subject: Remove usage of innerHTML ...................................................................... Remove usage of innerHTML As per https://bugzilla.wikimedia.org/show_bug.cgi?id=69798#c1 removed usage of innerHTML Change-Id: I9f9624c6adea59b1eee54c0c62855ecb175c4753 --- M modules/ext.inlinediff.js 1 file changed, 20 insertions(+), 28 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RecentActivityFeed refs/changes/07/161807/1 diff --git a/modules/ext.inlinediff.js b/modules/ext.inlinediff.js index 6ccb086..58648c9 100644 --- a/modules/ext.inlinediff.js +++ b/modules/ext.inlinediff.js @@ -25,34 +25,28 @@ findString = 'a:contains("diff")'; } - var regex; - - if (mw.config.get('wgCanonicalSpecialPageName') == "Contributions") { - regex = /&oldid=(\d+)$/; - - } else { - regex = /&diff=(\d+)&oldid=/; - } + var regex = /&diff=(\d+)&oldid=/; var diffLink = $(element).find(findString); + if (diffLink.length > 0 && !(/(\.js|\.css)&/.test(diffLink[0].href))) { var regexResult = regex.exec(diffLink[0].href); if (regexResult != null && regexResult.length >= 2) { var diffID = regexResult[1]; var inlineDiffButton; if (typeof inlineDiffBigUI === "undefined") { - inlineDiffButton = document.createElement("a"); - inlineDiffButton.href = "#"; - inlineDiffButton.innerHTML = '<b><span style="color:black;"> [</span><span style="color:#339900;">' + inspectText + '</span><span style="color:black;">] </span></b>'; + inlineDiffButton = $('<a>') + .attr('href', '#') + .html('<b><span style="color:black;"> [</span><span style="color:#339900;">' + inspectText + '</span><span style="color:black;">] </span></b>'); } else { - inlineDiffButton = document.createElement("input"); - inlineDiffButton.type = "button"; - inlineDiffButton.value = "Inspect edit"; + inlineDiffButton = $('input') + .attr('type', 'button') + .value('inspect edit'); } - inlineDiffButton.id = diffID; - $(inlineDiffButton).click(function() { - return inspectWatchlistDiff(this); - }); - $(element).find('.comment').append(inlineDiffButton); + inlineDiffButton.attr( 'id', diffID) + .click(function() { + return inspectWatchlistDiff(this); + }); + $(element).find('br').before(inlineDiffButton); } } } @@ -61,7 +55,7 @@ var entries = $("#mw-content-text table.mw-enhanced-rc"); - if (entries.length == 0) { + if ( entries.length == 0 ) { $(".mw-changeslist").each(function(ind, el) { $(el).children("div").each(inspectionEachHelper); }); @@ -84,7 +78,6 @@ diffRequestLocked = "f"; return false; } - var diffString = response.query.pages[Object.keys(response.query.pages)[0]].revisions[0].diff["*"]; if (diffString == null) { @@ -93,17 +86,16 @@ return false; } - var newTable = document.createElement("table"); - newTable.className = "diff"; - $(newTable).html('<colgroup><col class="diff-marker"><col class="diff-content"><col class="diff-marker"><col class="diff-content"></colgroup>'); - - $(newTable).append(diffString); + var newTable = $('<table>') + .attr('class', "diff") + .html('<colgroup><col class="diff-marker"><col class="diff-content"><col class="diff-marker"><col class="diff-content"></colgroup>') + .append(diffString); if ($("#" + button.id).parent("td").length > 0 && !($("#" + button.id).parent("td").hasClass("mw-enhanced-rc-nested"))) { $("#" + button.id).parents("table.mw-enhanced-rc:first").after(newTable); } else { - $(newTable).insertAfter("#" + button.id); + newTable.insertAfter("#" + button.id); } - newTable.id = button.id + "display"; + newTable.attr('id', button.id + "display"); $(button).unbind("click"); if (typeof inlineDiffBigUI === "undefined") { -- To view, visit https://gerrit.wikimedia.org/r/161807 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f9624c6adea59b1eee54c0c62855ecb175c4753 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RecentActivityFeed Gerrit-Branch: master Gerrit-Owner: Nischayn22 <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
