From c9b84518a00ed57be8fe3e82866975dc73d41da9 Mon Sep 17 00:00:00 2001 From: pmb Date: Fri, 3 Nov 2017 13:50:36 +0100 Subject: [PATCH 01/22] use babel-preset-env --- .babelrc | 2 +- package-lock.json | 377 +++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- 3 files changed, 338 insertions(+), 43 deletions(-) diff --git a/.babelrc b/.babelrc index c13c5f62..002b4aa0 100644 --- a/.babelrc +++ b/.babelrc @@ -1,3 +1,3 @@ { - "presets": ["es2015"] + "presets": ["env"] } diff --git a/package-lock.json b/package-lock.json index f66c20cf..8b9d5f17 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "shariff", - "version": "2.0.1", + "version": "2.0.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -485,6 +485,17 @@ } } }, + "babel-helper-builder-binary-assignment-operator-visitor": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", + "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", + "dev": true, + "requires": { + "babel-helper-explode-assignable-expression": "6.24.1", + "babel-runtime": "6.23.0", + "babel-types": "6.25.0" + } + }, "babel-helper-call-delegate": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", @@ -498,15 +509,56 @@ } }, "babel-helper-define-map": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz", - "integrity": "sha1-epdH8ljYlH0y1RX2qhx70CIEoIA=", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz", + "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", "dev": true, "requires": { "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.23.0", - "babel-types": "6.25.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", "lodash": "4.17.4" + }, + "dependencies": { + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "2.4.1", + "regenerator-runtime": "0.11.0" + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "regenerator-runtime": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz", + "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==", + "dev": true + } + } + }, + "babel-helper-explode-assignable-expression": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", + "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", + "dev": true, + "requires": { + "babel-runtime": "6.23.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0" } }, "babel-helper-function-name": { @@ -553,14 +605,57 @@ } }, "babel-helper-regex": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", + "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.4" + }, + "dependencies": { + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "2.4.1", + "regenerator-runtime": "0.11.0" + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "regenerator-runtime": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz", + "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==", + "dev": true + } + } + }, + "babel-helper-remap-async-to-generator": { "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz", - "integrity": "sha1-024i+rEAjXnYhkjjIRaGgShFbOg=", + "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", + "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { + "babel-helper-function-name": "6.24.1", "babel-runtime": "6.23.0", - "babel-types": "6.25.0", - "lodash": "4.17.4" + "babel-template": "6.25.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0" } }, "babel-helper-replace-supers": { @@ -616,6 +711,35 @@ "babel-runtime": "6.23.0" } }, + "babel-plugin-syntax-async-functions": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", + "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", + "dev": true + }, + "babel-plugin-syntax-exponentiation-operator": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", + "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", + "dev": true + }, + "babel-plugin-syntax-trailing-function-commas": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", + "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", + "dev": true + }, + "babel-plugin-transform-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", + "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", + "dev": true, + "requires": { + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-functions": "6.13.0", + "babel-runtime": "6.23.0" + } + }, "babel-plugin-transform-es2015-arrow-functions": { "version": "6.22.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", @@ -635,16 +759,93 @@ } }, "babel-plugin-transform-es2015-block-scoping": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz", - "integrity": "sha1-dsKV3DpHQbFmWt/TFnIV3P8ypXY=", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz", + "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", "dev": true, "requires": { - "babel-runtime": "6.23.0", - "babel-template": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", "lodash": "4.17.4" + }, + "dependencies": { + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "2.4.1", + "regenerator-runtime": "0.11.0" + } + }, + "babel-template": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" + } + }, + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.8", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.4" + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "dev": true + }, + "regenerator-runtime": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz", + "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==", + "dev": true + } } }, "babel-plugin-transform-es2015-classes": { @@ -653,7 +854,7 @@ "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", "dev": true, "requires": { - "babel-helper-define-map": "6.24.1", + "babel-helper-define-map": "6.26.0", "babel-helper-function-name": "6.24.1", "babel-helper-optimise-call-expression": "6.24.1", "babel-helper-replace-supers": "6.24.1", @@ -728,21 +929,98 @@ "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", "dev": true, "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "6.26.0", "babel-runtime": "6.23.0", "babel-template": "6.25.0" } }, "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz", - "integrity": "sha1-0+MQtA72ZKNmIiAAl8bUQCmPK/4=", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz", + "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=", "dev": true, "requires": { "babel-plugin-transform-strict-mode": "6.24.1", - "babel-runtime": "6.23.0", - "babel-template": "6.25.0", - "babel-types": "6.25.0" + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-types": "6.26.0" + }, + "dependencies": { + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "2.4.1", + "regenerator-runtime": "0.11.0" + } + }, + "babel-template": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" + } + }, + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.8", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.4" + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "dev": true + }, + "regenerator-runtime": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz", + "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==", + "dev": true + } } }, "babel-plugin-transform-es2015-modules-systemjs": { @@ -816,7 +1094,7 @@ "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "dev": true, "requires": { - "babel-helper-regex": "6.24.1", + "babel-helper-regex": "6.26.0", "babel-runtime": "6.23.0", "babel-types": "6.25.0" } @@ -845,18 +1123,29 @@ "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "dev": true, "requires": { - "babel-helper-regex": "6.24.1", + "babel-helper-regex": "6.26.0", "babel-runtime": "6.23.0", "regexpu-core": "2.0.0" } }, - "babel-plugin-transform-regenerator": { + "babel-plugin-transform-exponentiation-operator": { "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz", - "integrity": "sha1-uNowWtQ8PJm0hI5P5AN7dw0jxBg=", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", + "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", + "dev": true, + "requires": { + "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", + "babel-plugin-syntax-exponentiation-operator": "6.13.0", + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-regenerator": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz", + "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", "dev": true, "requires": { - "regenerator-transform": "0.9.11" + "regenerator-transform": "0.10.1" } }, "babel-plugin-transform-strict-mode": { @@ -906,16 +1195,18 @@ } } }, - "babel-preset-es2015": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz", - "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=", + "babel-preset-env": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.1.tgz", + "integrity": "sha512-W6VIyA6Ch9ePMI7VptNn2wBM6dbG0eSz25HEiL40nQXCsXGTGZSTZu1Iap+cj3Q0S5a7T9+529l/5Bkvd+afNA==", "dev": true, "requires": { "babel-plugin-check-es2015-constants": "6.22.0", + "babel-plugin-syntax-trailing-function-commas": "6.22.0", + "babel-plugin-transform-async-to-generator": "6.24.1", "babel-plugin-transform-es2015-arrow-functions": "6.22.0", "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", - "babel-plugin-transform-es2015-block-scoping": "6.24.1", + "babel-plugin-transform-es2015-block-scoping": "6.26.0", "babel-plugin-transform-es2015-classes": "6.24.1", "babel-plugin-transform-es2015-computed-properties": "6.24.1", "babel-plugin-transform-es2015-destructuring": "6.23.0", @@ -924,7 +1215,7 @@ "babel-plugin-transform-es2015-function-name": "6.24.1", "babel-plugin-transform-es2015-literals": "6.22.0", "babel-plugin-transform-es2015-modules-amd": "6.24.1", - "babel-plugin-transform-es2015-modules-commonjs": "6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "6.26.0", "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", "babel-plugin-transform-es2015-modules-umd": "6.24.1", "babel-plugin-transform-es2015-object-super": "6.24.1", @@ -935,7 +1226,11 @@ "babel-plugin-transform-es2015-template-literals": "6.22.0", "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", "babel-plugin-transform-es2015-unicode-regex": "6.24.1", - "babel-plugin-transform-regenerator": "6.24.1" + "babel-plugin-transform-exponentiation-operator": "6.24.1", + "babel-plugin-transform-regenerator": "6.26.0", + "browserslist": "2.5.1", + "invariant": "2.2.2", + "semver": "5.4.1" } }, "babel-register": { @@ -8608,9 +8903,9 @@ "dev": true }, "regenerator-transform": { - "version": "0.9.11", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz", - "integrity": "sha1-On0GdSDLe3F2dp61/4aGkb7+EoM=", + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz", + "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", "dev": true, "requires": { "babel-runtime": "6.23.0", diff --git a/package.json b/package.json index f027cc4b..316ced30 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "babel-core": "^6.26.0", "babel-loader": "^7.1.2", "babel-polyfill": "^6.26.0", - "babel-preset-es2015": "^6.24.1", + "babel-preset-env": "^1.6.1", "css-loader": "^0.28.7", "eslint": "^4.9.0", "eslint-config-standard": "^10.2.1", From 01885b604ed21f93a60fc594e9e164858989634b Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sat, 9 Dec 2017 11:52:53 +0100 Subject: [PATCH 02/22] Code style: Remove trailing white space Code style: Remove trailing white space from line 89 --- src/style/shariff-layout.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style/shariff-layout.less b/src/style/shariff-layout.less index abd613f0..82ae1024 100644 --- a/src/style/shariff-layout.less +++ b/src/style/shariff-layout.less @@ -86,7 +86,7 @@ padding-left: 3px; } .share_count { - display: none; + display: none; } } } From 73287878d18cb21080454b20817af8be6c03b6ad Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sat, 9 Dec 2017 12:54:23 +0100 Subject: [PATCH 03/22] info.js: Add translations, correct capitalisation Add translations for more languages and use correct capitalisation as recommended by the most (if not all) GUI and web style guides --- src/js/services/info.js | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/src/js/services/info.js b/src/js/services/info.js index 8aa08bb9..da770703 100644 --- a/src/js/services/info.js +++ b/src/js/services/info.js @@ -8,13 +8,29 @@ module.exports = function(shariff) { name: 'info', faName: 'fa-info', title: { - 'de': 'weitere Informationen', - 'en': 'more information', - 'es': 'más informaciones', - 'fr': 'plus d\'informations', - 'it': 'maggiori informazioni', - 'da': 'flere oplysninger', - 'nl': 'verdere informatie', + 'bg': 'Повече информация', + 'da': 'Flere oplysninger', + 'de': 'Weitere Informationen', + 'en': 'More information', + 'es': 'Más informaciones', + 'fi': 'Lisätietoja', + 'fr': 'Plus d\'informations', + 'hr': 'Više informacija', + 'hu': 'Több információ', + 'it': 'Maggiori informazioni', + 'ja': '詳しい情報', + 'ko': '추가 정보', + 'nl': 'Verdere informatie', + 'no': 'Mer informasjon', + 'pl': 'Więcej informacji', + 'pt': 'Mais informações', + 'ro': 'Mai multe informatii', + 'ru': 'Больше информации', + 'sk': 'Viac informácií', + 'sl': 'Več informacij', + 'sr': 'Više informacija', + 'sv': 'Mer information', + 'tr': 'Daha fazla bilgi', 'zh': '更多信息' }, shareUrl: shariff.getInfoUrl() From 719710421831b84e261a11448cf0bbc9049d2810 Mon Sep 17 00:00:00 2001 From: richard67 Date: Tue, 12 Dec 2017 14:10:47 +0100 Subject: [PATCH 04/22] Add missing documentation for info service Add data-info-url to the table of options, add information about info service to supported services section. --- README-de.md | 4 ++++ README.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/README-de.md b/README-de.md index 219a2ad5..673af585 100644 --- a/README-de.md +++ b/README-de.md @@ -87,6 +87,7 @@ $ npm run dev | `data-backend-url` | Pfad zum Shariff-[Backend](#backends). Der Wert `null` deaktiviert die Anzeige von Share-Counts. | `null` | | `data-flattr-category` | Kategorie für Flattr-Spende. | `null` | | `data-flattr-user` | Benutzer, der die Flattr-Spende erhält. | `null` | +| `data-info-url` | URL of the info page. | `http://ct.de/-2467514` | | `data-lang` | Lokalisierung auswählen. Verfügbar: `bg`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | | `data-mail-body` | Wenn `data-mail-url` ein `mailto:`-Link ist, wird dieser Wert als Mail-Body verwendet. Der Mail-Body-Text sollte den Platzhalter `{url}` enthalten. Dieser wird durch die zu teilende URL ersetzt. | siehe `data-url` | | `data-mail-subject` | Wenn `data-mail-url` ein `mailto:`-Link ist, wird dieser Wert als Mail-Betreff verwendet. | siehe `data-title` | @@ -148,6 +149,9 @@ Shariff unterstützt folgende Social-Sharing-Services: - WhatsApp - XING +Zusätzlich stellt der Service `Info` einen Button zur Anzeige einer Infoseite über die Social-Sharing-Buttons bereit. +Die URL dieser Seite kann mit einer Option festgelegt werden. Standardwert: `http://ct.de/-2467514`, d.h. der c't-Artikel zur Einführung von Shariff. + ## Backends Wenn in den Shariff-Buttons die Share-Counts angezeigt werden sollen, wird eines der folgenden Backends benötigt: diff --git a/README.md b/README.md index 47b077d5..0d53e536 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,7 @@ $ npm run dev | `data-backend-url` | The path to your Shariff backend, see below. Settings the value to `null` disables the backend feature. No counts will occur. | `null` | | `data-flattr-category` | Category to be used for Flattr. | `null` | | `data-flattr-user` | User that receives Flattr donation. | `null` | +| `data-info-url` | URL of the info page. | `http://ct.de/-2467514` | | `data-lang` | The localisation to use. Available: `bg`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | | `data-mail-body` | If a `mailto:` link is used in `data-mail-url`, then this value is used as the mail body. The body text should contain the placeholder `{url}` which will be replaced with the share URL. | see `data-url` | | `data-mail-subject` | If a `mailto:` link is used in `data-mail-url`, then this value is used as the mail subject. | see `data-title` | @@ -150,6 +151,9 @@ Shariff supports the following social sharing services: - WhatsApp - XING +In addition, the service `Info` provides a button to show an info page about the social sharing buttons. +The URL of this page can be set with an option. Default value: `http://ct.de/-2467514`, i.e. the c't article introducing Shariff. + ## Backends In order to display share counts with Shariff, you need one of the following backends: From 4d9e317c0adba70dd39cb584b3cbf9036a143499 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Tue, 12 Dec 2017 14:55:02 +0100 Subject: [PATCH 05/22] Forgotten to translate to German Forgotten to translate to German in options table --- README-de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-de.md b/README-de.md index 673af585..8d354f19 100644 --- a/README-de.md +++ b/README-de.md @@ -87,7 +87,7 @@ $ npm run dev | `data-backend-url` | Pfad zum Shariff-[Backend](#backends). Der Wert `null` deaktiviert die Anzeige von Share-Counts. | `null` | | `data-flattr-category` | Kategorie für Flattr-Spende. | `null` | | `data-flattr-user` | Benutzer, der die Flattr-Spende erhält. | `null` | -| `data-info-url` | URL of the info page. | `http://ct.de/-2467514` | +| `data-info-url` | URL der Infoseite. | `http://ct.de/-2467514` | | `data-lang` | Lokalisierung auswählen. Verfügbar: `bg`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | | `data-mail-body` | Wenn `data-mail-url` ein `mailto:`-Link ist, wird dieser Wert als Mail-Body verwendet. Der Mail-Body-Text sollte den Platzhalter `{url}` enthalten. Dieser wird durch die zu teilende URL ersetzt. | siehe `data-url` | | `data-mail-subject` | Wenn `data-mail-url` ein `mailto:`-Link ist, wird dieser Wert als Mail-Betreff verwendet. | siehe `data-title` | From ed8c3d05b20857cdd6506ecb78c71b9b65aa5bf8 Mon Sep 17 00:00:00 2001 From: richard67 Date: Wed, 13 Dec 2017 12:11:21 +0100 Subject: [PATCH 06/22] New option infoDisplay Add a new option infoDisplay (data-info-display) for controlling how the info page is shown. --- src/js/services/info.js | 4 ++-- src/js/shariff.js | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/js/services/info.js b/src/js/services/info.js index da770703..16e91b79 100644 --- a/src/js/services/info.js +++ b/src/js/services/info.js @@ -2,8 +2,8 @@ module.exports = function(shariff) { return { - blank: true, - popup: false, + blank: shariff.getInfoDisplayBlank(), + popup: shariff.getInfoDisplayPopup(), shareText: 'Info', name: 'info', faName: 'fa-info', diff --git a/src/js/shariff.js b/src/js/shariff.js index 14751068..5d14f3e4 100644 --- a/src/js/shariff.js +++ b/src/js/shariff.js @@ -17,6 +17,9 @@ const Defaults = { // Link to the "about" page infoUrl: 'http://ct.de/-2467514', + // Type of display for the "about" page: "blank", "popup" or "self", default = "blank" + infoDisplay: 'blank', + // localisation: "de" or "en" lang: 'de', @@ -127,6 +130,17 @@ class Shariff { return this.options.infoUrl } + getInfoDisplayPopup() { + return (this.options.infoDisplay.toLowerCase() === 'popup') + } + + getInfoDisplayBlank() { + return ( + (this.options.infoDisplay.toLowerCase() !== 'popup') && + (this.options.infoDisplay.toLowerCase() !== 'self') + ) + } + getURL() { return this.getOption('url') } From 12312d5d642f453ed9ce19a1b58c76d58419efe2 Mon Sep 17 00:00:00 2001 From: richard67 Date: Wed, 13 Dec 2017 12:17:19 +0100 Subject: [PATCH 07/22] New option infoDisplay - documentation Add new option infoDisplay (= data-info-display) to the readme documents. --- README-de.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README-de.md b/README-de.md index 8d354f19..2c659951 100644 --- a/README-de.md +++ b/README-de.md @@ -88,6 +88,7 @@ $ npm run dev | `data-flattr-category` | Kategorie für Flattr-Spende. | `null` | | `data-flattr-user` | Benutzer, der die Flattr-Spende erhält. | `null` | | `data-info-url` | URL der Infoseite. | `http://ct.de/-2467514` | +| `data-info-display` | Display-Art der Infoseite. Werte: `blank`, `popup`, `self` | `blank` | | `data-lang` | Lokalisierung auswählen. Verfügbar: `bg`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | | `data-mail-body` | Wenn `data-mail-url` ein `mailto:`-Link ist, wird dieser Wert als Mail-Body verwendet. Der Mail-Body-Text sollte den Platzhalter `{url}` enthalten. Dieser wird durch die zu teilende URL ersetzt. | siehe `data-url` | | `data-mail-subject` | Wenn `data-mail-url` ein `mailto:`-Link ist, wird dieser Wert als Mail-Betreff verwendet. | siehe `data-title` | diff --git a/README.md b/README.md index 0d53e536..2b4d954f 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,7 @@ $ npm run dev | `data-flattr-category` | Category to be used for Flattr. | `null` | | `data-flattr-user` | User that receives Flattr donation. | `null` | | `data-info-url` | URL of the info page. | `http://ct.de/-2467514` | +| `data-info-display` | Display type of the info page. Values: `blank`, `popup`, `self` | `blank` | | `data-lang` | The localisation to use. Available: `bg`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | | `data-mail-body` | If a `mailto:` link is used in `data-mail-url`, then this value is used as the mail body. The body text should contain the placeholder `{url}` which will be replaced with the share URL. | see `data-url` | | `data-mail-subject` | If a `mailto:` link is used in `data-mail-url`, then this value is used as the mail subject. | see `data-title` | From 0bf975df78dfcb2078132ff4472c689a199ac941 Mon Sep 17 00:00:00 2001 From: richard67 Date: Wed, 13 Dec 2017 12:36:51 +0100 Subject: [PATCH 08/22] Correct description in documents --- README-de.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-de.md b/README-de.md index 2c659951..abb38160 100644 --- a/README-de.md +++ b/README-de.md @@ -88,7 +88,7 @@ $ npm run dev | `data-flattr-category` | Kategorie für Flattr-Spende. | `null` | | `data-flattr-user` | Benutzer, der die Flattr-Spende erhält. | `null` | | `data-info-url` | URL der Infoseite. | `http://ct.de/-2467514` | -| `data-info-display` | Display-Art der Infoseite. Werte: `blank`, `popup`, `self` | `blank` | +| `data-info-display` | Wie die Infoseite angezeigt wird. Werte: `blank`, `popup`, `self`. | `blank` | | `data-lang` | Lokalisierung auswählen. Verfügbar: `bg`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | | `data-mail-body` | Wenn `data-mail-url` ein `mailto:`-Link ist, wird dieser Wert als Mail-Body verwendet. Der Mail-Body-Text sollte den Platzhalter `{url}` enthalten. Dieser wird durch die zu teilende URL ersetzt. | siehe `data-url` | | `data-mail-subject` | Wenn `data-mail-url` ein `mailto:`-Link ist, wird dieser Wert als Mail-Betreff verwendet. | siehe `data-title` | diff --git a/README.md b/README.md index 2b4d954f..1b21f224 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ $ npm run dev | `data-flattr-category` | Category to be used for Flattr. | `null` | | `data-flattr-user` | User that receives Flattr donation. | `null` | | `data-info-url` | URL of the info page. | `http://ct.de/-2467514` | -| `data-info-display` | Display type of the info page. Values: `blank`, `popup`, `self` | `blank` | +| `data-info-display` | How to display the info page. Values: `blank`, `popup`, `self`. | `blank` | | `data-lang` | The localisation to use. Available: `bg`, `de`, `en`, `es`, `fi`, `hr`, `hu`, `ja`, `ko`, `no`, `pl`, `pt`, `ro`, `ru`, `sk`, `sl`, `sr`, `sv`, `tr`, `zh` | `de` | | `data-mail-body` | If a `mailto:` link is used in `data-mail-url`, then this value is used as the mail body. The body text should contain the placeholder `{url}` which will be replaced with the share URL. | see `data-url` | | `data-mail-subject` | If a `mailto:` link is used in `data-mail-url`, then this value is used as the mail subject. | see `data-title` | From b1b4506dd821d6accd048b87ab3f3dfb23e6d882 Mon Sep 17 00:00:00 2001 From: richard67 Date: Fri, 15 Dec 2017 14:15:05 +0100 Subject: [PATCH 09/22] Add rel="noopener noreferrer" if target="_blank" Add rel="noopener noreferrer" to hyperlinks if target="_blank". --- src/js/shariff.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/js/shariff.js b/src/js/shariff.js index 14751068..1881be3c 100644 --- a/src/js/shariff.js +++ b/src/js/shariff.js @@ -198,6 +198,7 @@ class Shariff { $shareLink.attr('data-rel', 'popup') } else if (service.blank) { $shareLink.attr('target', '_blank') + $shareLink.attr('rel', 'noopener noreferrer') } $shareLink.attr('title', this.getLocalized(service, 'title')) From 0474ccc109d16a10f6844c14ea0a83600a993261 Mon Sep 17 00:00:00 2001 From: richard67 Date: Fri, 22 Dec 2017 12:28:31 +0100 Subject: [PATCH 10/22] Remove twitter backend from docs Remove twitter or tweet counts from description in docs since the tweet counts have been removed from shariff-backend-php in November 2015 because Twitter discontinued their share count API, and correct typo "erzeugtze" in the German doc. --- README-de.md | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README-de.md b/README-de.md index 8d354f19..3ea015ba 100644 --- a/README-de.md +++ b/README-de.md @@ -4,11 +4,11 @@ Um die Privatsphäre ihrer Besucher gegenüber den Social-Media-Netzwerken zu be ![Shariff Logo © 2015 Heise Medien](http://www.heise.de/icons/ho/shariff-logo.png) -Der Code der offiziellen Buttons von Facebook, Google+ und Twitter überträgt von jedem Besucher kennzeichnende Daten an die Social-Media-Netzwerke. Shariff erzeugtze hingegen Share-Buttons, die mit einem Klick teilen, die Anzahl der Likes, Tweets und Plus-Ones für die aktuelle Seite anzeigen und trotzdem keine unnötigen Daten übertragen. +Der Code der offiziellen Buttons von Facebook, Google+ und Twitter überträgt von jedem Besucher kennzeichnende Daten an die Social-Media-Netzwerke. Shariff erzeugt hingegen Share-Buttons, die mit einem Klick teilen, die Anzahl der Likes und Plus-Ones 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. -Shariff besteht aus zwei Teilen. Der erste Teil ist eine einfache JavaScript-Bibliothek einschließlich Vektor-Icons und CSS zur Formatierung der Knöpfe. Der zweite ist die optionale, server-seitige Komponente (derzeit für PHP, Perl oder NodeJS). Mit dem Shariff-Backend auf dem eigenen Server muss der Browser des Besuchers zur Darstellung der Share-Counts keine Verbindung zu Facebook, Twitter oder Google+ aufbauen. Daten werden erst dann zum Social-Media-Netzwerk übertragen, wenn der Besucher den Inhalt tatsächlich teilen möchte. +Shariff besteht aus zwei Teilen. Der erste Teil ist eine einfache JavaScript-Bibliothek einschließlich Vektor-Icons und CSS zur Formatierung der Knöpfe. Der zweite ist die optionale, server-seitige Komponente (derzeit für PHP, Perl oder NodeJS). Mit dem Shariff-Backend auf dem eigenen Server muss der Browser des Besuchers zur Darstellung der Share-Counts keine Verbindung zu Facebook oder Google+ aufbauen. Daten werden erst dann zum Social-Media-Netzwerk übertragen, wenn der Besucher den Inhalt tatsächlich teilen möchte. ## Erste Schritte diff --git a/README.md b/README.md index 0d53e536..f33dd3f9 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Facebook, Google+ and Twitter supply official sharing code snippets which quietl Shariff `(/ˈʃɛɹɪf/)` is an open-source, low-maintenance, high-privacy solution maintained by German computer magazine c't and heise online. -Shariff consists of two parts: a simple JavaScript client library and an optional server-side component. The latter fetches the number of likes, tweets and plus-ones. Share buttons and share counts work without a connection between your visitors' browsers and *social networks* (unless they decide to share, of course). +Shariff consists of two parts: a simple JavaScript client library and an optional server-side component. The latter fetches the number of likes and plus-ones. Share buttons and share counts work without a connection between your visitors' browsers and *social networks* (unless they decide to share, of course). ## Getting Started From 837905a65281c0235f9a21ac2572432eae13e06f Mon Sep 17 00:00:00 2001 From: richard67 Date: Fri, 22 Dec 2017 12:30:44 +0100 Subject: [PATCH 11/22] Remove twitter counter also from demo backend Remove twitter counter also from the demo backend dummy. --- demo/backend.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/backend.json b/demo/backend.json index 877f2498..0d72aa18 100644 --- a/demo/backend.json +++ b/demo/backend.json @@ -1 +1 @@ -{"facebook":0,"googleplus":3387,"linkedin":92,"reddit":12,"stumbleupon":4325,"xing":185,"twitter":4120} +{"facebook":0,"googleplus":3387,"linkedin":92,"reddit":12,"stumbleupon":4325,"xing":185} From acc58d481881637f5e168e00f555d5affae06e51 Mon Sep 17 00:00:00 2001 From: richard67 Date: Sun, 24 Dec 2017 13:41:55 +0100 Subject: [PATCH 12/22] Add missing """ in 2nd example Add missing """ in the data-services listing of the 2nd example --- demo/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/index.html b/demo/index.html index aab5982d..0cdd92e5 100644 --- a/demo/index.html +++ b/demo/index.html @@ -26,7 +26,7 @@

Lorem ipsum dolor sit amet, consectetuer adipiscing elit

data-backend-url:
/shariff/
data-media-url:
http://www.heise.de/imgs/18/1/4/8/0/5/6/9/wa-encryption-d1999f774c5b5757.png
data-flattr-user:
example
-
data-services:
["addthis",whatsapp","facebook","xing","pinterest","linkedin","tumblr","flattr","diaspora","reddit","stumbleupon","threema","weibo","tencent-weibo","qzone","print"]
+
data-services:
["addthis","whatsapp","facebook","xing","pinterest","linkedin","tumblr","flattr","diaspora","reddit","stumbleupon","threema","weibo","tencent-weibo","qzone","print"]
From 5af764c04f243e4077fabce67bae65a5a906576a Mon Sep 17 00:00:00 2001 From: richard67 Date: Sun, 24 Dec 2017 13:44:49 +0100 Subject: [PATCH 13/22] Add missing data-services to descriptions Add missing data-services to descriptions of examples --- demo/index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/demo/index.html b/demo/index.html index 0cdd92e5..a77dc5fd 100644 --- a/demo/index.html +++ b/demo/index.html @@ -44,6 +44,7 @@

Lorem ipsum dolor sit amet, consectetuer adipiscing elit

data-mail-url:
mailto:foo@example.com
data-title:
Lorem ipsum
data-url:
http://www.heise.de/ct/
+
data-services:
["whatsapp","facebook","twitter","googleplus","mail","info"]
@@ -61,6 +62,7 @@

Lorem ipsum dolor sit amet, consectetuer adipiscing elit

data-theme:
grey
data-twitter-via:
heiseonline
data-url:
http://www.heise.de/ct/
+
data-services:
["facebook","twitter","googleplus","whatsapp","info"]
@@ -74,6 +76,7 @@

Lorem ipsum dolor sit amet, consectetuer adipiscing elit

data-backend-url:
/shariff/
data-theme:
white
+
data-services:
["facebook","twitter","googleplus","mail","info"]
From 48706be819d1f5dd5b1732817f3e4b9f8e6792e4 Mon Sep 17 00:00:00 2001 From: richard67 Date: Tue, 26 Dec 2017 18:11:14 +0100 Subject: [PATCH 14/22] Remove wrong data-info-url from listing Remove wrong data-info-url from parameters listing in 3rd example --- demo/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/demo/index.html b/demo/index.html index a77dc5fd..68e282f3 100644 --- a/demo/index.html +++ b/demo/index.html @@ -39,7 +39,6 @@

Lorem ipsum dolor sit amet, consectetuer adipiscing elit

data-backend-url:
/shariff/
-
data-info-url:
http://example.com
data-lang:
en
data-mail-url:
mailto:foo@example.com
data-title:
Lorem ipsum
From 54e5cd7ff3fc9208aec793eb2b7082c5e79ae3f9 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Mon, 1 Jan 2018 14:06:40 +0100 Subject: [PATCH 15/22] Remove case insensivity Remove the case insensivity from checking the new option to be consistent with the other options checks. --- src/js/shariff.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/shariff.js b/src/js/shariff.js index 5d14f3e4..ccc7a60e 100644 --- a/src/js/shariff.js +++ b/src/js/shariff.js @@ -131,13 +131,13 @@ class Shariff { } getInfoDisplayPopup() { - return (this.options.infoDisplay.toLowerCase() === 'popup') + return (this.options.infoDisplay === 'popup') } getInfoDisplayBlank() { return ( - (this.options.infoDisplay.toLowerCase() !== 'popup') && - (this.options.infoDisplay.toLowerCase() !== 'self') + (this.options.infoDisplay !== 'popup') && + (this.options.infoDisplay !== 'self') ) } From 48b30d65182337b9cb8244d44dacdfd351ad57cd Mon Sep 17 00:00:00 2001 From: Dennis Stumm Date: Mon, 1 Jan 2018 17:39:28 +0100 Subject: [PATCH 16/22] Add telegram service --- demo/index.html | 4 ++-- src/js/services/index.js | 1 + src/js/services/telegram.js | 22 ++++++++++++++++++++++ src/style/services/telegram.less | 26 ++++++++++++++++++++++++++ src/style/shariff-services.less | 1 + 5 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 src/js/services/telegram.js create mode 100644 src/style/services/telegram.less diff --git a/demo/index.html b/demo/index.html index aab5982d..33a59da2 100644 --- a/demo/index.html +++ b/demo/index.html @@ -26,12 +26,12 @@

Lorem ipsum dolor sit amet, consectetuer adipiscing elit

data-backend-url:
/shariff/
data-media-url:
http://www.heise.de/imgs/18/1/4/8/0/5/6/9/wa-encryption-d1999f774c5b5757.png
data-flattr-user:
example
-
data-services:
["addthis",whatsapp","facebook","xing","pinterest","linkedin","tumblr","flattr","diaspora","reddit","stumbleupon","threema","weibo","tencent-weibo","qzone","print"]
+
data-services:
["addthis",whatsapp","facebook","xing","pinterest","linkedin","tumblr","flattr","diaspora","reddit","stumbleupon","threema","weibo","tencent-weibo","qzone","print","telegram"]

Lorem ipsum dolor sit amet, consectetuer adipiscing elit

-
+

A small river named Duden flows by their place and supplies it with the necessary regelialia. It is a paradisematic country, in which roasted parts of sentences fly into your mouth.

diff --git a/src/js/services/index.js b/src/js/services/index.js index f5d310de..5c41d3d8 100644 --- a/src/js/services/index.js +++ b/src/js/services/index.js @@ -12,6 +12,7 @@ module.exports = { qzone: require('./qzone'), reddit: require('./reddit'), stumbleupon: require('./stumbleupon'), + telegram: require('./telegram'), tencent: require('./tencent-weibo'), threema: require('./threema'), tumblr: require('./tumblr'), diff --git a/src/js/services/telegram.js b/src/js/services/telegram.js new file mode 100644 index 00000000..843210e5 --- /dev/null +++ b/src/js/services/telegram.js @@ -0,0 +1,22 @@ +'use strict' + +module.exports = function(shariff) { + var url = encodeURIComponent(shariff.getURL()) + + return { + popup: false, + shareText: { + 'de': 'teilen', + 'en': 'share', + 'ru': 'поделиться', + }, + name: 'telegram', + faName: 'fa-telegram', + title: { + 'de': 'Bei Telegram teilen', + 'en': 'Share on Telegram', + 'ru': 'Поделиться на Telegram' + }, + shareUrl: 'https://t.me/share/url?url='+ url + shariff.getReferrerTrack() + } +} diff --git a/src/style/services/telegram.less b/src/style/services/telegram.less new file mode 100644 index 00000000..68129bda --- /dev/null +++ b/src/style/services/telegram.less @@ -0,0 +1,26 @@ +.shariff { + .telegram { + a { + background-color: #0088cc; + &:hover { + background-color: #007dbb; + } + } + .fa-telegram { + font-size: 28px; + } + } + .theme-white { + .telegram a { + color: #0088cc; + } + } +} + +@media only screen and (min-width: 600px) { + .shariff { + .telegram .fa-telegram { + font-size: 22px; + } + } +} diff --git a/src/style/shariff-services.less b/src/style/shariff-services.less index 1b09de07..908ff6be 100644 --- a/src/style/shariff-services.less +++ b/src/style/shariff-services.less @@ -17,4 +17,5 @@ @import "services/threema"; @import "services/weibo"; @import "services/tencent-weibo"; +@import "services/telegram"; @import "services/qzone"; From 8f871dfb72fe40095b3f8c1c0164820f3eaaac70 Mon Sep 17 00:00:00 2001 From: Dennis Stumm Date: Tue, 2 Jan 2018 08:08:46 +0100 Subject: [PATCH 17/22] Add vk service --- demo/index.html | 4 +-- src/js/services/index.js | 1 + src/js/services/vk.js | 63 +++++++++++++++++++++++++++++++++ src/style/services/vk.less | 30 ++++++++++++++++ src/style/shariff-services.less | 1 + 5 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 src/js/services/vk.js create mode 100644 src/style/services/vk.less diff --git a/demo/index.html b/demo/index.html index 33a59da2..636bf217 100644 --- a/demo/index.html +++ b/demo/index.html @@ -26,12 +26,12 @@

Lorem ipsum dolor sit amet, consectetuer adipiscing elit

data-backend-url:
/shariff/
data-media-url:
http://www.heise.de/imgs/18/1/4/8/0/5/6/9/wa-encryption-d1999f774c5b5757.png
data-flattr-user:
example
-
data-services:
["addthis",whatsapp","facebook","xing","pinterest","linkedin","tumblr","flattr","diaspora","reddit","stumbleupon","threema","weibo","tencent-weibo","qzone","print","telegram"]
+
data-services:
["addthis",whatsapp","facebook","xing","pinterest","linkedin","tumblr","flattr","diaspora","reddit","stumbleupon","threema","weibo","tencent-weibo","qzone","print","telegram","vk"]

Lorem ipsum dolor sit amet, consectetuer adipiscing elit

-
+

A small river named Duden flows by their place and supplies it with the necessary regelialia. It is a paradisematic country, in which roasted parts of sentences fly into your mouth.

diff --git a/src/js/services/index.js b/src/js/services/index.js index 5c41d3d8..ca38bd1a 100644 --- a/src/js/services/index.js +++ b/src/js/services/index.js @@ -17,6 +17,7 @@ module.exports = { threema: require('./threema'), tumblr: require('./tumblr'), twitter: require('./twitter'), + vk: require('./vk'), weibo: require('./weibo'), whatsapp: require('./whatsapp'), xing: require('./xing') diff --git a/src/js/services/vk.js b/src/js/services/vk.js new file mode 100644 index 00000000..da14a05d --- /dev/null +++ b/src/js/services/vk.js @@ -0,0 +1,63 @@ +'use strict' + +module.exports = function(shariff) { + var url = encodeURIComponent(shariff.getURL()) + return { + popup: true, + shareText: { + 'bg': 'cподеляне', + 'da': 'del', + 'de': 'teilen', + 'en': 'share', + 'es': 'compartir', + 'fi': 'Jaa', + 'fr': 'partager', + 'hr': 'podijelite', + 'hu': 'megosztás', + 'it': 'condividi', + 'ja': '共有', + 'ko': '공유하기', + 'nl': 'delen', + 'no': 'del', + 'pl': 'udostępnij', + 'pt': 'compartilhar', + 'ro': 'partajează', + 'ru': 'поделиться', + 'sk': 'zdieľať', + 'sl': 'deli', + 'sr': 'podeli', + 'sv': 'dela', + 'tr': 'paylaş', + 'zh': '分享' + }, + name: 'vk', + faName: 'fa-vk', + title: { + 'bg': 'Сподели във VK', + 'da': 'Del på VK', + 'de': 'Bei VK teilen', + 'en': 'Share on VK', + 'es': 'Compartir en VK', + 'fi': 'Jaa VKissa', + 'fr': 'Partager sur VK', + 'hr': 'Podijelite na VKu', + 'hu': 'Megosztás VKon', + 'it': 'Condividi su VK', + 'ja': 'フェイスブック上で共有', + 'ko': '페이스북에서 공유하기', + 'nl': 'Delen op VK', + 'no': 'Del på VK', + 'pl': 'Udostępnij na VKu', + 'pt': 'Compartilhar no VK', + 'ro': 'Partajează pe VK', + 'ru': 'Поделиться на ВКонтакте', + 'sk': 'Zdieľať na VKu', + 'sl': 'Deli na VKu', + 'sr': 'Podeli na VK-u', + 'sv': 'Dela på VK', + 'tr': 'VK\'ta paylaş', + 'zh': '在VK上分享', + }, + shareUrl: 'https://vk.com/share.php?url=' + url + shariff.getReferrerTrack() + } +} diff --git a/src/style/services/vk.less b/src/style/services/vk.less new file mode 100644 index 00000000..c6fc8d19 --- /dev/null +++ b/src/style/services/vk.less @@ -0,0 +1,30 @@ +.shariff { + .vk { + a { + background-color: #5d7fa4; + &:hover { + background-color: #678eb4; + } + } + .fa-vk { + font-size: 22px; + } + .share_count { + color: #55677d; + background-color: #FFFFFF; + } + } + .theme-white { + .vk a { + color: #3b5998; + } + } +} + +@media only screen and (min-width: 600px) { + .shariff { + .vk .fa-vk { + font-size: 19px; + } + } +} diff --git a/src/style/shariff-services.less b/src/style/shariff-services.less index 908ff6be..6651478d 100644 --- a/src/style/shariff-services.less +++ b/src/style/shariff-services.less @@ -19,3 +19,4 @@ @import "services/tencent-weibo"; @import "services/telegram"; @import "services/qzone"; +@import "services/vk"; From ffbe2266d9653205504a2921a663a192857a9c7f Mon Sep 17 00:00:00 2001 From: Dennis Stumm Date: Tue, 2 Jan 2018 08:09:01 +0100 Subject: [PATCH 18/22] Add translations for telegram service --- src/js/services/telegram.js | 44 ++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/src/js/services/telegram.js b/src/js/services/telegram.js index 843210e5..fa4bb421 100644 --- a/src/js/services/telegram.js +++ b/src/js/services/telegram.js @@ -6,16 +6,58 @@ module.exports = function(shariff) { return { popup: false, shareText: { + 'bg': 'cподеляне', + 'da': 'del', 'de': 'teilen', 'en': 'share', + 'es': 'compartir', + 'fi': 'Jaa', + 'fr': 'partager', + 'hr': 'podijelite', + 'hu': 'megosztás', + 'it': 'condividi', + 'ja': '共有', + 'ko': '공유하기', + 'nl': 'delen', + 'no': 'del', + 'pl': 'udostępnij', + 'pt': 'compartilhar', + 'ro': 'partajează', 'ru': 'поделиться', + 'sk': 'zdieľať', + 'sl': 'deli', + 'sr': 'podeli', + 'sv': 'dela', + 'tr': 'paylaş', + 'zh': '分享' }, name: 'telegram', faName: 'fa-telegram', title: { + 'bg': 'Сподели в Telegram', + 'da': 'Del på Telegram', 'de': 'Bei Telegram teilen', 'en': 'Share on Telegram', - 'ru': 'Поделиться на Telegram' + 'es': 'Compartir en Telegram', + 'fi': 'Jaa Telegramissä', + 'fr': 'Partager sur Telegram', + 'hr': 'Podijelite na Telegram', + 'hu': 'Megosztás Telegramen', + 'it': 'Condividi su Telegram', + 'ja': 'Telegram上で共有', + 'ko': 'Telegram에서 공유하기', + 'nl': 'Delen op Telegram', + 'no': 'Del på Telegram', + 'pl': 'Udostępnij przez Telegram', + 'pt': 'Compartilhar no Telegram', + 'ro': 'Partajează pe Telegram', + 'ru': 'Поделиться на Telegram', + 'sk': 'Zdieľať na Telegram', + 'sl': 'Deli na Telegram', + 'sr': 'Podeli na Telegram-u', + 'sv': 'Dela på Telegram', + 'tr': 'Telegram\'ta paylaş', + 'zh': '在Telegram上分享' }, shareUrl: 'https://t.me/share/url?url='+ url + shariff.getReferrerTrack() } From 6d62b6ca59f9ab21901397298d2108e225bdf5d7 Mon Sep 17 00:00:00 2001 From: Dennis Stumm Date: Tue, 2 Jan 2018 08:10:09 +0100 Subject: [PATCH 19/22] Update readme files --- README-de.md | 4 +++- README.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README-de.md b/README-de.md index 8d354f19..9cc47489 100644 --- a/README-de.md +++ b/README-de.md @@ -95,7 +95,7 @@ $ npm run dev | `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` | 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="["facebook","googleplus"]"`
Verfügbare Dienste: `twitter`, `facebook`, `googleplus`, `linkedin`, `pinterest`, `xing`, `whatsapp`, `mail`, `info`, `addthis`, `tumblr`, `flattr`, `diaspora`, `reddit`, `stumbleupon`, `threema`, `weibo`, `tencent-weibo`, `qzone`, `print` | Twitter, Facebook, Google+ | +| `data-services` | 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="["facebook","googleplus"]"`
Verfügbare Dienste: `twitter`, `facebook`, `googleplus`, `linkedin`, `pinterest`, `xing`, `whatsapp`, `mail`, `info`, `addthis`, `tumblr`, `flattr`, `diaspora`, `reddit`, `stumbleupon`, `threema`, `weibo`, `tencent-weibo`, `qzone`, `print`, `telegram`, `vk` | Twitter, Facebook, Google+ | | `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 `` | | `data-twitter-via` | User von dem der Tweet ursprünglich stammt. | `null` | @@ -141,10 +141,12 @@ Shariff unterstützt folgende Social-Sharing-Services: - Qzone - reddit - StumbleUpon +- Telegram - Tencent Weibo - Threema - Tumblr - Twitter +- VK - Weibo - WhatsApp - XING diff --git a/README.md b/README.md index 0d53e536..719ba2da 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ $ npm run dev | `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` | An entity-encoded JSON string containing an array of service names to be enabled. Example: `data-services="["facebook","googleplus"]"` Available service names: `twitter`, `facebook`, `googleplus`, `linkedin`, `pinterest`, `xing`, `whatsapp`, `mail`, `info`, `addthis`, `tumblr`, `flattr`, `diaspora`, `reddit`, `stumbleupon`, `threema`, `weibo`, `tencent-weibo`, `qzone`, `print` | `twitter`, `facebook`, `googleplus`, `info` | +| `data-services` | An entity-encoded JSON string containing an array of service names to be enabled. Example: `data-services="["facebook","googleplus"]"` Available service names: `twitter`, `facebook`, `googleplus`, `linkedin`, `pinterest`, `xing`, `whatsapp`, `mail`, `info`, `addthis`, `tumblr`, `flattr`, `diaspora`, `reddit`, `stumbleupon`, `threema`, `weibo`, `tencent-weibo`, `qzone`, `print`, `telegram`, `vk` | `twitter`, `facebook`, `googleplus`, `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` | @@ -143,10 +143,12 @@ Shariff supports the following social sharing services: - Qzone - reddit - StumbleUpon +- Telegram - Tencent Weibo - Threema - Tumblr - Twitter +- VK - Weibo - WhatsApp - XING From 36070d094657fc529e11475d7be0b6c411dd1ebd Mon Sep 17 00:00:00 2001 From: Dennis Stumm <dstumm@yandex.ru> Date: Tue, 2 Jan 2018 08:41:20 +0100 Subject: [PATCH 20/22] Make code eslint happy --- src/js/services/telegram.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/services/telegram.js b/src/js/services/telegram.js index fa4bb421..a5d17a71 100644 --- a/src/js/services/telegram.js +++ b/src/js/services/telegram.js @@ -59,6 +59,6 @@ module.exports = function(shariff) { 'tr': 'Telegram\'ta paylaş', 'zh': '在Telegram上分享' }, - shareUrl: 'https://t.me/share/url?url='+ url + shariff.getReferrerTrack() + shareUrl: 'https://t.me/share/url?url=' + url + shariff.getReferrerTrack() } } From c0b704c1fef0056296b8a1bb39a31f4af58550fd Mon Sep 17 00:00:00 2001 From: apl <apl@heise.de> Date: Tue, 2 Jan 2018 10:07:18 +0100 Subject: [PATCH 21/22] update changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e972738..6e748d2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## Unreleased + +- Added VK service. (dennis95stumm) +- Added Telegram service. (dennis95stumm) +- Added display options to info service. (richard67) +- Added documentation for info service. (richard67) +- Improved demo. (richard67) +- Improved security of links with `target="_blank"`. (richard67) +- Removed references to Twitter backend from documentation. (richard67) + ## v2.0.4, 2017-11-03 - Fixed deployment to GitHub. From d08fc026b2658049c0adb89d3becaa88520f4eeb Mon Sep 17 00:00:00 2001 From: apl <apl@heise.de> Date: Tue, 2 Jan 2018 10:12:26 +0100 Subject: [PATCH 22/22] bump to version 2.1.0 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e748d2f..80f13985 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased +## v2.1.0, 2018-01-02 - Added VK service. (dennis95stumm) - Added Telegram service. (dennis95stumm) diff --git a/package.json b/package.json index 316ced30..14eae2d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "shariff", - "version": "2.0.4", + "version": "2.1.0", "description": "Shariff enables website users to share their favorite content without compromising their privacy.", "main": "src/js/shariff.js", "scripts": {