From 4d67429cf034ef4912bd78fb9dac91155ff0fec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 8 Jul 2016 15:23:38 +0200
Subject: [PATCH] Use an icon to set the email instead of a button with string
---
apps/files_sharing/css/sharetabview.css | 1 +
core/css/icons.css | 4 ++++
core/js/sharedialogmailview.js | 8 ++++----
core/js/tests/specs/sharedialogviewSpec.js | 4 ++--
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 66c8b4691eb..e048b7564ac 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -30,6 +30,7 @@
margin-left: 0;
}
.shareTabView input[type="text"].shareWithField,
+.shareTabView input[type="text"].emailField,
.shareTabView input[type="text"].linkText {
width: 80%;
}
diff --git a/core/css/icons.css b/core/css/icons.css
index 6d78363d3d5..1a632fdd58b 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -204,6 +204,10 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
background-image: url('../img/actions/mail.svg');
}
+.icon-mail-grey {
+ background-image: url('../img/actions/mail-grey.svg');
+}
+
.icon-menu {
background-image: url('../img/actions/menu.svg');
}
diff --git a/core/js/sharedialogmailview.js b/core/js/sharedialogmailview.js
index 84e3f3242ad..79741e92ac5 100644
--- a/core/js/sharedialogmailview.js
+++ b/core/js/sharedialogmailview.js
@@ -16,9 +16,9 @@
var TEMPLATE =
'{{#if shareAllowed}}' +
' {{#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="emailButton" class="emailButton" type="submit" value="{{mailButtonText}}" />' +
+ ' <a id="emailButton" class="icon icon-mail-grey" />' +
'</form>' +
' {{/if}}' +
'{{/if}}'
@@ -48,7 +48,7 @@
showLink: true,
events: {
- 'submit .emailPrivateLinkForm': '_onEmailPrivateLink'
+ 'click #emailButton': '_onEmailPrivateLink'
},
initialize: function(options) {
@@ -173,4 +173,4 @@
OC.Share.ShareDialogMailView = ShareDialogMailView;
-})();
\ No newline at end of file
+})();
diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
index 23214a7fe86..f0e027d9fb9 100644
--- a/core/js/tests/specs/sharedialogviewSpec.js
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -444,7 +444,7 @@ describe('OC.Share.ShareDialogView', function() {
dialog.render();
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(dialog.$el.find('.emailPrivateLinkForm .emailField').val()).toEqual('Sending ...');
@@ -463,7 +463,7 @@ describe('OC.Share.ShareDialogView', function() {
dialog.render();
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(dialog.$el.find('.emailPrivateLinkForm .emailField').val()).toEqual('Sending ...');
--
GitLab