-
-
Notifications
You must be signed in to change notification settings - Fork 129
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #297 from EvanNotFound/dev
Bump version to v2.5.1
- Loading branch information
Showing
32 changed files
with
897 additions
and
465 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,3 +44,6 @@ testem.log | |
| Thumbs.db | ||
| .com.greenworldsoft.syncfolderspro | ||
| _DelSyncFiles/ | ||
|
|
||
| .env | ||
| .env.local | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,22 @@ | ||
| <% if( | ||
| theme.comment.system === 'waline' | ||
| && theme.comment.config.waline.serverUrl | ||
| && theme.comment.config.waline.lang | ||
| ) { %> | ||
| <% if(theme.comment.system === 'waline' && theme.comment.config.waline.serverUrl && theme.comment.config.waline.lang) { %> | ||
| <div id="waline"></div> | ||
| <script type="module" <%= theme.global.single_page === true ? 'data-swup-reload-script' : '' %>> | ||
| import { init } from '<%= renderJSPath('js/libs/waline.mjs') %>'; | ||
| <script type="module" data-swup-reload-script> | ||
| import { init } from '<%= url_for('js/libs/waline.mjs') %>'; | ||
| function loadWaline() { | ||
| init({ | ||
| el: '#waline', | ||
| serverURL: '<%= theme.comment.config.waline.serverUrl %>', | ||
| lang: '<%= theme.comment.config.waline.lang %>', | ||
| dark: 'body[class~="dark-mode"]', | ||
| requiredMeta: ['nick','mail'], // cannot customize by theme config, change it yourself | ||
| }); | ||
| } | ||
| function loadWaline() { | ||
| init({ | ||
| el: '#waline', | ||
| serverURL: '<%= theme.comment.config.waline.serverUrl %>', | ||
| lang: '<%= theme.comment.config.waline.lang %>', | ||
| dark: 'body[class~="dark-mode"]', | ||
| requiredMeta: ['nick', 'mail'] | ||
| }); | ||
| } | ||
| if ('<%= theme.global.single_page %>') { | ||
| const loadWalineTimeout = setTimeout(() => { | ||
| loadWaline(); | ||
| clearTimeout(loadWalineTimeout); | ||
| }, 1000); | ||
| } else { | ||
| window.addEventListener('DOMContentLoaded', loadWaline); | ||
| } | ||
| if (typeof swup !== 'undefined') { | ||
| loadWaline(); | ||
| } else { | ||
| window.addEventListener('DOMContentLoaded', loadWaline); | ||
| } | ||
| </script> | ||
| <% } %> | ||
| <% } %> |
Oops, something went wrong.