codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: only remove custom CSS in admin on first load

Browse source
This commit is contained in:
Régis Hanol 2015-03-02 23:31:04 +01:00
parent 336c15672a
commit 1b2381d5a0
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/admin/views/admin.js.es6
View file

@ -1,6 +1,9 @@
export default Discourse.View.extend({
_disableCustomStylesheets: function() {
$("link.custom-css").attr("rel", "");
if (this.session.get("disableCustomCSS")) {
$("link.custom-css").attr("rel", "");
this.session.set("disableCustomCSS", false);
}
}.on("willInsertElement"),
_enableCustomStylesheets: function() {

5
app/helpers/application_helper.rb
View file

@ -153,11 +153,14 @@ module ApplicationHelper
MobileDetection.mobile_device?(request.user_agent)
end
def customization_disabled?
session[:disable_customization]
end
def loading_admin?
controller.class.name.split("::").first == "Admin"
end
def category_badge(category, opts=nil)
CategoryBadge.html_for(category, opts).html_safe
end

2
app/views/common/_discourse_javascript.html.erb
View file

@ -9,7 +9,6 @@
<script>
Ember.RSVP.configure('onerror', function(e) {
// Ignore TransitionAborted exceptions that bubble up
if (e && e.message === "TransitionAborted") { return; }
@ -43,6 +42,7 @@
Discourse.Route.mapRoutes();
Discourse.start();
Discourse.set('assetVersion','<%= Discourse.assets_digest %>');
Discourse.Session.currentProp("disableCustomCSS", <%= loading_admin? %>);
</script>
<%= script 'browser-update' %>