From e61ee56031aa0788f9a40ec245d3c391d219d6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 31 Oct 2016 16:16:41 +0100 Subject: Added QRCode and link to configure android application --- app/Resources/static/themes/_global/js/tools.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index ab30deb1..00f5d501 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,5 +1,7 @@ const $ = require('jquery'); +var jrQrcode = require('jr-qrcode'); + function supportsLocalStorage() { try { return 'localStorage' in window && window.localStorage !== null; -- cgit v1.2.3 From 3b81212674bb4b2cf51ce51637e0093c952cefde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 31 Oct 2016 16:48:34 +0100 Subject: Added translations and baggy part --- app/Resources/static/themes/_global/js/tools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 00f5d501..9b23e4b5 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,6 +1,6 @@ const $ = require('jquery'); -var jrQrcode = require('jr-qrcode'); +import jrQrcode from 'jr-qrcode'; function supportsLocalStorage() { try { -- cgit v1.2.3 From 32508ef07aeb43966694ae360eeaeff8325e2a4d Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 3 Nov 2016 14:23:09 +0100 Subject: avoid eslint warning by disabling line Signed-off-by: Thomas Citharel --- app/Resources/static/themes/_global/js/tools.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/Resources/static/themes') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 9b23e4b5..55de090c 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,6 +1,7 @@ const $ = require('jquery'); -import jrQrcode from 'jr-qrcode'; +/* Allows inline call qr-code call */ +import jrQrcode from 'jr-qrcode'; // eslint-disable-line function supportsLocalStorage() { try { -- cgit v1.2.3