From 45e8a4d588495fd581f7d8659e31f65cc369c839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 9 Oct 2020 11:48:52 -0400 Subject: [PATCH] fix: #8734 make nprogress module --- public/src/admin/admin.js | 12 +++++++----- src/meta/js.js | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js index 346255fc565a..bada187b5484 100644 --- a/public/src/admin/admin.js +++ b/public/src/admin/admin.js @@ -54,12 +54,14 @@ }); function setupNProgress() { - $(window).on('action:ajaxify.start', function () { - NProgress.set(0.7); - }); + require(['nprogress'], function (NProgress) { + $(window).on('action:ajaxify.start', function () { + NProgress.set(0.7); + }); - $(window).on('action:ajaxify.end', function () { - NProgress.done(); + $(window).on('action:ajaxify.end', function () { + NProgress.done(); + }); }); } diff --git a/src/meta/js.js b/src/meta/js.js index 16b136917736..3652878d7d39 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -94,7 +94,6 @@ JS.scripts = { 'public/vendor/jquery/serializeObject/jquery.ba-serializeobject.min.js', 'public/vendor/jquery/deserialize/jquery.deserialize.min.js', 'public/vendor/slideout/slideout.min.js', - 'node_modules/nprogress/nprogress.js', ], // modules listed below are built (/src/modules) so they can be defined anonymously @@ -106,6 +105,7 @@ JS.scripts = { 'zxcvbn.js': 'node_modules/zxcvbn/dist/zxcvbn.js', ace: 'node_modules/ace-builds/src-min', 'clipboard.js': 'node_modules/clipboard/dist/clipboard.min.js', + 'nprogress.js': 'node_modules/nprogress/nprogress.js', }, };