Skip to content

Commit 2abda50

Browse files
committed
πŸ“¦ Release 11.0.4
1 parent 49daae1 commit 2abda50

File tree

7 files changed

+106
-82
lines changed

7 files changed

+106
-82
lines changed

β€ŽREADME.mdβ€Ž

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
# [Disqus Conditional Load](https://wordpress.org/plugins/disqus-conditional-load) - for WordPress
22

33
Disqus commenting system for WordPress with advanced features like like <strong>lazy load, shortcode</strong> etc.
4+
45
<hr/>
56

67
##### Contributors: <a href="https://github.com/joel-james/">Joel James</a>
8+
79
##### Requires at least: WordPress 3.0
8-
##### Tested up to: WordPress 5.0
9-
##### Stable tag: 11.0.1
10+
11+
##### Tested up to: WordPress 5.5
12+
13+
##### Stable tag: 11.0.4
1014

1115
Before starting development make sure you read and understand everything in this README.
1216

@@ -24,22 +28,26 @@ Clone the plugin repo and checkout the `dev` branch
2428
## Installing dependencies and initial configuration
2529

2630
Install Node
31+
2732
```
2833
# curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
2934
# sudo apt-get install -y nodejs build-essential
3035
```
3136

3237
Install the necessary npm modules and packages
38+
3339
```
3440
# npm install
35-
```
41+
```
3642

3743
After that for the first time, run below command to create updated assets.
44+
3845
```
3946
# npm run compile
40-
```
47+
```
4148

4249
Set up username and email for Git commits
50+
4351
```
4452
# git config user.email "<your email>"
4553
# git config user.name "<your name>"
@@ -49,40 +57,40 @@ Set up username and email for Git commits
4957

5058
Everything (except unit tests) should be handled by npm. Note that you don't need to interact with Grunt in a direct way.
5159

52-
Command | Action
53-
------- | ------
54-
`npm run translate` | Build pot and mo file inside /languages/ folder
55-
`npm run compile` | Compile and then generates assets (js & css)
56-
`npm run build` | Build release version, useful to provide for testing
60+
| Command | Action |
61+
| ------------------- | ---------------------------------------------------- |
62+
| `npm run translate` | Build pot and mo file inside /languages/ folder |
63+
| `npm run compile` | Compile and then generates assets (js & css) |
64+
| `npm run build` | Build release version, useful to provide for testing |
5765

5866
## Versioning
5967

6068
Follow semantic versioning [http://semver.org/](http://semver.org/) as `package.json` won't work otherwise. That's it:
6169

62-
- `X.X.0` for mayor versions
63-
- `X.X.X` for minor versions
64-
- `X.X[.X||.0]-rc.1` for release candidates
65-
- `X.X[.X||.0]-beta.1` for betas
70+
- `X.X.0` for mayor versions
71+
- `X.X.X` for minor versions
72+
- `X.X[.X||.0]-rc.1` for release candidates
73+
- `X.X[.X||.0]-beta.1` for betas
6674

6775
## Workflow
6876

6977
Do not commit on `master` branch (if you are on a forked repo, no need to worry). `dev` is the code
7078
that accumulates all the code for the next version.
7179

72-
- Create a new branch from `dev` branch: `git checkout -b branch-name origin/dev`. Try to give it a descriptive name. For example:
73-
* `release/X.X.X` for next releases
74-
* `new/some-feature` for new features
75-
* `enhance/some-enhancement` for enhancements
76-
* `fix/some-bug` for bug fixing
77-
- Make your commits and push the new branch: `git push -u origin branch-name`
78-
- File the new Pull Request against `dev` branch
79-
- Once the PR is approved it will be merged to the `dev` branch.
80+
- Create a new branch from `dev` branch: `git checkout -b branch-name origin/dev`. Try to give it a descriptive name. For example:
81+
- `release/X.X.X` for next releases
82+
- `new/some-feature` for new features
83+
- `enhance/some-enhancement` for enhancements
84+
- `fix/some-bug` for bug fixing
85+
- Make your commits and push the new branch: `git push -u origin branch-name`
86+
- File the new Pull Request against `dev` branch
87+
- Once the PR is approved it will be merged to the `dev` branch.
8088

8189
If you are sending pull requests from your forked repo, follow the same steps.
8290

8391
## Important Links and Documentation
8492

85-
- <a href="https://dclwp.com/"><strong>Plugin Website</strong></a>
86-
- <a href="https://wordpress.org/plugins/disqus-conditional-load/"><strong>WordPress Page</strong></a>
87-
- <a href="https://wordpress.org/support/plugin/disqus-conditional-load/"><strong>Plugin Support Forum</strong></a>
88-
- <a href="https://dclwp.com/docs/"><strong>Documentation</strong></a>
93+
- <a href="https://dclwp.com/"><strong>Plugin Website</strong></a>
94+
- <a href="https://wordpress.org/plugins/disqus-conditional-load/"><strong>WordPress Page</strong></a>
95+
- <a href="https://wordpress.org/support/plugin/disqus-conditional-load/"><strong>Plugin Support Forum</strong></a>
96+
- <a href="https://dclwp.com/docs/"><strong>Documentation</strong></a>

β€Ždisqus-conditional-load.phpβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Plugin Name: Disqus Conditional Load
44
* Plugin URI: https://dclwp.com
55
* Description: Disqus commenting system for WordPress with advanced features like like <strong>lazy load, shortcode</strong> etc.
6-
* Version: 11.0.1
6+
* Version: 11.0.4
77
* Author: Joel James
88
* Author URI: https://duckdev.com/
99
* Donate link: https://paypal.me/JoelCJ
@@ -48,7 +48,7 @@
4848
'DCL_DIR' => plugin_dir_path( __FILE__ ),
4949
'DCL_PATH' => plugin_dir_url( __FILE__ ),
5050
'DCL_BASE_FILE' => __FILE__,
51-
'DCL_VERSION' => '11.0.1',
51+
'DCL_VERSION' => '11.0.4',
5252
'DCL_DISQUS_VERSION' => '3.0.16',
5353
),
5454

-50 Bytes
Binary file not shown.

β€Žlanguages/disqus-conditional-load.potβ€Ž

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Copyright (C) 2018 Joel James
1+
# Copyright (C) 2020 Joel James
22
# This file is distributed under the GPL-2.0+.
33
msgid ""
44
msgstr ""
5-
"Project-Id-Version: Disqus Conditional Load 11.0.0-beta\n"
5+
"Project-Id-Version: Disqus Conditional Load 11.0.4\n"
66
"Report-Msgid-Bugs-To: https://dclwp.com/\n"
7-
"POT-Creation-Date: 2018-12-19 18:35:36+00:00\n"
7+
"POT-Creation-Date: 2020-07-23 08:04:06+00:00\n"
88
"MIME-Version: 1.0\n"
99
"Content-Type: text/plain; charset=utf-8\n"
1010
"Content-Transfer-Encoding: 8bit\n"
11-
"PO-Revision-Date: 2018-MO-DA HO:MI+ZONE\n"
11+
"PO-Revision-Date: 2020-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: Joel James <[email protected]>\n"
1313
"Language-Team: Joel James <[email protected]>\n"
1414
"Language: en\n"
@@ -395,7 +395,7 @@ msgstr ""
395395
msgid "Loading..."
396396
msgstr ""
397397

398-
#: includes/class-disqus-conditional-load.php:276
398+
#: includes/class-disqus-conditional-load.php:280
399399
msgid ""
400400
"An incompatible version of Disqus plugin is already active. %1$sDisqus "
401401
"Conditional Load%2$s will not work, until you %1$sdeactivate%2$s it or "

β€Žpackage.jsonβ€Ž

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
{
2-
"name": "disqus-conditional-load",
3-
"version": "11.0.1",
4-
"private": true,
5-
"description": "Disqus commenting system for WordPress with advanced features like like <strong>lazy load, shortcode</strong> etc.",
6-
"keywords": [
7-
"disqus",
8-
"disqus conditional load",
9-
"comment hide",
10-
"hide disqus",
11-
"disqus comments",
12-
"disqus on click",
13-
"disqus auto load",
14-
"disqus",
15-
"woocommerce comments",
16-
"edd comments"
17-
],
18-
"homepage": "https://dclwp.com/",
19-
"license": "GPL-2.0",
20-
"author": {
21-
"name": "Joel James",
22-
"url": "https://dclwp.com"
23-
},
24-
"main": "disqus-conditional-load.php",
25-
"repository": "git+https://github.com/Joel-James/disqus-conditional-load.git",
26-
"scripts": {
27-
"translate": "clear && grunt translate",
28-
"compile": "clear && grunt compile",
29-
"build": "clear && grunt prepare && grunt build"
30-
},
31-
"devDependencies": {
32-
"grunt": "^1.0.3",
33-
"grunt-checktextdomain": "^1.0.1",
34-
"grunt-contrib-clean": "^1.1.0",
35-
"grunt-contrib-compress": "^1.4.3",
36-
"grunt-contrib-copy": "^1.0.0",
37-
"grunt-wp-i18n": "^1.0.2",
38-
"grunt-po2mo": "^0.1.2",
39-
"load-grunt-tasks": "^4.0.0",
40-
"grunt-contrib-jshint": "~0.8.0",
41-
"grunt-contrib-sass": "^1.0.0",
42-
"grunt-contrib-uglify": "^4.0.0"
43-
}
2+
"name": "disqus-conditional-load",
3+
"version": "11.0.4",
4+
"private": true,
5+
"description": "Disqus commenting system for WordPress with advanced features like like <strong>lazy load, shortcode</strong> etc.",
6+
"keywords": [
7+
"disqus",
8+
"disqus conditional load",
9+
"comment hide",
10+
"hide disqus",
11+
"disqus comments",
12+
"disqus on click",
13+
"disqus auto load",
14+
"disqus",
15+
"woocommerce comments",
16+
"edd comments"
17+
],
18+
"homepage": "https://dclwp.com/",
19+
"license": "GPL-2.0",
20+
"author": {
21+
"name": "Joel James",
22+
"url": "https://dclwp.com"
23+
},
24+
"main": "disqus-conditional-load.php",
25+
"repository": "git+https://github.com/Joel-James/disqus-conditional-load.git",
26+
"scripts": {
27+
"translate": "clear && grunt translate",
28+
"compile": "clear && grunt compile",
29+
"build": "clear && grunt prepare && grunt build"
30+
},
31+
"devDependencies": {
32+
"grunt": "^1.0.3",
33+
"grunt-checktextdomain": "^1.0.1",
34+
"grunt-contrib-clean": "^1.1.0",
35+
"grunt-contrib-compress": "^1.4.3",
36+
"grunt-contrib-copy": "^1.0.0",
37+
"grunt-wp-i18n": "^1.0.2",
38+
"grunt-po2mo": "^0.1.2",
39+
"load-grunt-tasks": "^4.0.0",
40+
"grunt-contrib-jshint": "~0.8.0",
41+
"grunt-contrib-sass": "^1.0.0",
42+
"grunt-contrib-uglify": "^4.0.0"
43+
}
4444
}

β€Žpublic/class-dcl-public.phpβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public function add_additional_attrs( $tag, $handle, $src ) {
168168
global $dcl_helper;
169169

170170
// Add only to our script.
171-
if ( $handle === 'dcl_comments' && (bool) $dcl_helper->get_option( 'dcl_cfasync', 0 ) ) {
171+
if ( $handle === 'dcl_comments' && (bool) $dcl_helper->get_option( 'dcl_cfasync', false, 0 ) ) {
172172
$tag = '<script type="text/javascript" src="' . $src . '" data-cfasync="false"></script>';
173173
}
174174

@@ -196,7 +196,7 @@ private function get_script_name() {
196196
$method = $this->helper->get_load_method();
197197

198198
// If count is not disabled.
199-
if ( (bool) $this->helper->get_option( 'dcl_count_disable', 1 ) ) {
199+
if ( (bool) $this->helper->get_option( 'dcl_count_disable', false, 1 ) ) {
200200
$file .= '-count';
201201
}
202202

@@ -563,4 +563,4 @@ public function comments_link() {
563563

564564
return get_permalink() . '#disqus_thread';
565565
}
566-
}
566+
}

β€Žreadme.txtβ€Ž

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
=== Disqus Conditional Load ===
22
Contributors: joelcj91,duckdev
3-
Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XUVWY8HUBUXY4
3+
Donate link: https://paypal.me/JoelCJ
44
Tags: disqus, disqus conditional load, comment hide, hide disqus, disqus comments, disqus on click, disqus auto load, disqus, woocommerce comments, edd comments
55
Requires at least: 3.0
6-
Tested up to: 5.0
6+
Tested up to: 5.5
77
Requires PHP: 5.6
8-
Stable tag: 11.0.1
8+
Stable tag: 11.0.4
99
License: GPLv2 or later
1010
License URI: http://www.gnu.org/licenses/gpl-2.0.html
1111

@@ -154,6 +154,17 @@ Bug reports for DCL are always welcome. [Report here](https://dclwp.com/bugs/).
154154

155155
== Changelog ==
156156

157+
= 11.0.4 =
158+
159+
**πŸ‘Œ Improvements**
160+
161+
- Tested with WordPress 5.5.
162+
163+
**πŸ› Bug Fixes**
164+
165+
- Fix comments count script issue.
166+
- Fix Rocket Loader support.
167+
157168
= 11.0.1 =
158169

159170
**πŸ‘Œ Improvements**
@@ -413,8 +424,13 @@ Bug reports for DCL are always welcome. [Report here](https://dclwp.com/bugs/).
413424

414425
== Upgrade Notice ==
415426

416-
= 11.0.1 =
427+
= 11.0.4 =
417428

418429
**πŸ‘Œ Improvements**
419430

420-
- Replace comments anchor link with Disqus thread link.
431+
- Tested with WordPress 5.5.
432+
433+
**πŸ› Bug Fixes**
434+
435+
- Fix comments count script issue.
436+
- Fix Rocket Loader support.

0 commit comments

Comments
Β (0)