github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 16:46:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Trash icon displaying when there is no upload take 2.

Browse Source
This commit is contained in:
Guo Xiang Tan 2018-11-12 16:19:17 +08:00
parent d50f4fdd7a
commit c7377e2f2d
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/components/image-uploader.js.es6
View File

@ -6,7 +6,7 @@ export default Em.Component.extend(UploadMixin, {
@computed("imageUrl")
backgroundStyle(imageUrl) {
if (Em.isNone(imageUrl)) {
if (Em.isEmpty(imageUrl)) {
return "".htmlSafe();
}
@ -15,7 +15,7 @@ export default Em.Component.extend(UploadMixin, {
@computed("backgroundStyle")
hasBackgroundStyle(backgroundStyle) {
Ember.isEmpty(backgroundStyle);
return !Ember.isEmpty(backgroundStyle.string);
},
validateUploadedFilesOptions() {

24
test/javascripts/components/image-uploader-test.js.es6
View File

@ -1,10 +1,34 @@
import componentTest from "helpers/component-test";
moduleForComponent("image-uploader", { integration: true });
componentTest("with image", {
template: "{{image-uploader imageUrl='/some/upload.png'}}",
test(assert) {
assert.equal(
this.$(".d-icon-picture-o").length,
1,
"it displays the upload icon"
);
assert.equal(
this.$(".d-icon-trash-o").length,
1,
"it displays the trash icon"
);
}
});
componentTest("without image", {
template: "{{image-uploader}}",
test(assert) {
assert.equal(
this.$(".d-icon-picture-o").length,
1,
"it displays the upload icon"
);
assert.equal(
this.$(".d-icon-trash-o").length,
0,