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 --- 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 - 8 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 web-ui/app/js/mail_view/ui/draft_button.js (limited to 'web-ui/app') 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 @@
-
-- cgit v1.2.3