ReadLaterByEmail/webextensions
1
1
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

🐛 Use the right module to make i18n works with all browsers

Browse Source
This commit is contained in:
Clement Desmidt 2018-10-15 22:47:37 +02:00
parent a2dea62830
commit ca9c43ecda
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/scripts/contentscript.js
View File

@ -7,6 +7,7 @@ var extractTags = () => {
var data = { var data = {
title: "", title: "",
description: "", description: "",
image: "",
url: document.location.href url: document.location.href
}; };
@ -17,11 +18,21 @@ var extractTags = () => {
data.title = document.title data.title = document.title
} }
var descriptionTag = document.querySelector("meta[property='og:description']") || document.querySelector("meta[name='description']") var descriptionTag = document.querySelector("meta[property='og:description']") || document.querySelector("meta[name='description']");
if(descriptionTag) { if(descriptionTag) {
data.description = descriptionTag.getAttribute("content") data.description = descriptionTag.getAttribute("content")
} }
var imgTag = document.querySelector("meta[property='og:image']") || document.querySelector("meta[property='twitter-image']");
if(imgTag) {
data.image = imgTag.getAttribute("content")
} else {
imgTag = document.querySelector("link[rel=icon]") || document.querySelector("link[rel=apple-touch-icon]");
if (imgTag) {
data.image = imgTag.getAttribute("href");
}
}
return data; return data;
}; };

8
src/scripts/options.js
View File

@ -6,7 +6,7 @@ var tokenInput = document.querySelector("[name=token]");
var message = document.getElementById("msg"); var message = document.getElementById("msg");
storage.get('url', function(resp) { storage.get('url', function(resp) {
urlInput.value = resp.url || "https://bookmarklet.shikiryu.com"; urlInput.value = resp.url || "https://app.readlater.shikiryu.com";
}); });
storage.get('token', function(resp) { storage.get('token', function(resp) {
@ -16,17 +16,17 @@ storage.get('token', function(resp) {
urlInput.addEventListener("blur", function(e) { urlInput.addEventListener("blur", function(e) {
var value = this.value; var value = this.value;
storage.set({ url: value }, function() { storage.set({ url: value }, function() {
message.innerHTML = browser.i18n.getMessage("URLChanged"); message.innerHTML = ext.browser.i18n.getMessage("URLChanged");
}); });
}); });
tokenInput.addEventListener("blur", function(e) { tokenInput.addEventListener("blur", function(e) {
var value = this.value; var value = this.value;
storage.set({ token: value }, function() { storage.set({ token: value }, function() {
message.innerHTML = browser.i18n.getMessage("tokenSaved"); message.innerHTML = ext.browser.i18n.getMessage("tokenSaved");
}); });
}); });
document.querySelectorAll("[data-message]").forEach(function(elt) { document.querySelectorAll("[data-message]").forEach(function(elt) {
elt.innerHTML = browser.i18n.getMessage(elt.dataset.message); elt.innerHTML = ext.browser.i18n.getMessage(elt.dataset.message);
}); });

16
src/scripts/popup.js
View File

@ -4,6 +4,8 @@ import storage from "./utils/storage";
var page_data = { var page_data = {
title: "", title: "",
description: "", description: "",
image: "",
comment: "",
url: document.location.href url: document.location.href
}; };
@ -20,6 +22,11 @@ var template = (data) => {
<div class="site-description"> <div class="site-description">
<h3 class="title">${data.title}</h3> <h3 class="title">${data.title}</h3>
<p class="description">${data.description}</p> <p class="description">${data.description}</p>
<p class="image"><img src="${data.image}"></p>
<div>
<label for="comment">Comment:</label>
<textarea id="comment" name="comment"></textarea>
</div>
<a href="${data.url}" target="_blank" class="url">${data.url}</a> <a href="${data.url}" target="_blank" class="url">${data.url}</a>
</div> </div>
<div class="action-container"> <div class="action-container">
@ -38,7 +45,7 @@ var renderBookmark = (data) => {
page_data = data; page_data = data;
displayContainer.innerHTML = template(data); displayContainer.innerHTML = template(data);
} else { } else {
renderMessage(browser.i18n.getMessage("cantExtractTitle")); renderMessage(ext.browser.i18n.getMessage("cantExtractTitle"));
} }
}; };
@ -50,12 +57,13 @@ ext.tabs.query({active: true, currentWindow: true}, function(tabs) {
popup.addEventListener("click", function(e) { popup.addEventListener("click", function(e) {
if(e.target && e.target.matches("#save-btn")) { if(e.target && e.target.matches("#save-btn")) {
e.preventDefault(); e.preventDefault();
page_data.comment = document.getElementById("comment").innerText;
// var data = e.target.getAttribute("data-bookmark"); // var data = e.target.getAttribute("data-bookmark");
ext.runtime.sendMessage({action: "perform-save", data: page_data}, function (response) { ext.runtime.sendMessage({action: "perform-save", data: page_data}, function (response) {
if (response && response.action === "saved") { if (response && response.action === "saved") {
renderMessage(browser.i18n.getMessage("savedSuccessfully")); renderMessage(ext.browser.i18n.getMessage("savedSuccessfully"));
} else { } else {
renderMessage(browser.i18n.getMessage("unknownError")); renderMessage(ext.browser.i18n.getMessage("unknownError"));
} }
}); });
} }
@ -64,7 +72,7 @@ popup.addEventListener("click", function(e) {
var dataMessages = document.querySelectorAll("[data-message]"); var dataMessages = document.querySelectorAll("[data-message]");
[].forEach.call(dataMessages, function(elt) { [].forEach.call(dataMessages, function(elt) {
console.log(elt.dataset.message); console.log(elt.dataset.message);
elt.innerHTML = browser.i18n.getMessage(elt.dataset.message); elt.innerHTML = ext.browser.i18n.getMessage(elt.dataset.message);
}); });
var optionsLink = document.querySelector(".js-options"); var optionsLink = document.querySelector(".js-options");