0
0
Fork 1
Spiegel von https://github.com/paviliondev/discourse-custom-wizard.git synchronisiert 2024-11-22 17:30:29 +01:00

prettified the file

Dieser Commit ist enthalten in:
Faizaan Gagan 2020-11-11 17:07:30 +05:30
Ursprung f096f7d05f
Commit 295eaf2b21

Datei anzeigen

@ -1,5 +1,8 @@
import ComposerEditor from "discourse/components/composer-editor"; import ComposerEditor from "discourse/components/composer-editor";
import { default as discourseComputed, on } from "discourse-common/utils/decorators"; import {
default as discourseComputed,
on,
} from "discourse-common/utils/decorators";
import { findRawTemplate } from "discourse-common/lib/raw-templates"; import { findRawTemplate } from "discourse-common/lib/raw-templates";
import { throttle } from "@ember/runloop"; import { throttle } from "@ember/runloop";
import { scheduleOnce, next } from "@ember/runloop"; import { scheduleOnce, next } from "@ember/runloop";
@ -12,7 +15,7 @@ import highlightSyntax from "discourse/lib/highlight-syntax";
import { getToken } from "wizard/lib/ajax"; import { getToken } from "wizard/lib/ajax";
import { import {
validateUploadedFiles, validateUploadedFiles,
getUploadMarkdown getUploadMarkdown,
} from "discourse/lib/uploads"; } from "discourse/lib/uploads";
import { cacheShortUploadUrl } from "pretty-text/upload-short-url"; import { cacheShortUploadUrl } from "pretty-text/upload-short-url";
import { alias } from "@ember/object/computed"; import { alias } from "@ember/object/computed";
@ -51,7 +54,7 @@ export default ComposerEditor.extend({
scheduleOnce("afterRender", () => $input.blur().focus()); scheduleOnce("afterRender", () => $input.blur().focus());
}, },
triggerRule: (textarea) => triggerRule: (textarea) =>
!inCodeBlock(textarea.value, caretPosition(textarea)) !inCodeBlock(textarea.value, caretPosition(textarea)),
}); });
} }
@ -65,19 +68,20 @@ export default ComposerEditor.extend({
this._bindUploadTarget(); this._bindUploadTarget();
}, },
@discourseComputed @discourseComputed
allowedFileTypes() { allowedFileTypes() {
return this.siteSettings.authorized_extensions.split('|') return this.siteSettings.authorized_extensions
.map(ext => "." + ext) .split("|")
.join(',') .map((ext) => "." + ext)
.join(",");
}, },
@discourseComputed('currentUser') @discourseComputed("currentUser")
uploadIcon(currentUser) { uploadIcon(currentUser) {
return uploadIcon(false, this.siteSettings); return uploadIcon(false, this.siteSettings);
}, },
_setUploadPlaceholderSend() { _setUploadPlaceholderSend() {
if (!this.composer.get("reply")) { if (!this.composer.get("reply")) {
this.composer.set("reply", ""); this.composer.set("reply", "");
@ -89,14 +93,10 @@ export default ComposerEditor.extend({
this._super(...arguments); this._super(...arguments);
const $element = $(this.element); const $element = $(this.element);
// adding dropZone property post initialization // adding dropZone property post initialization
$element.fileupload( $element.fileupload("option", "dropZone", $element);
'option',
'dropZone',
$element
);
$element.off("fileuploadsubmit"); $element.off("fileuploadsubmit");
$element.on("fileuploadsubmit", (e, data) => { $element.on("fileuploadsubmit", (e, data) => {
const max = this.siteSettings.simultaneous_uploads; const max = this.siteSettings.simultaneous_uploads;
@ -148,26 +148,26 @@ export default ComposerEditor.extend({
return isUploading; return isUploading;
}); });
$element.on("fileuploadprogressall", (e, data) => { $element.on("fileuploadprogressall", (e, data) => {
this.set( this.set(
"uploadProgress", "uploadProgress",
parseInt((data.loaded / data.total) * 100, 10) parseInt((data.loaded / data.total) * 100, 10)
); );
}); });
$element.on("fileuploadfail", (e, data) => { $element.on("fileuploadfail", (e, data) => {
this._setUploadPlaceholderDone(data); this._setUploadPlaceholderDone(data);
this._resetUpload(true); this._resetUpload(true);
const userCancelled = this._xhr && this._xhr._userCancelled; const userCancelled = this._xhr && this._xhr._userCancelled;
this._xhr = null; this._xhr = null;
if (!userCancelled) { if (!userCancelled) {
displayErrorForUpload(data, this.siteSettings); displayErrorForUpload(data, this.siteSettings);
} }
}); });
$element.on("fileuploadsend", (e, data) => { $element.on("fileuploadsend", (e, data) => {
this._pasted = false; this._pasted = false;
this._validUploads++; this._validUploads++;
@ -176,20 +176,20 @@ export default ComposerEditor.extend({
this.appEvents.trigger("wizard-editor:insert-text", { this.appEvents.trigger("wizard-editor:insert-text", {
fieldId: this.field.id, fieldId: this.field.id,
text: this.uploadPlaceholder text: this.uploadPlaceholder,
}); });
if (data.xhr && data.originalFiles.length === 1) { if (data.xhr && data.originalFiles.length === 1) {
this.set("isCancellable", true); this.set("isCancellable", true);
this._xhr = data.xhr(); this._xhr = data.xhr();
} }
}); });
$element.on("fileuploaddone", (e, data) => { $element.on("fileuploaddone", (e, data) => {
let upload = data.result; let upload = data.result;
this._setUploadPlaceholderDone(data); this._setUploadPlaceholderDone(data);
if (!this._xhr || !this._xhr._userCancelled) { if (!this._xhr || !this._xhr._userCancelled) {
const markdown = uploadMarkdownResolvers.reduce( const markdown = uploadMarkdownResolvers.reduce(
(md, resolver) => resolver(upload) || md, (md, resolver) => resolver(upload) || md,
@ -197,20 +197,18 @@ export default ComposerEditor.extend({
); );
cacheShortUploadUrl(upload.short_url, upload); cacheShortUploadUrl(upload.short_url, upload);
this.appEvents.trigger( this.appEvents.trigger("wizard-editor:replace-text", {
"wizard-editor:replace-text", { fieldId: this.field.id,
fieldId: this.field.id, oldVal: this.uploadPlaceholder.trim(),
oldVal: this.uploadPlaceholder.trim(), newVal: markdown,
newVal: markdown });
}
);
this._resetUpload(false); this._resetUpload(false);
} else { } else {
this._resetUpload(true); this._resetUpload(true);
} }
}); });
}, },
_resetUpload(removePlaceholder) { _resetUpload(removePlaceholder) {
next(() => { next(() => {
if (this._validUploads > 0) { if (this._validUploads > 0) {
@ -224,18 +222,16 @@ export default ComposerEditor.extend({
}); });
} }
if (removePlaceholder) { if (removePlaceholder) {
this.appEvents.trigger( this.appEvents.trigger("wizard-editor:replace-text", {
"wizard-editor:replace-text", { fieldId: this.field.id,
fieldId: this.field.id, oldVal: this.uploadPlaceholder,
oldVal: this.uploadPlaceholder, newVal: "",
newVal: "" });
}
);
} }
this._resetUploadFilenamePlaceholder(); this._resetUploadFilenamePlaceholder();
}); });
}, },
_registerImageScaleButtonClick($preview) { _registerImageScaleButtonClick($preview) {
const imageScaleRegex = /!\[(.*?)\|(\d{1,4}x\d{1,4})(,\s*\d{1,3}%)?(.*?)\]\((upload:\/\/.*?)\)(?!(.*`))/g; const imageScaleRegex = /!\[(.*?)\|(\d{1,4}x\d{1,4})(,\s*\d{1,3}%)?(.*?)\]\((upload:\/\/.*?)\)(?!(.*`))/g;
$preview.off("click", ".scale-btn").on("click", ".scale-btn", (e) => { $preview.off("click", ".scale-btn").on("click", ".scale-btn", (e) => {
@ -245,7 +241,7 @@ export default ComposerEditor.extend({
const matchingPlaceholder = this.get("composer.reply").match( const matchingPlaceholder = this.get("composer.reply").match(
imageScaleRegex imageScaleRegex
); );
if (matchingPlaceholder) { if (matchingPlaceholder) {
const match = matchingPlaceholder[index]; const match = matchingPlaceholder[index];
@ -254,19 +250,16 @@ export default ComposerEditor.extend({
imageScaleRegex, imageScaleRegex,
`![$1|$2, ${scale}%$4]($5)` `![$1|$2, ${scale}%$4]($5)`
); );
this.appEvents.trigger( this.appEvents.trigger("wizard-editor:replace-text", {
"wizard-editor:replace-text", fieldId: this.field.id,
{ oldVal: matchingPlaceholder[index],
fieldId: this.field.id, newVal: replacement,
oldVal: matchingPlaceholder[index], options: {
newVal: replacement, regex: imageScaleRegex,
options: { index,
regex: imageScaleRegex, },
index });
}
}
);
} }
} }
@ -274,17 +267,17 @@ export default ComposerEditor.extend({
return; return;
}); });
}, },
click(e) { click(e) {
if ($(e.target).hasClass('wizard-composer-hyperlink')) { if ($(e.target).hasClass("wizard-composer-hyperlink")) {
this.set('showHyperlinkBox', false); this.set("showHyperlinkBox", false);
} }
}, },
actions: { actions: {
extraButtons(toolbar) { extraButtons(toolbar) {
const component = this; const component = this;
if (this.allowUpload && this.uploadIcon && !this.site.mobileView) { if (this.allowUpload && this.uploadIcon && !this.site.mobileView) {
toolbar.addButton({ toolbar.addButton({
id: "upload", id: "upload",
@ -304,27 +297,27 @@ export default ComposerEditor.extend({
sendAction: (event) => component.set("showHyperlinkBox", true), sendAction: (event) => component.set("showHyperlinkBox", true),
}); });
}, },
previewUpdated($preview) { previewUpdated($preview) {
highlightSyntax($preview[0], this.siteSettings, this.session); highlightSyntax($preview[0], this.siteSettings, this.session);
this._super(...arguments); this._super(...arguments);
}, },
addLink(linkName, linkUrl) { addLink(linkName, linkUrl) {
let link = `[${linkName}](${linkUrl})`; let link = `[${linkName}](${linkUrl})`;
this.appEvents.trigger("wizard-editor:insert-text", { this.appEvents.trigger("wizard-editor:insert-text", {
fieldId: this.field.id, fieldId: this.field.id,
text: link text: link,
}); });
this.set("showHyperlinkBox", false); this.set("showHyperlinkBox", false);
}, },
hideBox() { hideBox() {
this.set("showHyperlinkBox", false); this.set("showHyperlinkBox", false);
}, },
showUploadModal() { showUploadModal() {
$(this.element.querySelector(".wizard-composer-upload")).trigger("click"); $(this.element.querySelector(".wizard-composer-upload")).trigger("click");
} },
}, },
}); });