From de1e3408cc7d8a4beff703944c3659aeb9032fd2 Mon Sep 17 00:00:00 2001 From: Robin Doherty Date: Thu, 12 Nov 2015 20:25:53 +1100 Subject: remove save draft button, related css and js --- .../features/compose_save_draft_and_send.feature | 1 - service/test/functional/features/steps/compose.py | 5 --- .../test/functional/features/steps/mail_view.py | 1 - web-ui/app/js/mail_view/ui/draft_button.js | 41 ---------------------- web-ui/app/js/mixins/with_mail_edit_base.js | 6 +--- web-ui/app/locales/en-us/translation.json | 2 -- web-ui/app/locales/en/translation.json | 2 -- web-ui/app/locales/sv/translation.json | 1 - web-ui/app/scss/styles.scss | 2 +- web-ui/app/templates/compose/compose_box.hbs | 1 - web-ui/app/templates/compose/inline_box.hbs | 1 - web-ui/test/spec/mail_view/ui/compose_box.spec.js | 16 --------- web-ui/test/spec/mail_view/ui/draft_box.spec.js | 10 ------ web-ui/test/spec/mail_view/ui/draft_button.spec.js | 40 --------------------- 14 files changed, 2 insertions(+), 127 deletions(-) delete mode 100644 web-ui/app/js/mail_view/ui/draft_button.js delete mode 100644 web-ui/test/spec/mail_view/ui/draft_button.spec.js diff --git a/service/test/functional/features/compose_save_draft_and_send.feature b/service/test/functional/features/compose_save_draft_and_send.feature index 1a886d14..6c7f31c3 100644 --- a/service/test/functional/features/compose_save_draft_and_send.feature +++ b/service/test/functional/features/compose_save_draft_and_send.feature @@ -24,7 +24,6 @@ Feature: compose mail, save draft and send mail | subject | body | | Pixelated rocks! | You should definitely use it. Cheers, User. | And for the 'To' field I enter 'pixelated@friends.org' - And I save the draft When I select the tag 'drafts' When I open the first mail in the mail list And I send it diff --git a/service/test/functional/features/steps/compose.py b/service/test/functional/features/steps/compose.py index e93468a2..b73521ed 100644 --- a/service/test/functional/features/steps/compose.py +++ b/service/test/functional/features/steps/compose.py @@ -42,11 +42,6 @@ def choose_impl(context, recipients_field, to_type): find_element_by_css_selector(context, '.tt-dropdown-menu div div').click() -@when('I save the draft') -def save_impl(context): - context.browser.find_element_by_id('draft-button').click() - - @when('I send it') def send_impl(context): send_button = wait_until_element_is_visible_by_locator(context, (By.CSS_SELECTOR, '#send-button:enabled')) diff --git a/service/test/functional/features/steps/mail_view.py b/service/test/functional/features/steps/mail_view.py index 7a44f62d..82fc28af 100644 --- a/service/test/functional/features/steps/mail_view.py +++ b/service/test/functional/features/steps/mail_view.py @@ -81,7 +81,6 @@ def impl(context): @when('I forward this mail') def impl(context): - context.execute_steps(u'When I save the draft') # FIXME: this won't be necessary after #89 is done wait_until_button_is_visible(context, 'Send') click_button(context, 'Send') 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 . -*/ -'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 @@
-
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 @@
-
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(''); - }); - - 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(); - }); - }); - - }); -}); -- cgit v1.2.3