summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnike Arni <anikarni@gmail.com>2017-01-20 11:20:55 -0200
committerGitHub <noreply@github.com>2017-01-20 11:20:55 -0200
commitb47fa1461c3dd919a193337afb035c14695cb900 (patch)
tree396f02d875d865749f26105620dffdee6c7864fa
parent1eeb5389781d2db1cc025c731dc3505a83248f61 (diff)
parente22e2a8da72e88d8378225eda13aa14b7dd974b9 (diff)
Merge pull request #903 from annacruz/remove-refresh-button
Removing refresh in mail page - issue #838
-rw-r--r--web-ui/app/js/mail_list_actions/ui/mail_list_actions.js3
-rw-r--r--web-ui/app/js/mail_list_actions/ui/refresh_trigger.js44
-rw-r--r--web-ui/app/js/views/templates.js1
-rw-r--r--web-ui/app/templates/mail_actions/actions_box.hbs1
-rw-r--r--web-ui/app/templates/mail_actions/refresh_trigger.hbs3
-rw-r--r--web-ui/app/templates/mail_actions/trash_actions_box.hbs1
6 files changed, 0 insertions, 53 deletions
diff --git a/web-ui/app/js/mail_list_actions/ui/mail_list_actions.js b/web-ui/app/js/mail_list_actions/ui/mail_list_actions.js
index 69e5fde4..c35c9ffd 100644
--- a/web-ui/app/js/mail_list_actions/ui/mail_list_actions.js
+++ b/web-ui/app/js/mail_list_actions/ui/mail_list_actions.js
@@ -22,7 +22,6 @@ define(
'page/events',
'page/router/url_params',
'mail_list_actions/ui/compose_trigger',
- 'mail_list_actions/ui/refresh_trigger',
'mail_list/domain/refresher',
'mail_list_actions/ui/toggle_check_all_trigger',
'mail_list_actions/ui/pagination_trigger',
@@ -39,7 +38,6 @@ define(
events,
urlParams,
composeTrigger,
- refreshTrigger,
refresher,
toggleCheckAllMailTrigger,
paginationTrigger,
@@ -55,7 +53,6 @@ define(
function mailsActions() {
this.render = function() {
this.$node.html(this.getActionsBoxTemplate());
- refreshTrigger.attachTo('#refresh-trigger');
composeTrigger.attachTo('#compose-trigger');
toggleCheckAllMailTrigger.attachTo('#toggle-check-all-emails');
paginationTrigger.attachTo('#pagination-trigger');
diff --git a/web-ui/app/js/mail_list_actions/ui/refresh_trigger.js b/web-ui/app/js/mail_list_actions/ui/refresh_trigger.js
deleted file mode 100644
index a16270d2..00000000
--- a/web-ui/app/js/mail_list_actions/ui/refresh_trigger.js
+++ /dev/null
@@ -1,44 +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/>.
- */
-define(
- [
- 'flight/lib/component',
- 'views/templates',
- 'page/events'
- ],
-
- function(defineComponent, templates, events) {
- 'use strict';
-
- return defineComponent(refreshTrigger);
-
- function refreshTrigger() {
- this.render = function() {
- this.$node.html(templates.mailActions.refreshTrigger);
- };
-
- this.refresh = function(event) {
- this.trigger(document, events.ui.mails.refresh);
- };
-
- this.after('initialize', function () {
- this.render();
- this.on('click', this.refresh);
- });
- }
- }
-);
diff --git a/web-ui/app/js/views/templates.js b/web-ui/app/js/views/templates.js
index d4185471..d983c911 100644
--- a/web-ui/app/js/views/templates.js
+++ b/web-ui/app/js/views/templates.js
@@ -53,7 +53,6 @@ define(['hbs/templates'], function (templates) {
actionsBox: window.Pixelated['app/templates/mail_actions/actions_box.hbs'],
trashActionsBox: window.Pixelated['app/templates/mail_actions/trash_actions_box.hbs'],
composeTrigger: window.Pixelated['app/templates/mail_actions/compose_trigger.hbs'],
- refreshTrigger: window.Pixelated['app/templates/mail_actions/refresh_trigger.hbs'],
paginationTrigger: window.Pixelated['app/templates/mail_actions/pagination_trigger.hbs']
},
noMessageSelected: window.Pixelated['app/templates/compose/no_message_selected.hbs'],
diff --git a/web-ui/app/templates/mail_actions/actions_box.hbs b/web-ui/app/templates/mail_actions/actions_box.hbs
index 68a8d0bf..7c195e0e 100644
--- a/web-ui/app/templates/mail_actions/actions_box.hbs
+++ b/web-ui/app/templates/mail_actions/actions_box.hbs
@@ -4,4 +4,3 @@
<li><input type="button" id="delete-selected" value="{{t 'delete'}}" disabled="disabled"/></li>
<li><input type="button" id="archive-selected" value="{{t 'archive'}}" disabled="disabled"/></li>
<li id="pagination-trigger" class="right"></li>
-<li id="refresh-trigger" class="right"></li>
diff --git a/web-ui/app/templates/mail_actions/refresh_trigger.hbs b/web-ui/app/templates/mail_actions/refresh_trigger.hbs
deleted file mode 100644
index dffc7090..00000000
--- a/web-ui/app/templates/mail_actions/refresh_trigger.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="refresh-mails-trigger">
- <i class="fa fa-refresh" data-label="{{t 'refresh'}}"></i>
-</div>
diff --git a/web-ui/app/templates/mail_actions/trash_actions_box.hbs b/web-ui/app/templates/mail_actions/trash_actions_box.hbs
index 4e0ec332..5c3656d7 100644
--- a/web-ui/app/templates/mail_actions/trash_actions_box.hbs
+++ b/web-ui/app/templates/mail_actions/trash_actions_box.hbs
@@ -2,4 +2,3 @@
<li><input type="button" id="delete-selected" value="{{t 'delete-permanently'}}" disabled="disabled"/></li>
<li><input type="button" id="recover-selected" value="{{t 'move-to-inbox'}}" disabled="disabled"/></li>
<li id="pagination-trigger" class="right"></li>
-<li id="refresh-trigger" class="right"></li>