Skip to content

Commit e46f20a

Browse files
committed
Merge branch 'release/2.1.2'
2 parents 3f20538 + 1b5196c commit e46f20a

File tree

5 files changed

+18
-4
lines changed

5 files changed

+18
-4
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## v2.1.2, 2018-01-26
4+
5+
- Fixed SEO friendliness by adding `rel="nofollow"` to all button links. (richard67)
6+
- Fixed Telegram service not opening in a popup.
7+
38
## v2.1.1, 2018-01-03
49

510
- Fixed missing `dist` directory.

RELEASING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
To prepare a release you have to do the following tasks:
44

55
1. Run `git flow release start [version]`.
6-
2. Bump versions in `package.json` and `bower.json`.
6+
2. Bump versions in `package.json`.
77
3. Update [CHANGELOG.md](CHANGELOG.md).
88
2. Run `git flow release finish`.
99

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "shariff",
3-
"version": "2.1.1",
3+
"version": "2.1.2",
44
"description": "Shariff enables website users to share their favorite content without compromising their privacy.",
55
"main": "src/js/shariff.js",
66
"scripts": {

src/js/services/telegram.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = function(shariff) {
44
var url = encodeURIComponent(shariff.getURL())
55

66
return {
7-
popup: false,
7+
popup: true,
88
shareText: {
99
'bg': 'cподеляне',
1010
'da': 'del',

src/js/shariff.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,18 @@ class Shariff {
210210

211211
if (service.popup) {
212212
$shareLink.attr('data-rel', 'popup')
213+
if (service.name !== 'info') {
214+
$shareLink.attr('rel', 'nofollow')
215+
}
213216
} else if (service.blank) {
214217
$shareLink.attr('target', '_blank')
215-
$shareLink.attr('rel', 'noopener noreferrer')
218+
if (service.name === 'info') {
219+
$shareLink.attr('rel', 'noopener noreferrer')
220+
} else {
221+
$shareLink.attr('rel', 'nofollow noopener noreferrer')
222+
}
223+
} else if (service.name !== 'info') {
224+
$shareLink.attr('rel', 'nofollow')
216225
}
217226
$shareLink.attr('title', this.getLocalized(service, 'title'))
218227

0 commit comments

Comments
 (0)