es6 imports

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
wallabag · Nov 15, 2016 · af61cb8 · af61cb8
1 parent f9cded7
commit af61cb8
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 40 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -2,7 +2,11 @@
     "extends": "airbnb-base",
     "parser": "babel-eslint",
     "env": {
-        "browser": true
+        "browser": true,
+        "es6": true
+    },
+    "globals": {
+        "Routing": true
     },
     "rules": {
         "import/no-extraneous-dependencies": ["error", {"devDependencies": true, "optionalDependencies": true, "peerDependencies": true}]

diff --git a/app/Resources/static/themes/_global/js/bookmarklet.js b/app/Resources/static/themes/_global/js/bookmarklet.js
@@ -1,4 +1,3 @@
-
 top['bookmarklet-url@wallabag.org'] =
     '<!DOCTYPE html><html><head><title>bag it!</title>' +
     '<link rel="icon" href="tpl/img/favicon.ico" />' +

diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js
@@ -1,5 +1,5 @@
-const $ = require('jquery');
-require('mousetrap');
+import $ from 'jquery';
+import Mousetrap from 'mousetrap';
 
 /* Allows inline call qr-code call */
 import jrQrcode from 'jr-qrcode'; // eslint-disable-line
@@ -56,45 +56,45 @@ export { savePercent, retrievePercent, initFilters, initExport };
 /** Shortcuts **/
 
 /* Go to */
-Mousetrap.bind('g u', function() { window.location.href = Routing.generate('homepage') });
-Mousetrap.bind('g s', function() { window.location.href = Routing.generate('starred') });
-Mousetrap.bind('g r', function() { window.location.href = Routing.generate('archive') });
-Mousetrap.bind('g a', function() { window.location.href = Routing.generate('all') });
-Mousetrap.bind('g t', function() { window.location.href = Routing.generate('tag') });
-Mousetrap.bind('g c', function() { window.location.href = Routing.generate('config') });
-Mousetrap.bind('g i', function() { window.location.href = Routing.generate('import') });
-Mousetrap.bind('g d', function() { window.location.href = Routing.generate('developer') });
-Mousetrap.bind('g h', function() { window.location.href = Routing.generate('howto') });
-Mousetrap.bind('g l', function() { window.location.href = Routing.generate('logout') });
+Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); });
+Mousetrap.bind('g s', () => { window.location.href = Routing.generate('starred'); });
+Mousetrap.bind('g r', () => { window.location.href = Routing.generate('archive'); });
+Mousetrap.bind('g a', () => { window.location.href = Routing.generate('all'); });
+Mousetrap.bind('g t', () => { window.location.href = Routing.generate('tag'); });
+Mousetrap.bind('g c', () => { window.location.href = Routing.generate('config'); });
+Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); });
+Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); });
+Mousetrap.bind('g h', () => { window.location.href = Routing.generate('howto'); });
+Mousetrap.bind('g l', () => { window.location.href = Routing.generate('logout'); });
 
 
 /* Actions */
-Mousetrap.bind('g n', function() {
-    $("#nav-btn-add").trigger("click");
+Mousetrap.bind('g n', () => {
+  $('#nav-btn-add').trigger('click');
 });
 
-Mousetrap.bind('esc', function() {
-    $(".close").trigger("click");
+Mousetrap.bind('esc', () => {
+  $('.close').trigger('click');
 });
 
 // Display the first element of the current view
-Mousetrap.bind('right', function() {
-    $("ul.data li:first-child span.dot-ellipsis a")[0].click();
+Mousetrap.bind('right', () => {
+  $('ul.data li:first-child span.dot-ellipsis a')[0].click();
 });
 
 /* Article view */
-Mousetrap.bind('o', function() {
-    $("ul.side-nav li:nth-child(2) a i")[0].click();
+Mousetrap.bind('o', () => {
+  $('ul.side-nav li:nth-child(2) a i')[0].click();
 });
 
-Mousetrap.bind('s', function() {
-    $("ul.side-nav li:nth-child(5) a i")[0].click();
+Mousetrap.bind('s', () => {
+  $('ul.side-nav li:nth-child(5) a i')[0].click();
 });
 
-Mousetrap.bind('a', function() {
-    $("ul.side-nav li:nth-child(4) a i")[0].click();
+Mousetrap.bind('a', () => {
+  $('ul.side-nav li:nth-child(4) a i')[0].click();
 });
 
-Mousetrap.bind('del', function() {
-    $("ul.side-nav li:nth-child(6) a i")[0].click();
+Mousetrap.bind('del', () => {
+  $('ul.side-nav li:nth-child(6) a i')[0].click();
 });
diff --git 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) {
   return split(term).pop();
 }
 
-export { split, extractLast };
+export default { split, extractLast };
diff --git a/app/Resources/static/themes/baggy/js/init.js b/app/Resources/static/themes/baggy/js/init.js
@@ -1,11 +1,17 @@
-import { savePercent, retrievePercent } from '../../_global/js/tools';
-import { toggleSaveLinkForm } from './uiTools';
+import $ from 'jquery';
+
+/* eslint-disable no-unused-vars */
+/* jquery has default scope */
+import cookie from 'jquery.cookie';
+import ui from 'jquery-ui-browserify';
+/* eslint-enable no-unused-vars */
 
-const $ = global.jquery = require('jquery');
-require('jquery.cookie');
-require('jquery-ui-browserify');
-const annotator = require('annotator');
+import annotator from 'annotator';
+
+import { savePercent, retrievePercent } from '../../_global/js/tools';
+import toggleSaveLinkForm from './uiTools';
 
+global.jquery = $;
 
 $.fn.ready(() => {
   const $listmode = $('#listmode');

diff --git a/app/Resources/static/themes/baggy/js/uiTools.js b/app/Resources/static/themes/baggy/js/uiTools.js
@@ -1,4 +1,4 @@
-const $ = require('jquery');
+import $ from 'jquery';
 
 function toggleSaveLinkForm(url, event) {
   $('#add-link-result').empty();
@@ -32,4 +32,4 @@ function toggleSaveLinkForm(url, event) {
   plainUrl.focus();
 }
 
-export { toggleSaveLinkForm };
+export default toggleSaveLinkForm;
diff --git a/app/Resources/static/themes/material/js/init.js b/app/Resources/static/themes/material/js/init.js
@@ -1,10 +1,10 @@
+import $ from 'jquery';
+import annotator from 'annotator';
 import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools';
 
-const $ = require('jquery');
+require('materialize'); // eslint-disable-line
 
 global.jQuery = $;
-require('materialize'); // eslint-disable-line
-const annotator = require('annotator');
 
 $(document).ready(() => {
   // sideNav

diff --git a/web/bundles/wallabagcore/themes/baggy/js/baggy.min.js b/web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
diff --git a/web/bundles/wallabagcore/themes/material/js/material.min.js b/web/bundles/wallabagcore/themes/material/js/material.min.js