diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-10-27 01:57:27 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2016-11-15 21:54:41 +0100 |
commit | af61cb80eb600618df95a01a15a08e87fc878c2a (patch) | |
tree | 3e5ba0c9935b5aace5e5c58a8d3fd84621d4b0db /app/Resources/static/themes/baggy | |
parent | f9cded7dd2acab3af8ff8481941e0c199daf8270 (diff) | |
download | wallabag-af61cb80eb600618df95a01a15a08e87fc878c2a.tar.gz wallabag-af61cb80eb600618df95a01a15a08e87fc878c2a.tar.zst wallabag-af61cb80eb600618df95a01a15a08e87fc878c2a.zip |
es6 imports
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Diffstat (limited to 'app/Resources/static/themes/baggy')
-rwxr-xr-x | app/Resources/static/themes/baggy/js/autoCompleteTags.js | 2 | ||||
-rwxr-xr-x | app/Resources/static/themes/baggy/js/init.js | 18 | ||||
-rw-r--r-- | app/Resources/static/themes/baggy/js/uiTools.js | 4 |
3 files changed, 15 insertions, 9 deletions
diff --git a/app/Resources/static/themes/baggy/js/autoCompleteTags.js b/app/Resources/static/themes/baggy/js/autoCompleteTags.js index f287ebfa..64fdaa92 100755 --- a/app/Resources/static/themes/baggy/js/autoCompleteTags.js +++ b/app/Resources/static/themes/baggy/js/autoCompleteTags.js | |||
@@ -5,4 +5,4 @@ function extractLast(term) { | |||
5 | return split(term).pop(); | 5 | return split(term).pop(); |
6 | } | 6 | } |
7 | 7 | ||
8 | export { split, extractLast }; | 8 | export default { split, extractLast }; |
diff --git a/app/Resources/static/themes/baggy/js/init.js b/app/Resources/static/themes/baggy/js/init.js index dc11043a..b7347f7c 100755 --- a/app/Resources/static/themes/baggy/js/init.js +++ b/app/Resources/static/themes/baggy/js/init.js | |||
@@ -1,11 +1,17 @@ | |||
1 | import { savePercent, retrievePercent } from '../../_global/js/tools'; | 1 | import $ from 'jquery'; |
2 | import { toggleSaveLinkForm } from './uiTools'; | 2 | |
3 | /* eslint-disable no-unused-vars */ | ||
4 | /* jquery has default scope */ | ||
5 | import cookie from 'jquery.cookie'; | ||
6 | import ui from 'jquery-ui-browserify'; | ||
7 | /* eslint-enable no-unused-vars */ | ||
3 | 8 | ||
4 | const $ = global.jquery = require('jquery'); | 9 | import annotator from 'annotator'; |
5 | require('jquery.cookie'); | 10 | |
6 | require('jquery-ui-browserify'); | 11 | import { savePercent, retrievePercent } from '../../_global/js/tools'; |
7 | const annotator = require('annotator'); | 12 | import toggleSaveLinkForm from './uiTools'; |
8 | 13 | ||
14 | global.jquery = $; | ||
9 | 15 | ||
10 | $.fn.ready(() => { | 16 | $.fn.ready(() => { |
11 | const $listmode = $('#listmode'); | 17 | const $listmode = $('#listmode'); |
diff --git a/app/Resources/static/themes/baggy/js/uiTools.js b/app/Resources/static/themes/baggy/js/uiTools.js index 900b2707..713c53f7 100644 --- a/app/Resources/static/themes/baggy/js/uiTools.js +++ b/app/Resources/static/themes/baggy/js/uiTools.js | |||
@@ -1,4 +1,4 @@ | |||
1 | const $ = require('jquery'); | 1 | import $ from 'jquery'; |
2 | 2 | ||
3 | function toggleSaveLinkForm(url, event) { | 3 | function toggleSaveLinkForm(url, event) { |
4 | $('#add-link-result').empty(); | 4 | $('#add-link-result').empty(); |
@@ -32,4 +32,4 @@ function toggleSaveLinkForm(url, event) { | |||
32 | plainUrl.focus(); | 32 | plainUrl.focus(); |
33 | } | 33 | } |
34 | 34 | ||
35 | export { toggleSaveLinkForm }; | 35 | export default toggleSaveLinkForm; |