Skip to content

Commit

Permalink
Merge pull request #8 from vaeth/master
Browse files Browse the repository at this point in the history
Actualización desde el repositorio padre.
  • Loading branch information
juaalta authored Jan 1, 2018
2 parents 2e46e8b + 7a9f69c commit dbad375
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 21 deletions.
9 changes: 9 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# ChangeLog for squashmount

*bookmarkdupes-4.2:
Martin Väth <martin at mvath.de>:
- Add an options page with a link as an alternative way to open the
extension. This is mainly meant as a workaround for
https://github.com/vaeth/bookmarkdupes/issues/38

Juan Salvador Aleixandre Talens:
- Update es locales

*bookmarkdupes-4.1:
Martin Väth <martin at mvath.de>:
- Add buttons for marking from identical folders in the same group
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ A WebExtension which can display/remove duplicate bookmarks, empty folders, or d

After installing bookmarkdupes, the usage is rather simple:

Click on bookmardupes' symbol (duplicate stars) and then
select in the new tab what you want to display:
To open bookmarkdupes, click the extension symbol (duplicate stars) or
use the link in the options page of the extension.
Then select what you want to display:

1. Bookmark duplicates (exact)
2. Bookmark duplicates (similar)
Expand Down Expand Up @@ -50,8 +51,9 @@ the corresponding bookmarks to their previous location in the bookmark menu!
https://github.com/vaeth/bookmarkdupes/issues/11 and the second part of
https://github.com/vaeth/bookmarkdupes/issues/8
4. In some firefox versions (e.g. 55.0.3) it has been reported that pressing
the duplicate stars does not open a new tab. For a discussion of this
problem and of possible workarounds, see
the duplicate stars does not open a new tab. You can try to use the link
in the options page of the extension instead if you have this problem.
The reason for the problem is still unknown, see
https://github.com/vaeth/bookmarkdupes/issues/38

## Contributions
Expand Down
28 changes: 14 additions & 14 deletions _locales/es/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"description": "Name of the non-folder. It might indicate that buttons for markings appear if another name is selected."
},
"optionSameFolder": {
"message": "-- Carpetas idénticas en el mismo grupo --", // new
"message": "-- Carpetas idénticas en el mismo grupo --",
"description": "Name of a special folder selection: Identical folders in the same group"
},
"titleSelectFolder": {
Expand Down Expand Up @@ -156,51 +156,51 @@
"description": "Explain that in groups with selected folder all bookmarks from that folder will be marked and all others unmarked; if there are no others, the newest is unmarked"
},
"buttonMarkSame": {
"message": "Marcar todas las carpetas idénticas en el mismo grupo", // new
"message": "Marcar todas las carpetas idénticas en el mismo grupo",
"description": "Button for marking all of the same folders in the same group"
},
"titleButtonMarkSame": {
"message": "Marcar todos los marcadores de carpetas idénticas en el mismo grupo.", // new
"message": "Marcar todos los marcadores de carpetas idénticas en el mismo grupo.",
"description": "Explain that all bookmarks of identical folders in the same group will be marked"
},
"buttonUnmarkSame": {
"message": "Desmarcar todas las carpetas idénticas en el mismo grupo", // new
"message": "Desmarcar todas las carpetas idénticas en el mismo grupo",
"description": "Button for unmarking all of the same folders in the same group"
},
"titleButtonUnmarkSame": {
"message": "Desmarcar todos los marcadores de carpetas idénticas en el mismo grupo.", // new
"message": "Desmarcar todos los marcadores de carpetas idénticas en el mismo grupo.",
"description": "Explain that all bookmarks of identical folders in the same group will be unmarked"
},
"buttonMarkSameButFirst": {
"message": "Marcar todo, pero el primero de las carpetas idénticas en un mismo grupo", // new
"message": "Marcar todo, pero el primero de las carpetas idénticas en un mismo grupo",
"description": "Button for marking all but the first of identical folders in the same group"
},
"titleButtonMarkSameButFirst": {
"message": "Además, el primero de las carpetas idénticas en el mismo grupo se desmarcará.", // new
"message": "Además, el primero de las carpetas idénticas en el mismo grupo se desmarcará.",
"description": "Explain that additionally for identical folders in the same group the first will be unmarked"
},
"buttonMarkSameButLast": {
"message": "Marcar todo, pero el último de las carpetas idénticas en un mismo grupo", // new
"message": "Marcar todo, pero el último de las carpetas idénticas en un mismo grupo",
"description": "Button for marking all but the last of identical folders in the same group"
},
"titleButtonMarkSameButLast": {
"message": "Además, el último de las carpetas idénticas en el mismo grupo se desmarcará.", // new
"message": "Además, el último de las carpetas idénticas en el mismo grupo se desmarcará.",
"description": "Explain that additionally for identical folders in the same group the last will be unmarked"
},
"buttonMarkSameButOldest": {
"message": "Marcar todo menos el más viejo de carpetas idénticas en el mismo grupo", // new
"message": "Marcar todo menos el más viejo de carpetas idénticas en el mismo grupo",
"description": "Button for marking all but the oldest of identical folders in the same group"
},
"titleButtonMarkSameButOldest": {
"message": "Adicionalmente, el más viejo de carpetas idénticas en el mismo grupo se desmarcará.", // new
"message": "Adicionalmente, el más viejo de carpetas idénticas en el mismo grupo se desmarcará.",
"description": "Explain that additionally for identical folders in the same group the oldest will be unmarked"
},
"buttonMarkSameButNewest": {
"message": "Marcar todo menos el más nuevo de carpetas idénticas en el mismo grupo", // new
"message": "Marcar todo menos el más nuevo de carpetas idénticas en el mismo grupo",
"description": "Button for marking all but the newest of identical folders in the same group"
},
"titleButtonMarkSameButNewest": {
"message": "Adicionalmente, el más nuevo de carpetas idénticas en el mismo grupo se desmarcará.", // new
"message": "Adicionalmente, el más nuevo de carpetas idénticas en el mismo grupo se desmarcará.",
"description": "Explain that additionally for identical folders in the same group the newest will be unmarked"
},
"buttonRemoveMarked": {
Expand Down Expand Up @@ -246,7 +246,7 @@
}
},
"messageNoCount": {
"message": "El número de marcadores seleccionados no mostrado por razones de velocidad", // new
"message": "El número de marcadores seleccionados no mostrado por razones de velocidad",
"description": "Report that marks are not counted for speed reasons"
},
"messageExactMatchesGroups": {
Expand Down
11 changes: 11 additions & 0 deletions data/options/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title id="pageTitle">Bookmark Dupes</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<p id="linkToTab"></p>
<script src="options.js"></script>
</body>
</html>
31 changes: 31 additions & 0 deletions data/options/options.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/* Copyright (C) 2017 Nartin Väth <martin@mvath.de>
* This project is under the GNU public license 2.0
*/

function setTitle(title) {
document.getElementById("pageTitle").textContent = title;
}

function getLinkToTab() {
return document.getElementById("linkToTab");
}

function createLink(title) {
const parent = getLinkToTab();
if (parent.hasChildNodes()) { // Already done
return;
}
const link = document.createElement("A");
const url = browser.extension.getURL("data/tab/index.html")
link.href = url;
link.target = "_blank";
link.textContent = title;
link.referrerpolicy = "no-referrer";
parent.appendChild(link);
}

{
const title = browser.i18n.getMessage("extensionName");
setTitle(title);
createLink(title);
}
2 changes: 1 addition & 1 deletion data/tab/dupes.js
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ function addBookmark(bookmark, folders, id) {
link.href = url;
link.target = "_blank";
link.textContent = name;
link.referrerpolicy = 'no-referrer';
link.referrerpolicy = "no-referrer";
col.appendChild(link);
if (id) {
col.id = id;
Expand Down
9 changes: 7 additions & 2 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"short_name": "bookmarkdupes",
"description": "__MSG_extensionDescription__",
"author": "Martin Väth",
"version": "4.1",
"version": "4.2",
"manifest_version": 2,
"homepage_url": "https://github.com/vaeth/bookmarkdupes.git",
"homepage_url": "https://addons.mozilla.org/en-US/firefox/addon/bookmark-dupes/",
"default_locale": "en",

"permissions": [
Expand All @@ -25,6 +25,11 @@
}
},

"options_ui": {
"page": "data/options/index.html",
"browser_style": true
},

"icons": {
"48": "data/icons/48.png"
},
Expand Down

0 comments on commit dbad375

Please sign in to comment.