supersonic
/
Midora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass target element

This commit is contained in:
shinigami-eyes 2020-04-13 07:39:05 +00:00
parent 9cc6ad54a1
commit e3b659843c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extension/content.ts
View File

@ -570,7 +570,7 @@ function getSnippet(node: HTMLElement) {
return null; return null;
} }
function getBadIdentifierReason(identifier: string, url: string) { function getBadIdentifierReason(identifier: string, url: string, target: HTMLElement) {
identifier = identifier || ''; identifier = identifier || '';
url = url || ''; url = url || '';
if (url) { if (url) {
@ -597,7 +597,7 @@ function getBadIdentifierReason(identifier: string, url: string) {
var previousConfirmationMessage: HTMLElement = null; var previousConfirmationMessage: HTMLElement = null;
function displayConfirmation(identifier: string, label: LabelKind, badIdentifierReason: BadIdentifierReason, url: string) { function displayConfirmation(identifier: string, label: LabelKind, badIdentifierReason: BadIdentifierReason, url: string, target: HTMLElement) {
if (previousConfirmationMessage) { if (previousConfirmationMessage) {
previousConfirmationMessage.remove(); previousConfirmationMessage.remove();
previousConfirmationMessage = null; previousConfirmationMessage = null;
@ -614,7 +614,7 @@ function displayConfirmation(identifier: string, label: LabelKind, badIdentifier
let text: string; let text: string;
if (label == 'bad-identifier') { if (label == 'bad-identifier') {
const displayReason = getBadIdentifierReason(identifier, url); const displayReason = getBadIdentifierReason(identifier, url, target);
if (displayReason) text = displayReason; if (displayReason) text = displayReason;
else if (badIdentifierReason == 'SN') text = 'This social network is not supported: ' + identifier + '.'; else if (badIdentifierReason == 'SN') text = 'This social network is not supported: ' + identifier + '.';
else if (badIdentifierReason == 'AR') text = 'This is an archival link, it cannot be labeled: ' + identifier; else if (badIdentifierReason == 'AR') text = 'This is an archival link, it cannot be labeled: ' + identifier;
@ -647,7 +647,7 @@ function displayConfirmation(identifier: string, label: LabelKind, badIdentifier
browser.runtime.onMessage.addListener<ShinigamiEyesMessage, ShinigamiEyesSubmission>((message, sender, sendResponse) => { browser.runtime.onMessage.addListener<ShinigamiEyesMessage, ShinigamiEyesSubmission>((message, sender, sendResponse) => {
if (message.updateAllLabels || message.confirmSetLabel) { if (message.updateAllLabels || message.confirmSetLabel) {
displayConfirmation(message.confirmSetIdentifier, message.confirmSetLabel, message.badIdentifierReason, message.confirmSetUrl); displayConfirmation(message.confirmSetIdentifier, message.confirmSetLabel, message.badIdentifierReason, message.confirmSetUrl, null);
updateAllLabels(true); updateAllLabels(true);
return; return;
} }
@ -664,7 +664,7 @@ browser.runtime.onMessage.addListener<ShinigamiEyesMessage, ShinigamiEyesSubmiss
var identifier = target ? getIdentifier(<HTMLAnchorElement>target) : getIdentifier(message.url); var identifier = target ? getIdentifier(<HTMLAnchorElement>target) : getIdentifier(message.url);
if (!identifier) { if (!identifier) {
displayConfirmation(null, 'bad-identifier', null, message.url); displayConfirmation(null, 'bad-identifier', null, message.url, target);
return; return;
} }