tqt/Ghost-Admin
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost-Admin.git synced 2023-12-14 02:33:04 +01:00
Code Issues Releases Wiki Activity

fix image uploader text handling (again) (#140)

Browse source 
closes TryGhost/Ghost#7127
- image uploader now handles "text" and "alt text" differently
This commit is contained in:
Austin Burdine 2016-07-24 03:19:49 -06:00 committed by Kevin Ansfield
parent 0e5ef10548
commit 7fc02c1007
6 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/components/gh-image-uploader.js
View file

@ -20,6 +20,7 @@ export default Component.extend({
image: null,
text: '',
altText: '',
saveButton: true,
dragClass: null,
@ -44,6 +45,12 @@ export default Component.extend({
return formData;
}),
description: computed('text', 'altText', function () {
let altText = this.get('altText');
return this.get('text') || (altText ? `Upload image of "${altText}"` : 'Upload an image');
}),
progressStyle: computed('uploadPercentage', function () {
let percentage = this.get('uploadPercentage');
let width = '';

2
app/templates/components/gh-ed-preview.hbs
View file

@ -4,7 +4,7 @@
{{#ember-wormhole to=uploader.destinationElementId}}
{{gh-image-uploader-with-preview
image=uploader.src
text=uploader.altText
altText=uploader.altText
update=(action "updateImageSrc" uploader.index)
remove=(action "updateImageSrc" uploader.index "")
uploadStarted=uploadStarted

4
app/templates/components/gh-image-uploader-with-preview.hbs
View file

@ -8,9 +8,11 @@
{{else}}
{{gh-image-uploader
text=text
altText=altText
update=(action 'update')
onInput=(action 'onInput')
uploadStarted=(action 'uploadStarted')
uploadFinished=(action 'uploadFinished')
formChanged=(action 'formChanged')}}
formChanged=(action 'formChanged')
}}
{{/if}}

6
app/templates/components/gh-image-uploader.hbs
View file

@ -15,8 +15,8 @@
{{#if showUploadForm}}
{{!-- file selection/drag-n-drop --}}
<div class="upload-form">
{{#gh-file-input multiple=false alt=text action=(action 'fileSelected') accept="image/gif,image/jpg,image/jpeg,image/png,image/svg+xml"}}
<div class="description">{{if text (concat "Upload image of " text) "Upload an image"}}</div>
{{#gh-file-input multiple=false alt=description action=(action 'fileSelected') accept="image/gif,image/jpg,image/jpeg,image/png,image/svg+xml"}}
<div class="description">{{description}}</div>
{{/gh-file-input}}
</div>
@ -30,7 +30,7 @@
{{#if saveButton}}
<button class="btn btn-blue gh-input" {{action 'saveUrl'}}>Save</button>
{{else}}
<div class="description">{{if text (concat "Upload image of " text) "Upload an image"}}</div>
<div class="description">{{description}}</div>
{{/if}}
</form>

3
app/templates/post-settings-menu.hbs
View file

@ -10,7 +10,8 @@
image=model.image
text="Add post image"
update=(action "setCoverImage")
remove=(action "clearCoverImage")}}
remove=(action "clearCoverImage")
}}
<form>
<div class="form-group">
<label for="url">Post URL</label>

9
tests/integration/components/gh-image-uploader-test.js
View file

@ -130,9 +130,14 @@ describeComponent(
});
describe('file upload form', function () {
it('renders form with supplied alt text', function () {
this.render(hbs`{{gh-image-uploader image=image altText="text test"}}`);
expect(this.$('.description').text().trim()).to.equal('Upload image of "text test"');
});
it('renders form with supplied text', function () {
this.render(hbs`{{gh-image-uploader image=image text="text test"}}`);
expect(this.$('.description').text().trim()).to.equal('Upload image of text test');
expect(this.$('.description').text().trim()).to.equal('text test');
});
it('generates request to correct endpoint', function (done) {
@ -433,7 +438,7 @@ describeComponent(
it('can render without a save button', function () {
this.render(hbs`{{gh-image-uploader image=image saveButton=false text="text test"}}`);
expect(this.$('button').length).to.equal(0);
expect(this.$('.description').text().trim()).to.equal('Upload image of text test');
expect(this.$('.description').text().trim()).to.equal('text test');
});
it('fires update action when save button clicked', function () {