Skip to content
This repository has been archived by the owner on Apr 23, 2024. It is now read-only.

EXT-166-Firefox #5

Merged
merged 1 commit into from
Nov 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions _locales/fr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
"message" : "fr_fr"
},
"name" : {
"message" : "Qwant",
"description" : "Nom de l'extension"
"message" : "Qwant"
},
"description" : {
"message" : "L'extension Qwant définit qwant.com comme votre moteur de recherche et page d'accueil par défaut.",
"description" : "Description de l'extension"
"message" : "L'extension Qwant définit qwant.com comme votre moteur de recherche et page d'accueil par défaut."
}
}
1 change: 1 addition & 0 deletions html/background.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<meta charset="UTF-8" />
</head>
<body>
<script src="../lib/i18n.js"></script>
<script src="../lib/qwant.js"></script>
</body>
</html>
48 changes: 16 additions & 32 deletions lib/qwant.js
Original file line number Diff line number Diff line change
@@ -1,38 +1,22 @@
"use strict";
var manifest = browser.runtime.getManifest();
var manifest = chrome.runtime.getManifest();
var browser = chrome;

browser.webRequest.onBeforeRequest.addListener(function(details) {
if (!details.url.match(/webext=true/)) {
return {
redirectUrl: details.url.replace('client=brz-moz', 'client=ext-firefox') + '&webext=' + manifest.version
};
}

return {};
}, {
urls: ["https://www.qwant.com/?*client=brz-moz*q=*", "https://www.qwant.com/?*q=*client=brz-moz*"],
types: ["main_frame"]
}, ["blocking"]);
chrome.runtime.onInstalled.addListener(function (details) {

browser.runtime.setUninstallURL('https://www.qwant.com/extension/feedback?v=' + manifest.version);

browser.contextMenus.create({
title : 'Search Qwant for "%s"',
contexts: ["selection"],
onclick : function (info) {
var queryText = info.selectionText;
browser.tabs.create({
url: "https://www.qwant.com/?q=" + queryText + "&client=ext-firefox-cm"
});
if (details.reason === "install") {
chrome.tabs.query({active: true}, (tabsArray) => {
if (tabsArray.length > 0 && tabsArray[0].hasOwnProperty('url') && tabsArray[0].url.match(/^https:\/\/www.qwant\.com.*/) !== null) {
chrome.tabs.executeScript({
code: "document.querySelector('.extension__chrome__overlay__instructions').style.display = 'none';document.querySelector('.extension__overlay__thanks').style.display = 'block';"
});
}
chrome.tabs.create({
url: "https://www.qwant.com/extension/thanks",
active: false
});
})
}
});

browser.runtime.onMessage.addListener((message, sender, callback) => {
switch (message.name) {
case 'uninstall':
browser.management.uninstallSelf({
showConfirmDialog: true
}).then(null, null);
break;
}
});
chrome.runtime.setUninstallURL('https://www.qwant.com/extension/feedback?v=' + manifest.version);
12 changes: 5 additions & 7 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
"48": "img/icon48.png",
"128": "img/icon128.png"
},
"browser_action": {
"browser_style": true,
"default_icon": "img/icon48.png",
"default_title": "__MSG_name__"
},
"background": {
"page": "html/background.html"
},
Expand All @@ -23,14 +28,7 @@
"is_default": true
}
},
"omnibox": {
"keyword": "q"
},
"permissions": [
"contextMenus",
"tabs",
"webRequest",
"webRequestBlocking",
"https://*.qwant.com/*"
],
"content_scripts": [
Expand Down