Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-27 17:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: #8734, move sortable to package.json

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-10-10 23:24:13 -04:00
parent 75c9668656
commit cc705e5e2b
4 changed files with 14 additions and 1135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
install/package.json
View File

@@ -127,6 +127,7 @@
"socket.io-client": "2.3.1", "socket.io-client": "2.3.1",
"socket.io-redis": "5.4.0", "socket.io-redis": "5.4.0",
"socketio-wildcard": "2.0.0", "socketio-wildcard": "2.0.0",
"sortablejs": "^1.10.2",
"spdx-license-list": "^6.1.0", "spdx-license-list": "^6.1.0",
"spider-detector": "2.0.0", "spider-detector": "2.0.0",
"textcomplete": "^0.17.1", "textcomplete": "^0.17.1",

3
public/src/admin/manage/categories.js
View File

@@ -6,7 +6,8 @@ define('admin/manage/categories', [
'benchpress', 'benchpress',
'categorySelector', 'categorySelector',
'api', 'api',
], function (serialize, translator, Benchpress, categorySelector, api) { 'sortable',
], function (serialize, translator, Benchpress, categorySelector, api, Sortable) {
var Categories = {}; var Categories = {};
var newCategoryId = -1; var newCategoryId = -1;
var sortables; var sortables;

1132
public/vendor/jquery/sortable/Sortable.js vendored
View File

File diff suppressed because it is too large Load Diff

13
src/meta/js.js
View File

@@ -83,7 +83,6 @@ JS.scripts = {
admin: [ admin: [
'node_modules/material-design-lite/material.js', 'node_modules/material-design-lite/material.js',
'public/vendor/jquery/sortable/Sortable.js',
'public/vendor/colorpicker/colorpicker.js', 'public/vendor/colorpicker/colorpicker.js',
'public/src/admin/admin.js', 'public/src/admin/admin.js',
'public/vendor/jquery/serializeObject/jquery.ba-serializeobject.min.js', 'public/vendor/jquery/serializeObject/jquery.ba-serializeobject.min.js',
@@ -296,8 +295,18 @@ function requirejsOptimize(target, callback) {
name: 'bootbox', name: 'bootbox',
}, },
]; ];
const targetModules = {
admin: [
{
baseUrl: './node_modules/sortablejs',
name: 'sortable',
},
],
client: [
async.eachSeries(bundledModules, function (moduleCfg, next) { ],
};
async.eachSeries(bundledModules.concat(targetModules[target]), function (moduleCfg, next) {
requirejs.optimize({ ...sharedCfg, ...moduleCfg }, function () { requirejs.optimize({ ...sharedCfg, ...moduleCfg }, function () {
next(); next();
}, function (err) { }, function (err) {