github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 07:11:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Improved Plugins SCSS management

Browse Source 
- Moves the import of plugins for both mobile and desktop from common after discourse loading, allowing plugins to overwrite
 - Make desktop-option behave like the mobile-option: SCSS/CSS marked with that option will only be loaded for desktop from now on and ignored in mobile
 - Add variables-keyword, allowing plugins to ship and overwrite variables before they get imported by discourse (great for theming)
This commit is contained in:
Benjamin Kampmann
2014-04-25 10:26:37 +02:00
parent 535965263a
commit 64918c35f5
8 changed files with 85 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
spec/components/plugin/instance_spec.rb
View File

@ -9,6 +9,8 @@ describe Plugin::Instance do
DiscoursePluginRegistry.server_side_javascripts.clear
DiscoursePluginRegistry.stylesheets.clear
DiscoursePluginRegistry.mobile_stylesheets.clear
DiscoursePluginRegistry.desktop_stylesheets.clear
DiscoursePluginRegistry.sass_variables.clear
end
context "find_all" do
@ -35,7 +37,7 @@ describe Plugin::Instance do
plugin.send :register_assets!
DiscoursePluginRegistry.mobile_stylesheets.count.should == 2
DiscoursePluginRegistry.mobile_stylesheets.count.should == 0
DiscoursePluginRegistry.stylesheets.count.should == 2
end
@ -45,7 +47,8 @@ describe Plugin::Instance do
plugin.send :register_assets!
DiscoursePluginRegistry.mobile_stylesheets.count.should == 0
DiscoursePluginRegistry.stylesheets.count.should == 1
DiscoursePluginRegistry.desktop_stylesheets.count.should == 1
DiscoursePluginRegistry.stylesheets.count.should == 0
end
it "registers mobile css properly" do
@ -57,6 +60,26 @@ describe Plugin::Instance do
DiscoursePluginRegistry.stylesheets.count.should == 0
end
it "registers desktop css properly" do
plugin = Plugin::Instance.new nil, "/tmp/test.rb"
plugin.register_asset("test.css", :desktop)
plugin.send :register_assets!
DiscoursePluginRegistry.desktop_stylesheets.count.should == 1
DiscoursePluginRegistry.stylesheets.count.should == 0
end
it "registers sass variable properly" do
plugin = Plugin::Instance.new nil, "/tmp/test.rb"
plugin.register_asset("test.css", :variables)
plugin.send :register_assets!
DiscoursePluginRegistry.sass_variables.count.should == 1
DiscoursePluginRegistry.stylesheets.count.should == 0
end
it "registers admin javascript properly" do
plugin = Plugin::Instance.new nil, "/tmp/test.rb"
plugin.register_asset("my_admin.js", :admin)
@ -116,6 +139,9 @@ describe Plugin::Instance do
plugin.register_asset("desktop.css", :desktop)
plugin.register_asset("desktop2.css", :desktop)
plugin.register_asset("variables1.scss", :variables)
plugin.register_asset("variables2.scss", :variables)
plugin.register_asset("code.js")
plugin.register_asset("server_side.js", :server_side)
@ -128,8 +154,10 @@ describe Plugin::Instance do
DiscoursePluginRegistry.javascripts.count.should == 3
DiscoursePluginRegistry.admin_javascripts.count.should == 2
DiscoursePluginRegistry.server_side_javascripts.count.should == 1
DiscoursePluginRegistry.stylesheets.count.should == 4
DiscoursePluginRegistry.mobile_stylesheets.count.should == 3
DiscoursePluginRegistry.desktop_stylesheets.count.should == 2
DiscoursePluginRegistry.sass_variables.count.should == 2
DiscoursePluginRegistry.stylesheets.count.should == 2
DiscoursePluginRegistry.mobile_stylesheets.count.should == 1
end
end