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: do not process composer preview when collapsed (#13941)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2021-08-04 16:40:31 +02:00 committed by GitHub
parent 11668ee85b
commit 5b85b254db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/app/components/composer-editor.js
View File

@ -74,6 +74,7 @@ export default Component.extend(ComposerUpload, {
shouldBuildScrollMap: true, shouldBuildScrollMap: true,
scrollMap: null, scrollMap: null,
processPreview: true,
uploadMarkdownResolvers, uploadMarkdownResolvers,
uploadProcessorActions, uploadProcessorActions,

5
app/assets/javascripts/discourse/app/components/d-editor.js
View File

@ -252,6 +252,7 @@ export default Component.extend({
emojiPickerIsActive: false, emojiPickerIsActive: false,
emojiStore: service("emoji-store"), emojiStore: service("emoji-store"),
isEditorFocused: false, isEditorFocused: false,
processPreview: true,
@discourseComputed("placeholder") @discourseComputed("placeholder")
placeholderTranslated(placeholder) { placeholderTranslated(placeholder) {
@ -387,7 +388,7 @@ export default Component.extend({
}, },
_updatePreview() { _updatePreview() {
if (this._state !== "inDOM") { if (this._state !== "inDOM" || !this.processPreview) {
return; return;
} }
@ -453,7 +454,7 @@ export default Component.extend({
}); });
}, },
@observes("ready", "value") @observes("ready", "value", "processPreview")
_watchForChanges() { _watchForChanges() {
if (!this.ready) { if (!this.ready) {
return; return;

1
app/assets/javascripts/discourse/app/templates/components/composer-editor.hbs
View File

@ -8,6 +8,7 @@
importQuote=(action "importQuote") importQuote=(action "importQuote")
showUploadModal=showUploadModal showUploadModal=showUploadModal
togglePreview=(action "togglePreview") togglePreview=(action "togglePreview")
processPreview=processPreview
validation=validation validation=validation
loading=composer.loading loading=composer.loading
forcePreview=forcePreview forcePreview=forcePreview

1
app/assets/javascripts/discourse/app/templates/composer.hbs
View File

@ -127,6 +127,7 @@
cannotSeeMention=(action "cannotSeeMention") cannotSeeMention=(action "cannotSeeMention")
importQuote=(action "importQuote") importQuote=(action "importQuote")
togglePreview=(action "togglePreview") togglePreview=(action "togglePreview")
processPreview=showPreview
showToolbar=showToolbar showToolbar=showToolbar
afterRefresh=(action "afterRefresh") afterRefresh=(action "afterRefresh")
focusTarget=focusTarget}} focusTarget=focusTarget}}