Merge branch 'release/2.2.2'

Author: richard67

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,9 @@
+<!--
 Please check:
 
 - [ ] Your pull request has a meaningful title.
 - [ ] The description explains the changes proposed by the pull request and why you believe they are necessary.
 - [ ] Relevant issues and pull requests are mentioned.
 - [ ] The pull request contains documentation in README.md/README-de.md if necessary.
 - [ ] You did not include any build artifacts.
-
-Delete this list before submitting. Pull requests containing the list or failing to check all points will be rejected.
+-->

.travis.yml

@@ -14,6 +14,10 @@ env:
   global:
     - BASE_NAME=shariff-plus-$TRAVIS_TAG
 
+cache:
+  directories:
+    - node_modules
+
 script:
   - npm run test
 
@@ -35,7 +39,7 @@ deploy:
   - provider: npm
     email: richard.fath@t-online.de
     api_key:
-      secure: "T1G1Qoi4TT7opqhDwXiP17m21zVJJuTOU3/JkUGbN5gbaM9fW/Hil8yQpHE5CHLtkA7W8I+NMG3vaL6+Mp9cqoO1tP1THppR19bP7FR9r7t1Oi+9NHNrQk8G1oZaOeAHYdD3BPUT58f1VkwwEb/QLlzLV4IUwZjdHg4r7wTjc9tDRphfm3wbVKIo9A3+L6DpTiO0sAT4xeQsKKSvdwpOlM+tt/ruifr7slSmuq9kpmjwYLMxxi0xW0sDkTSDqXcdfITiWaQ+x/2D/0yLkSlyh3J+BUruB91V5tGSZv5LzSBv9nPVU1sZzmHYwYfAPjae3d26QGFPjPpsE7E8uAaobgACNKoqlACu0IvusfTBBB46D9l/eU3DTefVBMmxaV7v+nEAuNVWdQj2rLOmwLXuOB4p9bUhEQlP/vy5PrmN0VoWlAzebuGyfUQp0CcNRbeQ2DCgXGIBXXBqq452O2jcN38FYQ/uszl8Rts4jDluHlFHk7evkcHuG7vu2mDxol/L6L34nHCSDD/u6p59XTgvqKA0IGzmYXI53WPmb4wIZ3zULSe2hTEKtfKcM5K1QgojqapVo6Zf8EwPWkfm0Ox5PXvk2q5HFESWDhFCU3mVOZ884YSqIm8NE19jGUCrj6aHPA/wr1jNAiRIcdVrdIYKcp/Vv6j5EVyv4RvPt+OOUBE="
+      secure: "GT4YyWJ3/FwdkeRsy52o32GyvKUYTy1TSWKXLTBrhskZ/eNSzwz+VrDJzY+oKyb4+IWw1GOJT7jXVME5UVOH72VhVCVWnbRQL4bIJQun2SjkcEeUBHDgIvtNHD5aDbFWfM5in8Upywqw1ic5QkkzlHoKChaud6p3ZGGB/7euxfojjFPN8l2mqcQi4anels0n2y2mNFo9uzTSRHAXnB8JzPs7KVRcTZsI9Vv7WXidkeOAblPUaxqMiGpYwbEcc8OOLC6f4/HLameoa10oOZWEXNqC2OYabPd39zZS43LuM1RBYXk4b58eJdG/REyg+uXx+a7FmVk7kmeIkFpBUQjEeAOJDkL9NXfCVSd+1zJYXXonV0xss7ab3dWgiZDguZcsU96zgNQ2+vMprRUm3hJ7tjlh9sXp2R34yvIo2TpfRPgYYg5TqEbQgGaY+mnTPhUcbHSDmh8/ATy+kbIi9uNYk3kY18UaS8OBttIh9bN+SmP0HLeGvYFvtghOAeKBQI64GABDsnWHdf4VLGE7QfHzoc7Zyr7v67acLo82MiPRmCZFo50WSJfkiqro4m8jfjMDf2+4a3ifP8zfCX/8AtzUfPamrNQXZGZkBs3OynttDZYNPTOVwdevqLXIJKTceTMAzT4v7OxjxzXAkr2UYOHxB2RNq/TFxbrtRKngiZx6VFY="
     skip_cleanup: true
     on:
       repo: richard67/shariff-plus

CHANGELOG.md

@@ -1,5 +1,66 @@
 # Changelog
 
+## v2.2.2, 2021-06-13
+
+Fetched from [heiseonline/shariff](https://github.com/heiseonline/shariff):
+
+- Remove LinkedIn share count from backend.json ([heiseonline#365](https://github.com/heiseonline/shariff/pull/365)).
+
+Fetched open pull requests from [heiseonline/shariff](https://github.com/heiseonline/shariff):
+
+- Updated WhatsApp URL to WhatsApp Web ([heiseonline#381](https://github.com/heiseonline/shariff/pull/381)).
+- Updated LinkedIn URL to 2020 Version ([heiseonline#382](https://github.com/heiseonline/shariff/pull/382)).
+- Updated max. text length for Twitter ([heiseonline#401](https://github.com/heiseonline/shariff/pull/401)).
+
+Other changes:
+
+- Open WhatsApp link in new tab (see [heiseonline#381 (comment)](https://github.com/heiseonline/shariff/pull/381#issuecomment-761708915))
+- Update iframe code for the Facebook Like button ([#21](https://github.com/richard67/shariff-plus/pull/21)).
+- Updated dependencies.
+
+## v2.2.1, 2019-05-27
+
+Fetched from [heiseonline/shariff](https://github.com/heiseonline/shariff):
+
+- Added translations for French, Italian, Polish, Russian and Dutch to print service ([heiseonline#362](https://github.com/heiseonline/shariff/pull/362)).
+- Updated dependencies.
+
+## v2.2.0, 2019-04-01
+
+- Add allow="encrypted-media" to iframe code of FB Like button in FacebookLike dialog ([#20](https://github.com/richard67/shariff-plus/pull/20)).
+
+Fetched from [heiseonline/shariff](https://github.com/heiseonline/shariff):
+
+- Added buffer service ([heiseonline#361](https://github.com/heiseonline/shariff/pull/361)).
+- Updated dependencies.
+- Updated Font Awesome to version 5.8.1 ([heiseonline#360](https://github.com/heiseonline/shariff/pull/360)).
+- Updated Xing share URL ([heiseonline#354](https://github.com/heiseonline/shariff/pull/354)).
+
+## v2.1.1, 2019-01-29
+
+Fixed deployment to npmjs.com.
+
+## v2.1.0, 2019-01-29
+
+Fetched from [heiseonline/shariff](https://github.com/heiseonline/shariff):
+
+- Improved build process ([heiseonline#326](https://github.com/heiseonline/shariff/pull/326)).
+- Fixed creator being appended to title even though data-title has been set ([heiseonline#328](https://github.com/heiseonline/shariff/pull/328)).
+- Replaced third party Java backend in readme ([heiseonline#332](https://github.com/heiseonline/shariff/pull/332)).
+- Name is diaspora* and not Diaspora ([heiseonline#342](https://github.com/heiseonline/shariff/pull/342)).
+- Fixed canonical URL handling ([heiseonline#345](https://github.com/heiseonline/shariff/pull/345)).
+- Removed googleplus service ([heiseonline#348](https://github.com/heiseonline/shariff/pull/348)).
+- Added Pocket service ([heiseonline#349](https://github.com/heiseonline/shariff/pull/349)).
+- Fixed typo in README ([heiseonline#350](https://github.com/heiseonline/shariff/pull/350)).
+- Upgraded dependencies.
+
+Note that the Google+ service has been removed due to the shutdown of Google+.
+See [https://developers.google.com/+/integrations-shutdown](https://developers.google.com/+/integrations-shutdown)
+and [https://developers.google.com/+/web/+1button/](https://developers.google.com/+/web/+1button/):
+> Google+ APIs will be shut down on March 7, 2019. This includes Google+ Sign-in. Learn more.
+> Google+ integrations for web and mobile apps will also cease to function March 7, 2019. Learn more.
+> This will be a progressive shutdown, with intermittent failures starting as early as January 28, 2019.
+
 ## v2.0.2, 2018-04-17
 
 Fetched from [heiseonline/shariff](https://github.com/heiseonline/shariff):

README-de.md

@@ -4,7 +4,7 @@ Um die Privatsphäre ihrer Besucher gegenüber den Social-Media-Netzwerken zu be
 
 Shariff-Plus ist identisch mit [Shariff von Heise Medien](https://github.com/heiseonline/shariff) plus Erweiterungen wie die Anzeige des Facebook-Buttons "Gefällt mir" in einem Dialog, welche nicht für die Integration in Shariff vorgesehen sind, oder andere Erweiterungen und Korrekturen für Shariff, die (noch) nicht in Shariff integriert wurden.
 
-Der Code der offiziellen Buttons von Facebook, Google+ und Twitter überträgt von jedem Besucher kennzeichnende Daten an die Social-Media-Netzwerke. Shariff-Plus erzeugt hingegen Buttons, die mit einem Klick die Dialoge zum Teilen oder Vergeben von "Gefällt mir" bei Facebook anzeigen, die Anzahl der Likes für die aktuelle Seite anzeigen und trotzdem keine unnötigen Daten übertragen.
+Der Code der offiziellen Buttons beispielsweise von Facebook überträgt von jedem Besucher kennzeichnende Daten an die Social-Media-Netzwerke. Shariff-Plus erzeugt hingegen Buttons, die mit einem Klick die Dialoge zum Teilen oder Vergeben von "Gefällt mir" bei Facebook anzeigen, die Anzahl der Likes für die aktuelle Seite anzeigen und trotzdem keine unnötigen Daten übertragen.
 
 **Shariff** `(/ˈʃɛɹɪf/)` ist ein Open-Source Projekt von c't und heise online.
 
@@ -106,7 +106,7 @@ Unterschiede zu Shariff sind mit (1), (2) usw. markiert und werden unterhalb der
 | `data-media-url` | Zu teilendes Bild (pinterest) | `null` |
 | `data-orientation` | Anordnung der Buttons. Verfügbar: `horizontal`, `vertical` | `horizontal`  |
 | `data-referrer-track` | Wenn angegeben, wird dieser String an die geteilte URL angehängt. Mit `null` deaktivieren. | `null` |
-| `data-services` (3)   | Liste der Services, die verwendet werden sollen. Für die Verwendung im `data`-Attribut muss die Angabe Entity-enkodiert werden. Die Reihenfolge wird berücksichtigt. Beispiel: `data-services="[&quot;facebook&quot;,&quot;googleplus&quot;]"` <br> Verfügbare Dienste: `twitter`, `facebook`, `facebooklike`, `googleplus`, `linkedin`, `pinterest`, `xing`, `whatsapp`, `mail`, `info`, `addthis`, `tumblr`, `flattr`, `diaspora`, `reddit`, `stumbleupon`, `threema`, `weibo`, `tencent-weibo`, `qzone`, `print`, `telegram`, `vk`, `flipboard`  | `twitter`, `facebooklike`, `facebook`, `googleplus`, `info` |
+| `data-services` (3)   | Liste der Services, die verwendet werden sollen. Für die Verwendung im `data`-Attribut muss die Angabe Entity-enkodiert werden. Die Reihenfolge wird berücksichtigt. Beispiel: `data-services="[&quot;facebook&quot;,&quot;twitter&quot;]"` <br> Verfügbare Dienste: `twitter`, `facebook`, `facebooklike`, `linkedin`, `pinterest`, `xing`, `whatsapp`, `mail`, `info`, `addthis`, `tumblr`, `flattr`, `diaspora`, `reddit`, `stumbleupon`, `threema`, `weibo`, `tencent-weibo`, `qzone`, `print`, `telegram`, `vk`, `flipboard`, `pocket`, `buffer`  | `twitter`, `facebooklike`, `facebook`, `info` |
 | `data-theme`       | Farbschema auswählen. Verfügbar: `standard`, `grey` und `white`. | `standard` |
 | `data-title`       | Titel der zu teilenden Seite. | Entweder `DC.title`/`DC.creator` oder `<title>` |
 | `data-twitter-via` | User von dem der Tweet ursprünglich stammt. | `null` |
@@ -147,14 +147,15 @@ Die jeweils aktuell letzten und vorletzten Versionen von Firefox, Google Chrome,
 Shariff-Plus unterstützt folgende Social-Sharing-Services:
 
 - AddThis
+- buffer
 - diaspora*
 - facebook
 - Flattr
 - Flipboard
-- Google+
 - LinkedIn
 - Mail
 - Pinterest
+- Pocket
 - Print
 - Qzone
 - reddit
@@ -183,10 +184,14 @@ Wenn in den Shariff-Buttons die Share-Counts angezeigt werden sollen, wird das f
 
 Drittanbieter-Backends:
 
-* [shariff-backend-java](http://github.com/headissue/shariff-backend-java)
+* [shariff-backend-java](https://github.com/shred/shariff-backend-java)
 
 Die URL, unter der das Backend erreichbar ist, muss im `data`-Attribut `data-backend-url` angegeben werden. Ein Backend unter der URL `http://example.com/my-shariff-backend/` wird in `data-backend-url` so angegeben: `/my-shariff-backend/`. Den Rest erledigt das Skript.
 
 ## Drittanbieter-Integrationen
 
 Es gibt noch keine Shariff-Plus-Integrationen in Drittanbieter-Software.
+
+Wenn Sie eine solche Integration erstellt haben, z.B. eine Integration von Shariff-Plus in Ihr Lieblings-CMS, erstellen Sie bitte einen Pull-Request auf GitHub, um Ihre Integration hier aufzulisten, oder senden Sie mir über das Kontaktformular auf meiner Homepage eine E-Mail mit den Details.
+
+Ein guter Startpunkt zum Erstellen einer Shariff-Plus-Integration ist, eine vorhandene Integration von Original Shariff zu nehmen und darin vorhandene Dateien von oder Referenzen auf Shariff durch solche von Shariff-Plus zu ersetzen.

README.md

@@ -4,7 +4,7 @@ Shariff-Plus enables website users to share and like their favorite content with
 
 It is equal to [Shariff by Heise Medien](https://github.com/heiseonline/shariff) plus extensions like showing the Facebook "Like" button in a dialog, which is not intended to be ever included into Shariff, or other enhancements or corrections which have not been integrated into Shariff (yet).
 
-Facebook, Google+ and Twitter supply official code snippets for their buttons which quietly siphon personal data from all page visitors. Shariff-Plus enables visitors to see how popular your page is on Facebook and share your content with others without needless data leaks.
+Some social service providers like e.g. Facebook supply official code snippets for their buttons which quietly siphon personal data from all page visitors. Shariff-Plus enables visitors to see how popular your page is on Facebook and share your content with others without needless data leaks.
 
 **Shariff** `(/ˈʃɛɹɪf/)` is an open-source, low-maintenance, high-privacy solution maintained by German computer magazine c't and heise online.
 
@@ -106,7 +106,7 @@ Differences to Shariff are marked with (1), (2) and so on and explained below th
 | `data-media-url` | Media url to be shared (pinterest) | `null` |
 | `data-orientation` | `vertical` will stack the buttons vertically. | `horizontal`  |
 | `data-referrer-track` | A string that will be appended to the share url. Can be disabled using `null`. | `null` |
-| `data-services` (3)   | An entity-encoded JSON string containing an array of service names to be enabled. Example: `data-services="["facebook","googleplus"]"` Available service names: `twitter`, `facebook`, `facebooklike`, `googleplus`, `linkedin`, `pinterest`, `xing`, `whatsapp`, `mail`, `info`, `addthis`, `tumblr`, `flattr`, `diaspora`, `reddit`, `stumbleupon`, `threema`, `weibo`, `tencent-weibo`, `qzone`, `print`, `telegram`, `vk`, `flipboard` | `twitter`, `facebooklike`, `facebook`, `googleplus`, `info` |
+| `data-services` (3)   | An entity-encoded JSON string containing an array of service names to be enabled. Example: `data-services="["facebook","twitter"]"` Available service names: `twitter`, `facebook`, `facebooklike`, `linkedin`, `pinterest`, `xing`, `whatsapp`, `mail`, `info`, `addthis`, `tumblr`, `flattr`, `diaspora`, `reddit`, `stumbleupon`, `threema`, `weibo`, `tencent-weibo`, `qzone`, `print`, `telegram`, `vk`, `flipboard`, `pocket`, `buffer` | `twitter`, `facebooklike`, `facebook`, `info` |
 | `data-theme`       | We include 3 color schemes, `standard`, `grey` and `white`. | `standard` |
 | `data-title`       | Title to be used as share text in Twitter/Whatsapp | page's `DC.title`/`DC.creator` or `<title>` |
 | `data-twitter-via` | Screen name of the user to attribute the Tweet to | `null` |
@@ -148,14 +148,15 @@ The current and previous major releases of Firefox, Google Chrome, Internet Expl
 Shariff-Plus supports the following social sharing services:
 
 - AddThis
+- buffer
 - diaspora*
 - facebook
 - Flattr
 - Flipboard
-- Google+
 - LinkedIn
 - Mail
 - Pinterest
+- Pocket
 - Print
 - Qzone
 - reddit
@@ -184,10 +185,14 @@ In order to display share counts with Shariff, you need the following backend:
 
 Third-party backends:
 
-* [shariff-backend-java](http://github.com/headissue/shariff-backend-java)
+* [shariff-backend-java](https://github.com/shred/shariff-backend-java)
 
 Once you have one of these backends up and running, insert its URL into the `data-backend-url` attribute. For example, if the backend runs under `http://example.com/my-shariff-backend/`, the `data-backend-url` should be `/my-shariff-backend/`. The script will handle the rest.
 
 ## Third-party integrations
 
 There are no third-party integrations of Shariff-Plus yet.
+
+If you have created such an integration, e.g. an integration of Shariff-Plus into your favourite CMS, create a pull request on GitHub to let your integration be listed here, or send me an email with the details using the contact form on my homepage.
+
+A good starting point for creating a third-party integrations of Shariff-Plus is to use an existing third-party integration of the original Shariff and then replace files from or references to Shariff by the same for Shariff-Plus.

demo/backend.json

@@ -1 +1 @@
-{"facebook":906,"linkedin":92,"reddit":12,"stumbleupon":4325,"vk":57,"xing":185}
+{"buffer":123,"facebook":906,"reddit":12,"stumbleupon":4325,"vk":57,"xing":185}

demo/custom-initialization.html

@@ -20,7 +20,7 @@
 // Set custom options in constructor
 new Shariff(createDiv(), {
     theme: "grey",
-    services: ["twitter", "googleplus"],
+    services: ["twitter", "facebook"],
     infoUrl: "http://www.example.com"
 });
 </script>