github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 09:12:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: properly load desktop and mobile only plugin css assets.

Browse Source 
5bd6b70d98
This commit is contained in:
Vinoth Kannan 2019-08-22 08:39:10 +05:30
parent 741d5bf541
commit 41f22946c3
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/common/_discourse_stylesheet.html.erb
View File

@ -12,6 +12,6 @@
<%= discourse_stylesheet_link_tag(mobile_view? ? :mobile_theme : :desktop_theme) %>
<%- end %>
<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?).each do |file| %>
<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?).each do |file| %>
<%= discourse_stylesheet_link_tag(file) %>
<%- end %>

11
lib/discourse.rb
View File

@ -215,9 +215,18 @@ module Discourse
end
def self.find_plugin_css_assets(args)
self.find_plugins(args).find_all do |plugin|
plugins = self.find_plugins(args)
assets = plugins.find_all do |plugin|
plugin.css_asset_exists?
end.map { |plugin| plugin.directory_name }
target = args[:mobile_view] ? :mobile : :desktop
assets += plugins.find_all do |plugin|
plugin.css_asset_exists?(target)
end.map { |plugin| "#{plugin.directory_name}_#{target}" }
assets
end
def self.find_plugin_js_assets(args)

11
lib/discourse_plugin_registry.rb
View File

@ -183,8 +183,15 @@ class DiscoursePluginRegistry
end
end
def self.stylesheets_exists?(plugin_directory_name)
self.stylesheets[plugin_directory_name].present? || self.mobile_stylesheets[plugin_directory_name].present? || self.desktop_stylesheets[plugin_directory_name].present?
def self.stylesheets_exists?(plugin_directory_name, target = nil)
case target
when :desktop
self.desktop_stylesheets[plugin_directory_name].present?
when :mobile
self.mobile_stylesheets[plugin_directory_name].present?
else
self.stylesheets[plugin_directory_name].present?
end
end
def self.register_seed_data(key, value)

4
lib/plugin/instance.rb
View File

@ -658,8 +658,8 @@ class Plugin::Instance
@directory_name ||= File.dirname(path).split("/").last
end
def css_asset_exists?
DiscoursePluginRegistry.stylesheets_exists?(directory_name)
def css_asset_exists?(target = nil)
DiscoursePluginRegistry.stylesheets_exists?(directory_name, target)
end
def js_asset_exists?