Bladeren bron

Use an icon to set the email instead of a button with string

tags/v10.0RC1
Thomas Müller 8 jaren geleden
bovenliggende
commit
4d67429cf0
No account linked to committer's email address

+ 1
- 0
apps/files_sharing/css/sharetabview.css Bestand weergeven

margin-left: 0; margin-left: 0;
} }
.shareTabView input[type="text"].shareWithField, .shareTabView input[type="text"].shareWithField,
.shareTabView input[type="text"].emailField,
.shareTabView input[type="text"].linkText { .shareTabView input[type="text"].linkText {
width: 80%; width: 80%;
} }

+ 4
- 0
core/css/icons.css Bestand weergeven

background-image: url('../img/actions/mail.svg'); background-image: url('../img/actions/mail.svg');
} }


.icon-mail-grey {
background-image: url('../img/actions/mail-grey.svg');
}

.icon-menu { .icon-menu {
background-image: url('../img/actions/menu.svg'); background-image: url('../img/actions/menu.svg');
} }

+ 4
- 4
core/js/sharedialogmailview.js Bestand weergeven

var TEMPLATE = var TEMPLATE =
'{{#if shareAllowed}}' + '{{#if shareAllowed}}' +
' {{#if mailPublicNotificationEnabled}}' + ' {{#if mailPublicNotificationEnabled}}' +
'<form id="emailPrivateLink" class="emailPrivateLinkForm">' +
'<form id="emailPrivateLink" class="emailPrivateLinkForm oneline">' +
' <input id="email" class="emailField" value="{{email}}" placeholder="{{mailPrivatePlaceholder}}" type="text" />' + ' <input id="email" class="emailField" value="{{email}}" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
' <input id="emailButton" class="emailButton" type="submit" value="{{mailButtonText}}" />' +
' <a id="emailButton" class="icon icon-mail-grey" />' +
'</form>' + '</form>' +
' {{/if}}' + ' {{/if}}' +
'{{/if}}' '{{/if}}'
showLink: true, showLink: true,


events: { events: {
'submit .emailPrivateLinkForm': '_onEmailPrivateLink'
'click #emailButton': '_onEmailPrivateLink'
}, },


initialize: function(options) { initialize: function(options) {


OC.Share.ShareDialogMailView = ShareDialogMailView; OC.Share.ShareDialogMailView = ShareDialogMailView;


})();
})();

+ 2
- 2
core/js/tests/specs/sharedialogviewSpec.js Bestand weergeven

dialog.render(); dialog.render();


dialog.$el.find('.emailPrivateLinkForm .emailField').val('a@b.c'); dialog.$el.find('.emailPrivateLinkForm .emailField').val('a@b.c');
dialog.$el.find('.emailPrivateLinkForm').trigger('submit');
dialog.$el.find('#emailButton').trigger('click');


expect(sendEmailPrivateLinkStub.callCount).toEqual(1); expect(sendEmailPrivateLinkStub.callCount).toEqual(1);
expect(dialog.$el.find('.emailPrivateLinkForm .emailField').val()).toEqual('Sending ...'); expect(dialog.$el.find('.emailPrivateLinkForm .emailField').val()).toEqual('Sending ...');
dialog.render(); dialog.render();


dialog.$el.find('.emailPrivateLinkForm .emailField').val('a@b.c'); dialog.$el.find('.emailPrivateLinkForm .emailField').val('a@b.c');
dialog.$el.find('.emailPrivateLinkForm').trigger('submit');
dialog.$el.find('#emailButton').trigger('click');


expect(sendEmailPrivateLinkStub.callCount).toEqual(1); expect(sendEmailPrivateLinkStub.callCount).toEqual(1);
expect(dialog.$el.find('.emailPrivateLinkForm .emailField').val()).toEqual('Sending ...'); expect(dialog.$el.find('.emailPrivateLinkForm .emailField').val()).toEqual('Sending ...');

Laden…
Annuleren
Opslaan