diff --git a/public/less/admin/general/navigation.less b/public/less/admin/general/navigation.less index 86fd3cae62..3e10639b89 100644 --- a/public/less/admin/general/navigation.less +++ b/public/less/admin/general/navigation.less @@ -3,6 +3,8 @@ width: 100%; min-height: 50px; border: 1px solid #eee; + overflow: auto; + .active { background-color: #eee; } diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js index 4ac3fdeaf0..799e3ae9bc 100644 --- a/public/src/admin/extend/widgets.js +++ b/public/src/admin/extend/widgets.js @@ -1,7 +1,7 @@ "use strict"; /* global define, app, socket */ -define('admin/extend/widgets', function() { +define('admin/extend/widgets', ['jqueryui'], function(jqueryui) { var Widgets = {}; Widgets.init = function() { diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js index 9ebdce555a..1837fc590f 100644 --- a/public/src/admin/general/navigation.js +++ b/public/src/admin/general/navigation.js @@ -1,7 +1,7 @@ "use strict"; /* global define, app, ajaxify, socket, templates */ -define('admin/general/navigation', ['translator', 'iconSelect'], function(translator, iconSelect) { +define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], function(translator, iconSelect, jqueryui) { var navigation = {}, available; @@ -21,7 +21,7 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl stop: drop }); }); - + $('#active-navigation').sortable().droppable({ accept: $('#available li .drag-item') }); diff --git a/public/src/admin/modules/selectable.js b/public/src/admin/modules/selectable.js index 815fa26d0f..5e4bb5725f 100644 --- a/public/src/admin/modules/selectable.js +++ b/public/src/admin/modules/selectable.js @@ -2,14 +2,12 @@ /*globals define*/ -define('admin/modules/selectable', function() { +define('admin/modules/selectable', ['jqueryui'], function(jqueryui) { var selectable = {}; selectable.enable = function(containerEl, targets) { - app.loadJQueryUI(function() { - $(containerEl).selectable({ - filter: targets - }); + $(containerEl).selectable({ + filter: targets }); }; diff --git a/src/meta/js.js b/src/meta/js.js index 3367734019..3d85c7efb1 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -80,7 +80,7 @@ module.exports = function(Meta) { modules: { "Chart.js": './node_modules/chart.js/dist/Chart.min.js', "mousetrap.js": './node_modules/mousetrap/mousetrap.js', - + "jqueryui.js": 'public/vendor/jquery/js/jquery-ui.js', "buzz.js": 'public/vendor/buzz/buzz.js' } }