From df887cba612304b38329a8a35b8a100f72ad0550 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sat, 19 Jun 2021 19:35:22 +0300 Subject: [PATCH] lib devPath --- Gruntfile.js | 2 - .../Espo/Resources/metadata/app/jsLibs.json | 3 +- client/src/app.js | 1 + client/src/loader.js | 6 + html/main.html | 9 +- package-lock.json | 105 +++++++++++++++++- package.json | 1 + 7 files changed, 118 insertions(+), 9 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 5c37407d14..fbe4aa4c49 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -34,8 +34,6 @@ const path = require('path'); module.exports = grunt => { - let clientLibList = []; - let jsFilesToMinify = [ 'node_modules/jquery/dist/jquery.js', 'node_modules/underscore/underscore.js', diff --git a/application/Espo/Resources/metadata/app/jsLibs.json b/application/Espo/Resources/metadata/app/jsLibs.json index 1b18696024..5ab38dea7f 100644 --- a/application/Espo/Resources/metadata/app/jsLibs.json +++ b/application/Espo/Resources/metadata/app/jsLibs.json @@ -24,7 +24,8 @@ "exportsAs": "select2" }, "Selectize": { - "path": "client/lib/selectize.min.js", + "path": "client/lib/selectize.js", + "devPath": "node_modules/selectize/dist/js/standalone/selectize.js", "exportsTo": "window", "exportsAs": "Selectize" }, diff --git a/client/src/app.js b/client/src/app.js index 3be8b8d55b..5261806f9f 100644 --- a/client/src/app.js +++ b/client/src/app.js @@ -220,6 +220,7 @@ define( this.language.loadDefault() ]) .then(() => { + this.loader.isDeveloperMode = this.settings.get('isDeveloperMode'); this.loader.addLibsConfig(this.settings.get('jsLibs') || {}); this.user = new User(); diff --git a/client/src/loader.js b/client/src/loader.js index 1f20781145..274e70f03e 100644 --- a/client/src/loader.js +++ b/client/src/loader.js @@ -43,6 +43,8 @@ var Espo = Espo || {classMap: {}}; this._dataLoaded = {}; this._loadingSubject = null; this._responseCache = null; + + this.isDeveloperMode = false; }; _.extend(Espo.Loader.prototype, { @@ -255,6 +257,10 @@ var Espo = Espo || {classMap: {}}; path = libData.path || path; + if (this.isDeveloperMode) { + path = libData.devPath || path; + } + exportsTo = libData.exportsTo || exportsTo; exportsAs = libData.exportsAs || exportsAs; } diff --git a/html/main.html b/html/main.html index fe2d838ab0..9862b3c3f0 100644 --- a/html/main.html +++ b/html/main.html @@ -16,17 +16,18 @@