* fixes #4992

* make jquery ui a r.js module

* require jqueryui in admin/extend/widgets
v1.18.x
Julian Lam 9 years ago committed by GitHub
commit 20ae29cce3

@ -3,6 +3,8 @@
width: 100%; width: 100%;
min-height: 50px; min-height: 50px;
border: 1px solid #eee; border: 1px solid #eee;
overflow: auto;
.active { .active {
background-color: #eee; background-color: #eee;
} }

@ -1,7 +1,7 @@
"use strict"; "use strict";
/* global define, app, socket */ /* global define, app, socket */
define('admin/extend/widgets', function() { define('admin/extend/widgets', ['jqueryui'], function(jqueryui) {
var Widgets = {}; var Widgets = {};
Widgets.init = function() { Widgets.init = function() {

@ -1,7 +1,7 @@
"use strict"; "use strict";
/* global define, app, ajaxify, socket, templates */ /* 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 = {}, var navigation = {},
available; available;

@ -2,14 +2,12 @@
/*globals define*/ /*globals define*/
define('admin/modules/selectable', function() { define('admin/modules/selectable', ['jqueryui'], function(jqueryui) {
var selectable = {}; var selectable = {};
selectable.enable = function(containerEl, targets) { selectable.enable = function(containerEl, targets) {
app.loadJQueryUI(function() { $(containerEl).selectable({
$(containerEl).selectable({ filter: targets
filter: targets
});
}); });
}; };

@ -80,7 +80,7 @@ module.exports = function(Meta) {
modules: { modules: {
"Chart.js": './node_modules/chart.js/dist/Chart.min.js', "Chart.js": './node_modules/chart.js/dist/Chart.min.js',
"mousetrap.js": './node_modules/mousetrap/mousetrap.js', "mousetrap.js": './node_modules/mousetrap/mousetrap.js',
"jqueryui.js": 'public/vendor/jquery/js/jquery-ui.js',
"buzz.js": 'public/vendor/buzz/buzz.js' "buzz.js": 'public/vendor/buzz/buzz.js'
} }
} }

Loading…
Cancel
Save