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

FEATURE: upload placeholder

Browse source
This commit is contained in:
Régis Hanol 2015-09-09 23:14:06 +02:00
parent b34b3293a3
commit 38cb72b329
3 changed files with 17 additions and 2 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,6 +215,10 @@ Discourse.Utilities = {
}
},
getUploadPlaceholder: function(filename) {
return "[" + I18n.t("uploading_filename", { filename: filename }) + "]() ";
},
isAnImage: function(path) {
return (/\.(png|jpe?g|gif|bmp|tiff?|svg|webp)$/i).test(path);
},

14
app/assets/javascripts/discourse/views/composer.js.es6
View file

@ -322,8 +322,9 @@ const ComposerView = Ember.View.extend(Ember.Evented, {
this.messageBus.subscribe("/uploads/composer", upload => {
if (!cancelledByTheUser) {
if (upload && upload.url) {
const markdown = Discourse.Utilities.getUploadMarkdown(upload);
this.addMarkdown(markdown + " ");
const old = Discourse.Utilities.getUploadPlaceholder(upload.original_filename),
markdown = Discourse.Utilities.getUploadMarkdown(upload);
this.replaceMarkdown(old, markdown);
} else {
Discourse.Utilities.displayErrorForUpload(upload);
}
@ -350,6 +351,10 @@ const ComposerView = Ember.View.extend(Ember.Evented, {
this.get("controller").send("closeModal");
// deal with cancellation
cancelledByTheUser = false;
// add upload placeholder
const markdown = Discourse.Utilities.getUploadPlaceholder(data.files[0].name);
this.addMarkdown(markdown);
//
if (data["xhr"]) {
const jqHXR = data.xhr();
if (jqHXR) {
@ -502,6 +507,11 @@ const ComposerView = Ember.View.extend(Ember.Evented, {
});
},
replaceMarkdown(old, text) {
const reply = this.get("model.reply");
this.set("model.reply", reply.replace(old, text));
},
// Uses javascript to get the image sizes from the preview, if present
imageSizes() {
const result = {};

1
config/locales/client.en.yml
View file

@ -245,6 +245,7 @@ en:
upload: "Upload"
uploading: "Uploading..."
uploading_filename: "Uploading {{filename}}..."
uploaded: "Uploaded!"
enable: "Enable"