From 29bfdd509d88aef16873207683302bec22bfe5a9 Mon Sep 17 00:00:00 2001
From: Bruno Wagner <bwagner@riseup.net>
Date: Tue, 5 Jan 2016 10:54:37 -0200
Subject: Revert "Issue #25 - Implemented shortcuts on UI"

This reverts commit aa66beb0c74ebaa950a083ed991f6e5f50f9c9ac.
This commit broke the functional tests, so we are reverting it
for now, while we fix it
---
 web-ui/app/js/page/default.js   |   5 +-
 web-ui/app/js/page/events.js    |   9 ---
 web-ui/app/js/page/shortcuts.js | 146 ----------------------------------------
 3 files changed, 1 insertion(+), 159 deletions(-)
 delete mode 100644 web-ui/app/js/page/shortcuts.js

(limited to 'web-ui/app/js/page')

diff --git a/web-ui/app/js/page/default.js b/web-ui/app/js/page/default.js
index 91c9c904..e33ec723 100644
--- a/web-ui/app/js/page/default.js
+++ b/web-ui/app/js/page/default.js
@@ -51,7 +51,6 @@ define(
     'mail_view/data/feedback_sender',
     'page/version',
     'page/unread_count_title',
-    'page/shortcuts'
   ],
 
   function (
@@ -89,8 +88,7 @@ define(
     feedbackBox,
     feedbackSender,
     version,
-    unreadCountTitle,
-    shortcuts) {
+    unreadCountTitle) {
 
     'use strict';
     function initialize(path) {
@@ -131,7 +129,6 @@ define(
       feedbackSender.attachTo(document);
 
       unreadCountTitle.attachTo(document);
-      shortcuts.attachTo(document);
     }
 
     return initialize;
diff --git a/web-ui/app/js/page/events.js b/web-ui/app/js/page/events.js
index 6d67e671..406c3b23 100644
--- a/web-ui/app/js/page/events.js
+++ b/web-ui/app/js/page/events.js
@@ -206,15 +206,6 @@ define(function () {
       tags: {
         refreshTagList: 'dispatchers:tag:refresh'
       }
-    },
-    shortcuts: {
-      openComposeBox: 'shortcuts:openComposeBox',
-      closeMail: 'shortcuts:closeMail',
-      focusSearchField: 'shortcuts:focusSearchField',
-      replyMail: 'shortcuts:replyMail',
-      replyAllMail: 'shortcuts:replyAllMail',
-      forwardMail: 'shortcuts:forwardMail',
-      deleteMail: 'shortcuts:deleteMail'
     }
   };
 
diff --git a/web-ui/app/js/page/shortcuts.js b/web-ui/app/js/page/shortcuts.js
deleted file mode 100644
index 2bb75d8c..00000000
--- a/web-ui/app/js/page/shortcuts.js
+++ /dev/null
@@ -1,146 +0,0 @@
-define([
-  'flight/lib/component',
-  'page/events'
-],
-function(defineComponent, events) {
-'use strict';
-
-  return defineComponent(shortcuts);
-
-  function shortcuts() {
-    function hasInputFieldFocused() {
-      return $('input').is(':focus') || $('textarea').is(':focus');
-    }
-
-    function triggerOpenComposeBoxEvent() {
-      if(!hasInputFieldFocused()){
-        this.trigger(document, events.shortcuts.openComposeBox);
-        event.preventDefault();
-      }
-    }
-
-    function triggerCloseBoxEvent() {
-      this.trigger(document, events.shortcuts.closeMail);
-      event.preventDefault();
-    }
-
-    function focusSearchField() {
-      if(!hasInputFieldFocused()) {
-        this.trigger(document, events.shortcuts.focusSearchField);
-        event.preventDefault();
-      }
-    }
-
-    function addTag() {
-      // TODO: refator to trigger an event that other component will handle
-      if(!hasInputFieldFocused()) {
-        event.preventDefault();
-        $('#new-tag-button').click();
-      }
-    }
-
-    function triggerReplyEvent() {
-      if(!hasInputFieldFocused() && $('#reply-button').is(':visible')) {
-        this.trigger(document, events.shortcuts.replyMail);
-      }
-    }
-
-    function triggerReplyAllEvent() {
-      if(!hasInputFieldFocused() && $('#reply-all-button').is(':visible')) {
-        this.trigger(document, events.shortcuts.replyAllMail);
-      }
-    }
-
-    function triggerForwardEvent() {
-      if(!hasInputFieldFocused() && $('#forward-button').is(':visible')) {
-        this.trigger(document, events.shortcuts.forwardMail);
-      }
-    }
-
-    function deleteMail() {
-      // TODO: refator to trigger an event that other component will handle
-      $('#delete-button-top').click();
-    }
-
-    function sendMail() {
-      // TODO: refator to trigger an event that other component will handle
-      $('#send-button').click();
-    }
-
-    function previousMail() {
-      if(!hasInputFieldFocused()) {
-        // TODO: implement previous mail logic
-        console.log('previous mail');
-      }
-    }
-
-    function nextMail() {
-      if(!hasInputFieldFocused()) {
-        // TODO: implement next mail logic
-        console.log('next mail');
-      }
-    }
-
-    var SPECIAL_CHARACTERES = {
-      13: 'ENTER',
-      27: 'ESC',
-      33: 'PAGE-UP',
-      34: 'PAGE-DOWN',
-      37: 'LEFT',
-      38: 'UP',
-      39: 'RIGHT',
-      40: 'DOWN',
-      191: '/'
-    };
-
-    var SHORTCUT_MAP =  {
-      'C': triggerOpenComposeBoxEvent,
-      'ESC': triggerCloseBoxEvent,
-      '/': focusSearchField,
-      'S': focusSearchField,
-      'T': addTag,
-      'R': triggerReplyEvent,
-      'A': triggerReplyAllEvent,
-      'F': triggerForwardEvent,
-      'SHIFT+3': deleteMail,
-      'CTRL+ENTER': sendMail,
-      'J': previousMail,
-      'UP': previousMail,
-      'K': nextMail,
-      'DOWN': nextMail
-    };
-
-    this.convertCodeToShortcut = function(event) {
-      var shortcut = '';
-      if(event.ctrlKey) {
-        shortcut += 'CTRL+';
-      }
-      if(event.altKey) {
-        shortcut += 'ALT+';
-      }
-      if(event.shiftKey) {
-        shortcut += 'SHIFT+';
-      }
-
-      if(SPECIAL_CHARACTERES.hasOwnProperty(event.which)) {
-        shortcut += SPECIAL_CHARACTERES[event.which];
-      } else {
-        shortcut += String.fromCharCode(event.which);
-      }
-
-      return shortcut;
-    };
-
-    this.riseEventFromShortcut = function(event) {
-      var shortcut = this.convertCodeToShortcut(event);
-
-      if(SHORTCUT_MAP.hasOwnProperty(shortcut)) {
-        SHORTCUT_MAP[shortcut].apply(this);
-      }
-    };
-
-    this.after('initialize', function() {
-      this.on(document, 'keydown', this.riseEventFromShortcut);
-    });
-  }
-});
-- 
cgit v1.2.3