mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-01-16 20:42:58 +01:00
* fixes #4992 * make jquery ui a r.js module * require jqueryui in admin/extend/widgets
This commit is contained in:
@@ -3,6 +3,8 @@
|
||||
width: 100%;
|
||||
min-height: 50px;
|
||||
border: 1px solid #eee;
|
||||
overflow: auto;
|
||||
|
||||
.active {
|
||||
background-color: #eee;
|
||||
}
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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')
|
||||
});
|
||||
|
||||
@@ -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
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@@ -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'
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user