paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 11:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings_profile_fields: Use SortableJS as a module.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-07-27 15:50:12 -07:00
committed by Tim Abbott
parent 1d59fc272c
commit 114cc1ec25
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.json
View File

@@ -105,7 +105,6 @@
"MessageListData": false, "MessageListData": false,
"MessageListView": false, "MessageListView": false,
"Plotly": false, "Plotly": false,
"Sortable": false,
"UserSearch": false, "UserSearch": false,
"WinChan": false, "WinChan": false,
"activity": false, "activity": false,

7
frontend_tests/node_tests/settings_profile_fields.js
View File

@@ -1,7 +1,8 @@
const rewiremock = require("rewiremock/node");
set_global("page_params", {}); set_global("page_params", {});
set_global("$", global.make_zjquery()); set_global("$", global.make_zjquery());
set_global("loading", {}); set_global("loading", {});
set_global("Sortable", {create: () => {}});
const SHORT_TEXT_ID = 1; const SHORT_TEXT_ID = 1;
const CHOICE_ID = 3; const CHOICE_ID = 3;
@@ -29,7 +30,9 @@ page_params.custom_profile_field_types = {
}, },
}; };
zrequire("settings_profile_fields"); rewiremock.proxy(() => zrequire("settings_profile_fields"), {
sortablejs: {create: () => {}},
});
function test_populate(opts) { function test_populate(opts) {
const fields_data = opts.fields_data; const fields_data = opts.fields_data;

1
static/js/bundles/app.js
View File

@@ -11,7 +11,6 @@ import "winchan/winchan.js";
import "handlebars/dist/cjs/handlebars.runtime.js"; import "handlebars/dist/cjs/handlebars.runtime.js";
import "flatpickr/dist/flatpickr.js"; import "flatpickr/dist/flatpickr.js";
import "flatpickr/dist/plugins/confirmDate/confirmDate.js"; import "flatpickr/dist/plugins/confirmDate/confirmDate.js";
import "sortablejs/Sortable.js";
// Import App JS // Import App JS
import "../i18n.js"; import "../i18n.js";

1
static/js/bundles/common.js
View File

@@ -9,7 +9,6 @@ import "../../third/bootstrap/js/bootstrap.js";
import "../common.js"; import "../common.js";
import "moment/min/moment.min.js"; import "moment/min/moment.min.js";
import "moment-timezone/builds/moment-timezone-with-data.min.js"; import "moment-timezone/builds/moment-timezone-with-data.min.js";
import "sortablejs/Sortable.js";
import "../../third/bootstrap/css/bootstrap.css"; import "../../third/bootstrap/css/bootstrap.css";
import "../../third/bootstrap/css/bootstrap-btn.css"; import "../../third/bootstrap/css/bootstrap-btn.css";
import "../../third/bootstrap/css/bootstrap-responsive.css"; import "../../third/bootstrap/css/bootstrap-responsive.css";

2
static/js/settings_profile_fields.js
View File

@@ -1,3 +1,5 @@
const Sortable = require("sortablejs");
const render_admin_profile_field_list = require("../templates/admin_profile_field_list.hbs"); const render_admin_profile_field_list = require("../templates/admin_profile_field_list.hbs");
const render_settings_profile_field_choice = require("../templates/settings/profile_field_choice.hbs"); const render_settings_profile_field_choice = require("../templates/settings/profile_field_choice.hbs");

1
tools/webpack.config.ts
View File

@@ -247,7 +247,6 @@ export default (env?: string): webpack.Configuration[] => {
{path: "../static/js/debug.js"}, {path: "../static/js/debug.js"},
{path: "jquery/dist/jquery.js", name: ["$", "jQuery"]}, {path: "jquery/dist/jquery.js", name: ["$", "jQuery"]},
{path: "handlebars/dist/cjs/handlebars.runtime.js", name: "Handlebars"}, {path: "handlebars/dist/cjs/handlebars.runtime.js", name: "Handlebars"},
{path: "sortablejs/Sortable.js"},
{path: "winchan/winchan.js", name: "WinChan"}, {path: "winchan/winchan.js", name: "WinChan"},
]; ];
config.module.rules.unshift(...getExposeLoaders(exposeOptions)); config.module.rules.unshift(...getExposeLoaders(exposeOptions));