Bug 1346797 - Fix calendar eslint issues - "Fix" no-unsanitized/property issues. r=MakeMyDay
MozReview-Commit-ID: HDo96MGoKsC
--- a/calendar/base/content/dialogs/calendar-print-dialog.js
+++ b/calendar/base/content/dialogs/calendar-print-dialog.js
@@ -232,16 +232,17 @@ function refreshHtml(finishFunc) {
} finally {
convStream.close();
}
} catch (e) {
Components.utils.reportError("Calendar print dialog:refreshHtml: " + e);
}
let iframeDoc = document.getElementById("content").contentDocument;
+ // eslint-disable-next-line no-unsanitized/property
iframeDoc.documentElement.innerHTML = html;
iframeDoc.title = settings.title;
if (finishFunc) {
finishFunc();
}
}
);
--- a/calendar/lightning/modules/ltnInvitationUtils.jsm
+++ b/calendar/lightning/modules/ltnInvitationUtils.jsm
@@ -105,20 +105,22 @@ ltn.invitation = {
// we convert special characters first to not mix up html conversion
let mode = Components.interfaces.mozITXTToHTMLConv.kEntities;
let contentText = linkConverter.scanTXT(aContentText, mode);
try {
// kGlyphSubstitution may lead to unexpected results when used in scanHTML
mode = Components.interfaces.mozITXTToHTMLConv.kStructPhrase +
Components.interfaces.mozITXTToHTMLConv.kGlyphSubstitution +
Components.interfaces.mozITXTToHTMLConv.kURLs;
+ // eslint-disable-next-line no-unsanitized/property
content.innerHTML = linkConverter.scanHTML(contentText, mode);
} catch (e) {
mode = Components.interfaces.mozITXTToHTMLConv.kStructPhrase +
Components.interfaces.mozITXTToHTMLConv.kURLs;
+ // eslint-disable-next-line no-unsanitized/property
content.innerHTML = linkConverter.scanHTML(contentText, mode);
}
} else {
content.textContent = aContentText;
}
}
};