From 75c96686560b9a4d12e0fec184f0f353b1e11aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 10 Oct 2020 23:01:32 -0400 Subject: [PATCH] fix: admin jquerui requires --- public/less/jquery-ui.less | 1 + public/src/admin/extend/plugins.js | 6 +++++- public/src/admin/extend/widgets.js | 7 ++++++- public/src/admin/modules/selectable.js | 4 +++- public/src/admin/settings/navigation.js | 9 ++++++++- public/src/modules/settings/sorted-list.js | 5 ++++- 6 files changed, 27 insertions(+), 5 deletions(-) diff --git a/public/less/jquery-ui.less b/public/less/jquery-ui.less index c5bea5e3dc..1f6e7ae03c 100644 --- a/public/less/jquery-ui.less +++ b/public/less/jquery-ui.less @@ -4,6 +4,7 @@ @import (inline) 'jquery-ui/themes/base/datepicker.css'; @import (inline) 'jquery-ui/themes/base/autocomplete.css'; @import (inline) 'jquery-ui/themes/base/resizable.css'; +@import (inline) 'jquery-ui/themes/base/selectable.css'; @import (inline) 'jquery-ui/themes/base/draggable.css'; @import (inline) 'jquery-ui/themes/base/sortable.css'; @import (inline) 'jquery-ui/themes/base/theme.css'; diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js index b007adea39..21637ed03c 100644 --- a/public/src/admin/extend/plugins.js +++ b/public/src/admin/extend/plugins.js @@ -1,7 +1,11 @@ 'use strict'; -define('admin/extend/plugins', ['jqueryui', 'translator', 'benchpress'], function (jqueryui, translator, Benchpress) { +define('admin/extend/plugins', [ + 'translator', + 'benchpress', + 'jquery-ui/widgets/sortable', +], function (translator, Benchpress) { var Plugins = {}; Plugins.init = function () { var pluginsList = $('.plugins'); diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js index 4991b9e6d2..fdb5c565e2 100644 --- a/public/src/admin/extend/widgets.js +++ b/public/src/admin/extend/widgets.js @@ -1,7 +1,12 @@ 'use strict'; -define('admin/extend/widgets', ['jqueryui'], function () { +define('admin/extend/widgets', [ + 'jquery-ui/widgets/sortable', + 'jquery-ui/widgets/draggable', + 'jquery-ui/widgets/droppable', + 'jquery-ui/widgets/datepicker', +], function () { var Widgets = {}; Widgets.init = function () { diff --git a/public/src/admin/modules/selectable.js b/public/src/admin/modules/selectable.js index bd45e6f850..34949a4e10 100644 --- a/public/src/admin/modules/selectable.js +++ b/public/src/admin/modules/selectable.js @@ -1,7 +1,9 @@ 'use strict'; -define('admin/modules/selectable', ['jqueryui'], function () { +define('admin/modules/selectable', [ + 'jquery-ui/widgets/selectable', +], function () { var selectable = {}; selectable.enable = function (containerEl, targets) { diff --git a/public/src/admin/settings/navigation.js b/public/src/admin/settings/navigation.js index 2209bb4fd1..9b4bba1155 100644 --- a/public/src/admin/settings/navigation.js +++ b/public/src/admin/settings/navigation.js @@ -1,7 +1,14 @@ 'use strict'; -define('admin/settings/navigation', ['translator', 'iconSelect', 'benchpress', 'jqueryui'], function (translator, iconSelect, Benchpress) { +define('admin/settings/navigation', [ + 'translator', + 'iconSelect', + 'benchpress', + 'jquery-ui/widgets/draggable', + 'jquery-ui/widgets/droppable', + 'jquery-ui/widgets/sortable', +], function (translator, iconSelect, Benchpress) { var navigation = {}; var available; diff --git a/public/src/modules/settings/sorted-list.js b/public/src/modules/settings/sorted-list.js index 4307cb6e83..c60b9ad4d2 100644 --- a/public/src/modules/settings/sorted-list.js +++ b/public/src/modules/settings/sorted-list.js @@ -1,6 +1,9 @@ 'use strict'; -define('settings/sorted-list', ['benchpress', 'jqueryui'], function (benchpress) { +define('settings/sorted-list', [ + 'benchpress', + 'jquery-ui/widgets/sortable', +], function (benchpress) { var SortedList; var Settings;