Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: don't use the filename for the upload placeholder

This commit is contained in:
Régis Hanol 2015-09-22 17:45:55 +02:00
parent 18a8853181
commit a6934a200e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/lib/utilities.js
View File

@ -215,8 +215,8 @@ Discourse.Utilities = {
} }
}, },
getUploadPlaceholder: function(filename) { getUploadPlaceholder: function() {
return "[" + I18n.t("uploading_filename", { filename: filename }) + "]() "; return "[" + I18n.t("uploading") + "]() ";
}, },
isAnImage: function(path) { isAnImage: function(path) {

10
app/assets/javascripts/discourse/views/composer.js.es6
View File

@ -342,9 +342,9 @@ const ComposerView = Ember.View.extend(Ember.Evented, {
this.messageBus.subscribe("/uploads/composer", upload => { this.messageBus.subscribe("/uploads/composer", upload => {
if (!cancelledByTheUser) { if (!cancelledByTheUser) {
if (upload && upload.url) { if (upload && upload.url) {
const regex = new RegExp(`\\[${I18n.t("uploading")}.+?\\]\\(\\)`), const old = Discourse.Utilities.getUploadPlaceholder(),
markdown = Discourse.Utilities.getUploadMarkdown(upload); markdown = Discourse.Utilities.getUploadMarkdown(upload);
this.replaceMarkdown(regex, markdown); this.replaceMarkdown(old, markdown);
} else { } else {
Discourse.Utilities.displayErrorForUpload(upload); Discourse.Utilities.displayErrorForUpload(upload);
} }
@ -372,7 +372,7 @@ const ComposerView = Ember.View.extend(Ember.Evented, {
// deal with cancellation // deal with cancellation
cancelledByTheUser = false; cancelledByTheUser = false;
// add upload placeholder // add upload placeholder
const markdown = Discourse.Utilities.getUploadPlaceholder(data.files[0].name); const markdown = Discourse.Utilities.getUploadPlaceholder();
this.addMarkdown(markdown); this.addMarkdown(markdown);
if (data["xhr"]) { if (data["xhr"]) {
@ -527,9 +527,9 @@ const ComposerView = Ember.View.extend(Ember.Evented, {
}); });
}, },
replaceMarkdown(regex, text) { replaceMarkdown(old, text) {
const reply = this.get("model.reply"); const reply = this.get("model.reply");
this.set("model.reply", reply.replace(regex, text)); this.set("model.reply", reply.replace(old, text));
}, },
// Uses javascript to get the image sizes from the preview, if present // Uses javascript to get the image sizes from the preview, if present