summaryrefslogtreecommitdiff
path: root/web-ui
diff options
context:
space:
mode:
Diffstat (limited to 'web-ui')
-rw-r--r--web-ui/app/js/mail_view/ui/draft_button.js41
-rw-r--r--web-ui/app/js/mixins/with_mail_edit_base.js6
-rw-r--r--web-ui/app/locales/en-us/translation.json2
-rw-r--r--web-ui/app/locales/en/translation.json2
-rw-r--r--web-ui/app/locales/sv/translation.json1
-rw-r--r--web-ui/app/scss/styles.scss2
-rw-r--r--web-ui/app/templates/compose/compose_box.hbs1
-rw-r--r--web-ui/app/templates/compose/inline_box.hbs1
-rw-r--r--web-ui/test/spec/mail_view/ui/compose_box.spec.js16
-rw-r--r--web-ui/test/spec/mail_view/ui/draft_box.spec.js10
-rw-r--r--web-ui/test/spec/mail_view/ui/draft_button.spec.js40
11 files changed, 2 insertions, 120 deletions
diff --git a/web-ui/app/js/mail_view/ui/draft_button.js b/web-ui/app/js/mail_view/ui/draft_button.js
deleted file mode 100644
index 1a89c414..00000000
--- a/web-ui/app/js/mail_view/ui/draft_button.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) 2014 ThoughtWorks, Inc.
-*
-* Pixelated is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pixelated is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-*/
-'use strict';
-
-define([
- 'flight/lib/component',
- 'page/events',
-],
-function (defineComponent, events) {
- return defineComponent(draftButton);
-
- function draftButton() {
- this.enableButton = function () {
- this.$node.prop('disabled', false);
- };
-
- this.disableButton = function () {
- this.$node.prop('disabled', true);
- };
-
- this.after('initialize', function(){
- this.disableButton();
- this.on(document, events.mail.saveDraft, this.disableButton);
- this.on(document, events.mail.draftSaved, this.enableButton);
- });
- }
-});
diff --git a/web-ui/app/js/mixins/with_mail_edit_base.js b/web-ui/app/js/mixins/with_mail_edit_base.js
index b80a48cd..aa01e2cb 100644
--- a/web-ui/app/js/mixins/with_mail_edit_base.js
+++ b/web-ui/app/js/mixins/with_mail_edit_base.js
@@ -23,10 +23,9 @@ define(
'page/events',
'views/i18n',
'mail_view/ui/send_button',
- 'mail_view/ui/draft_button',
'flight/lib/utils'
],
- function(viewHelper, Recipients, DraftSaveStatus, events, i18n, SendButton, DraftButton, utils) {
+ function(viewHelper, Recipients, DraftSaveStatus, events, i18n, SendButton, utils) {
'use strict';
function withMailEditBase() {
@@ -34,7 +33,6 @@ define(
this.defaultAttrs({
bodyBox: '#text-box',
sendButton: '#send-button',
- draftButton: '#draft-button',
cancelButton: '#cancel-button',
trashButton: '#trash-button',
toArea: '#recipients-to-area',
@@ -93,10 +91,8 @@ define(
this.attr.recipientValues = context.recipients;
this.attachRecipients(context);
- this.on(this.select('draftButton'), 'click', this.buildAndSaveDraft);
this.on(this.select('trashButton'), 'click', this.trashMail);
SendButton.attachTo(this.select('sendButton'));
- DraftButton.attachTo(this.select('draftButton'));
this.warnSendButtonOfRecipients();
};
diff --git a/web-ui/app/locales/en-us/translation.json b/web-ui/app/locales/en-us/translation.json
index 4dd90e90..7c90926d 100644
--- a/web-ui/app/locales/en-us/translation.json
+++ b/web-ui/app/locales/en-us/translation.json
@@ -20,7 +20,6 @@
"Don't worry about recipients right now, you'll be able to add them just before sending.": "Don't worry about recipients right now, you'll be able to add them just before sending.",
"Send": "Send",
"Cancel": "Cancel",
- "Save Draft": "Save Draft",
"Reply": "Reply",
"Reply to All": "Reply to All",
"Mark as read": "Mark as read",
@@ -54,7 +53,6 @@
"not-signed": "Not signed",
"send-button": "Send",
"sending-mail": "Sending...",
- "draft-button": "Save Draft",
"trash-button": "Delete it",
"Search..." : "Search...",
"Search results for:": "Search results for:",
diff --git a/web-ui/app/locales/en/translation.json b/web-ui/app/locales/en/translation.json
index 5992216a..55074026 100644
--- a/web-ui/app/locales/en/translation.json
+++ b/web-ui/app/locales/en/translation.json
@@ -20,7 +20,6 @@
"Don't worry about recipients right now, you'll be able to add them just before sending.": "Don't worry about recipients right now, you'll be able to add them just before sending.",
"Send": "Send",
"Cancel": "Cancel",
- "Save Draft": "Save Draft",
"Reply": "Reply",
"Reply to All": "Reply to All",
"Mark as read": "Mark as read",
@@ -54,7 +53,6 @@
"not-signed": "Uncertified sender",
"send-button": "Send",
"sending-mail": "Sending...",
- "draft-button": "Save Draft",
"trash-button": "Delete it",
"Search..." : "Search...",
"Search results for:": "Search results for:",
diff --git a/web-ui/app/locales/sv/translation.json b/web-ui/app/locales/sv/translation.json
index 69557f6a..f4848d7a 100644
--- a/web-ui/app/locales/sv/translation.json
+++ b/web-ui/app/locales/sv/translation.json
@@ -20,7 +20,6 @@
"Don't worry about recipients right now, you'll be able to add them just before sending.": "Oroa dig inte över mottagare just nu, du kan lägga till dem senare.",
"Send": "Skicka",
"Cancel": "Avbryt",
- "Save Draft": "Spara utkast",
"Reply": "Svara",
"Reply to All": "Svara Alla",
"Mark as read": "Markera som läst",
diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss
index 7b1a2ec3..ce9f2300 100644
--- a/web-ui/app/scss/styles.scss
+++ b/web-ui/app/scss/styles.scss
@@ -509,7 +509,7 @@ button {
i {
margin-left: 5px;
}
- &#trash-button, &#draft-button {
+ &#trash-button {
background: #FFF;
border: 1px solid #999;
color: #999;
diff --git a/web-ui/app/templates/compose/compose_box.hbs b/web-ui/app/templates/compose/compose_box.hbs
index 05498946..6a703820 100644
--- a/web-ui/app/templates/compose/compose_box.hbs
+++ b/web-ui/app/templates/compose/compose_box.hbs
@@ -21,7 +21,6 @@
<div class="buttons-group columns">
<button id="send-button" tabindex="6"><i class="fa fa-send"></i></button>
<button id="trash-button" tabindex="7">{{t 'trash-button'}}<i class="fa fa-trash-o"></i></button>
- <button id="draft-button">{{t 'draft-button'}}<i class="fa fa-pencil"></i></button>
<div id="draft-save-status"></div>
</div>
diff --git a/web-ui/app/templates/compose/inline_box.hbs b/web-ui/app/templates/compose/inline_box.hbs
index f2e35d47..21ab7603 100644
--- a/web-ui/app/templates/compose/inline_box.hbs
+++ b/web-ui/app/templates/compose/inline_box.hbs
@@ -13,6 +13,5 @@
<div class="buttons-group columns">
<button id="send-button" tabindex=6><i class="fa fa-send"></i></button>
<button id="trash-button" tabindex=7>{{t 'trash-button'}}<i class="fa fa-trash-o"></i></button>
- <button id="draft-button">{{t 'draft-button'}}<i class="fa fa-pencil"></i></button>
<div id="draft-save-status"></div>
</div>
diff --git a/web-ui/test/spec/mail_view/ui/compose_box.spec.js b/web-ui/test/spec/mail_view/ui/compose_box.spec.js
index 8e07481a..4e43a2ff 100644
--- a/web-ui/test/spec/mail_view/ui/compose_box.spec.js
+++ b/web-ui/test/spec/mail_view/ui/compose_box.spec.js
@@ -120,22 +120,6 @@ describeComponent('mail_view/ui/compose_box', function () {
});
- describe('draft compose box', function() {
- it('should save a draft when click on draft button', function () {
- $(document).trigger(Pixelated.events.ui.recipients.updated, {recipientsName: 'to', newRecipients: ['fox@somewhere.com']});
-
- this.component.select('subjectBox').val('A new fancy subject!');
- var eventSpy = spyOnEvent(document, Pixelated.events.mail.saveDraft);
-
- this.component.select('draftButton').click();
-
- expect(eventSpy).toHaveBeenTriggeredOn(document);
- expect(eventSpy.mostRecentCall.data.header).toEqual(jasmine.objectContaining({
- to: ['fox@somewhere.com']
- }));
- });
- });
-
describe('subject label', function() {
var input;
var label;
diff --git a/web-ui/test/spec/mail_view/ui/draft_box.spec.js b/web-ui/test/spec/mail_view/ui/draft_box.spec.js
index be3b4039..96880adf 100644
--- a/web-ui/test/spec/mail_view/ui/draft_box.spec.js
+++ b/web-ui/test/spec/mail_view/ui/draft_box.spec.js
@@ -41,16 +41,6 @@ describeComponent('mail_view/ui/draft_box', function () {
});
- it('sending a draft sends the correct mailIdent', function () {
- this.setupComponent({mailIdent: mail.ident});
- this.component.trigger(this.component, Pixelated.events.mail.here, { mail: mail});
-
- var sendDraftEvent = spyOnEvent(document, Pixelated.events.mail.saveDraft);
- this.component.select('draftButton').click();
-
- expect(sendDraftEvent).toHaveBeenTriggeredOnAndWith(document, jasmine.objectContaining({ident: mail.ident}));
- });
-
it('shows no message selected pane when draft is sent', function() {
var openNoMessageSelectedEvent = spyOnEvent(document, Pixelated.events.dispatchers.rightPane.openNoMessageSelected);
diff --git a/web-ui/test/spec/mail_view/ui/draft_button.spec.js b/web-ui/test/spec/mail_view/ui/draft_button.spec.js
deleted file mode 100644
index de607507..00000000
--- a/web-ui/test/spec/mail_view/ui/draft_button.spec.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/* global Pixelated */
-
-describeComponent('mail_view/ui/draft_button', function(){
- 'use strict';
-
- describe('draft save button', function(){
- beforeEach(function(){
- this.setupComponent('<button></button>');
- });
-
- describe('after initialize', function(){
- it('should be disabled', function(){
- expect(this.$node).toBeDisabled();
- });
- });
-
- describe('when enabled', function(){
- beforeEach(function(){
- this.$node.prop('disabled', false);
- });
-
- it('should be disabled when saving draft message', function(){
- $(document).trigger(Pixelated.events.mail.saveDraft, {});
- expect(this.$node).toBeDisabled();
- });
- });
-
- describe('when disabled', function(){
- beforeEach(function(){
- this.$node.prop('disabled', true);
- });
-
- it('should be enabled when draft message has been saved', function(){
- $(document).trigger(Pixelated.events.mail.draftSaved, {});
- expect(this.$node).not.toBeDisabled();
- });
- });
-
- });
-});
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 09:40:33 +0000