IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Remove unused disabled_plugins checks (#13144)

Browse Source 
We now bundle Javascript for each theme/plugin separately, and only ship bundles for enabled plugins to the client. Therefore, these disabled_plugins checks are now redundant, and can be removed.
This commit is contained in:
David Taylor 2021-05-26 00:44:58 +01:00 committed by GitHub
parent 7a79bd7da3
commit 8c83803109
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/app/lib/plugin-connectors.js
View File

@ -1,4 +1,3 @@
import Site from "discourse/models/site";
import { buildRawConnectorCache } from "discourse-common/lib/raw-templates"; import { buildRawConnectorCache } from "discourse-common/lib/raw-templates";
import deprecated from "discourse-common/lib/deprecated"; import deprecated from "discourse-common/lib/deprecated";
@ -26,17 +25,8 @@ const DefaultConnectorClass = {
}; };
function findOutlets(collection, callback) { function findOutlets(collection, callback) {
const disabledPlugins = Site.currentProp("disabled_plugins") || [];
Object.keys(collection).forEach(function (res) { Object.keys(collection).forEach(function (res) {
if (res.indexOf("/connectors/") !== -1) { if (res.indexOf("/connectors/") !== -1) {
// Skip any disabled plugins
for (let i = 0; i < disabledPlugins.length; i++) {
if (res.indexOf("/" + disabledPlugins[i] + "/") !== -1) {
return;
}
}
const segments = res.split("/"); const segments = res.split("/");
let outletName = segments[segments.length - 2]; let outletName = segments[segments.length - 2];
const uniqueName = segments[segments.length - 1]; const uniqueName = segments[segments.length - 1];

1
app/assets/javascripts/discourse/tests/fixtures/site-fixtures.js vendored
View File

@ -4,7 +4,6 @@ export default {
"site.json": { "site.json": {
site: { site: {
default_archetype: "regular", default_archetype: "regular",
disabled_plugins: [],
shared_drafts_category_id: 24, shared_drafts_category_id: 24,
notification_types: NOTIFICATION_TYPES, notification_types: NOTIFICATION_TYPES,
post_types: { post_types: {

5
app/serializers/site_serializer.rb
View File

@ -12,7 +12,6 @@ class SiteSerializer < ApplicationSerializer
:top_menu_items, :top_menu_items,
:anonymous_top_menu_items, :anonymous_top_menu_items,
:uncategorized_category_id, # this is hidden so putting it here :uncategorized_category_id, # this is hidden so putting it here
:disabled_plugins,
:user_field_max_length, :user_field_max_length,
:post_action_types, :post_action_types,
:topic_flag_types, :topic_flag_types,
@ -118,10 +117,6 @@ class SiteSerializer < ApplicationSerializer
SiteSetting.uncategorized_category_id SiteSetting.uncategorized_category_id
end end
def disabled_plugins
Discourse.disabled_plugin_names
end
def user_field_max_length def user_field_max_length
UserField.max_length UserField.max_length
end end

6
plugins/styleguide/assets/javascripts/discourse/styleguide-route-map.js.es6
View File

@ -1,10 +1,4 @@
export default function () { export default function () {
const { disabled_plugins = [] } = this.site;
if (disabled_plugins.indexOf("styleguide") !== -1) {
return;
}
this.route("styleguide", function () { this.route("styleguide", function () {
this.route("show", { path: ":category/:section" }); this.route("show", { path: ":category/:section" });
}); });