github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-29 23:38:09 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Allow file-change events soon after reloading (#13065)

Browse Source 
This patch remembers the last id for the `file-change` event and uses it
to initialize the client side watcher. This should help fix the issue
where styles are not reloaded client side if the browser refreshed.
This commit is contained in:
Robin Ward
2021-05-14 12:36:53 -04:00
committed by GitHub
parent d6b53b688d
commit 32d6d8308c
3 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
app/assets/javascripts/discourse/app/initializers/live-development.js
View File

@ -8,6 +8,7 @@ export default {
name: "live-development", name: "live-development",
initialize(container) { initialize(container) {
const messageBus = container.lookup("message-bus:main"); const messageBus = container.lookup("message-bus:main");
const session = container.lookup("session:main");
// Preserve preview_theme_id=## and pp=async-flamegraph parameters across pages // Preserve preview_theme_id=## and pp=async-flamegraph parameters across pages
const params = new URLSearchParams(window.location.search); const params = new URLSearchParams(window.location.search);
@ -48,32 +49,36 @@ export default {
} }
// Observe file changes // Observe file changes
messageBus.subscribe("/file-change", function (data) { messageBus.subscribe(
if (Handlebars.compile && !Ember.TEMPLATES.empty) { "/file-change",
// hbs notifications only happen in dev function (data) {
Ember.TEMPLATES.empty = Handlebars.compile("<div></div>"); if (Handlebars.compile && !Ember.TEMPLATES.empty) {
} // hbs notifications only happen in dev
data.forEach((me) => { Ember.TEMPLATES.empty = Handlebars.compile("<div></div>");
if (me === "refresh") {
// Refresh if necessary
document.location.reload(true);
} else {
$("link").each(function () {
if (me.hasOwnProperty("theme_id") && me.new_href) {
const target = $(this).data("target");
const themeId = $(this).data("theme-id");
if (
target === me.target &&
(!themeId || themeId === me.theme_id)
) {
refreshCSS(this, null, me.new_href);
}
} else if (this.href.match(me.name) && (me.hash || me.new_href)) {
refreshCSS(this, me.hash, me.new_href);
}
});
} }
}); data.forEach((me) => {
}); if (me === "refresh") {
// Refresh if necessary
document.location.reload(true);
} else {
$("link").each(function () {
if (me.hasOwnProperty("theme_id") && me.new_href) {
const target = $(this).data("target");
const themeId = $(this).data("theme-id");
if (
target === me.target &&
(!themeId || themeId === me.theme_id)
) {
refreshCSS(this, null, me.new_href);
}
} else if (this.href.match(me.name) && (me.hash || me.new_href)) {
refreshCSS(this, me.hash, me.new_href);
}
});
}
});
},
session.mbLastFileChangeId
);
}, },
}; };

4
app/assets/javascripts/discourse/app/pre-initializers/discourse-bootstrap.js
View File

@ -83,6 +83,10 @@ export default {
session.disableCustomCSS = setupData.disableCustomCss === "true"; session.disableCustomCSS = setupData.disableCustomCss === "true";
session.markdownItURL = setupData.markdownItUrl; session.markdownItURL = setupData.markdownItUrl;
if (setupData.mbLastFileChangeId) {
session.mbLastFileChangeId = parseInt(setupData.mbLastFileChangeId, 10);
}
if (setupData.safeMode) { if (setupData.safeMode) {
session.safe_mode = setupData.safeMode; session.safe_mode = setupData.safeMode;
} }

1
app/helpers/application_helper.rb
View File

@ -539,6 +539,7 @@ module ApplicationHelper
if ENV['DEBUG_PRELOADED_APP_DATA'] if ENV['DEBUG_PRELOADED_APP_DATA']
setup_data[:debug_preloaded_app_data] = true setup_data[:debug_preloaded_app_data] = true
end end
setup_data[:mb_last_file_change_id] = MessageBus.last_id('/file-change')
end end
if guardian.can_enable_safe_mode? && params["safe_mode"] if guardian.can_enable_safe_mode? && params["safe_mode"]