From 416b2e029764097b4561f017fb5033fcd966d863 Mon Sep 17 00:00:00 2001
From: shilianghong <shiliang.hong01@gmail.com>
Date: Sat, 11 Jun 2016 15:27:53 -0700
Subject: [PATCH] Some bug fixes, add keyboard control to mention_menu, and
 some css changes

---
 src/inject/css.js          | 14 ++++++++-
 src/inject/mention_menu.js | 62 ++++++++++++++++++++++++++++++++++++++
 src/inject/preload.js      | 28 +++++++++--------
 3 files changed, 90 insertions(+), 14 deletions(-)

diff --git a/src/inject/css.js b/src/inject/css.js
index c20a2054..c7c593ba 100644
--- a/src/inject/css.js
+++ b/src/inject/css.js
@@ -62,7 +62,7 @@ CSSInjector.commonCSS = `
       display: none !important
     }
     /* Group mention: user selection box */
-    div#userSelectionBox select option:hover {
+    div#userSelectionBox select option:hover, div#userSelectionBox select option.hovered{
       background: #eeeeee;
     }
     div#userSelectionBox select option {
@@ -80,15 +80,19 @@ CSSInjector.commonCSS = `
       border: none;
       outline: none;
       height: inherit;
+      display: table;
     }
     div#userSelectionBox {
       box-shadow: 1px 1px 10px #ababab;
       background: #fff;
       display: none;
       position: fixed;
+      overflow-x:hidden;
+      overflow-y:auto;
       bottom: ${Common.MENTION_MENU_INITIAL_Y}px;
       left: ${Common.MENTION_MENU_INITIAL_X}px;
     }
+
     span.measure_text {
       padding-left: 20px;
       outline: 0;
@@ -111,4 +115,12 @@ CSSInjector.osxCSS = `
     }
 `;
 
+
+CSSInjector.enlargeEmoji = `
+    .message .custom_emoji{
+        width: 120px !important;
+        height: auto !important;
+    }
+`
+
 module.exports = CSSInjector;
diff --git a/src/inject/mention_menu.js b/src/inject/mention_menu.js
index 51ea7e31..aa642729 100644
--- a/src/inject/mention_menu.js
+++ b/src/inject/mention_menu.js
@@ -27,12 +27,21 @@ class MentionMenu {
     });
     $box.append($select);
     $('body').append($box);
+    MentionMenu.hideMenuWhenBlur();
   }
 
+
+
   static inject($event) {
     const $editArea = $($event.currentTarget);
     const $box = $('#userSelectionBox');
 
+    if($box.css('display') != 'none' && /^(40|38|32|27)$/.test($event.keyCode)){
+
+      MentionMenu.nevigateMenu($event,$box);
+      return;
+    }
+
     let $probe = $('<span id="probe"/>');
     $editArea.append($probe);
     let probePosition = $probe.position();
@@ -129,6 +138,59 @@ class MentionMenu {
 
     return $option;
   }
+
+  static hideMenuWhenBlur() {
+
+    $('#editArea').scope()['editAreaBlur'] = function() {
+      var oriFun = $('#editArea').scope()['editAreaBlur'];
+      return ($event) => {
+
+        oriFun.apply(this, $event);
+        if ($('#userSelectionBox').css('display') != 'none' && !$('#userSelectionBox').is(":hover")) {
+          $('#userSelectionBox').hide();
+        }
+      }
+    }()
+  }
+
+  static nevigateMenu($event, $box) {
+    switch ($event.keyCode) {
+
+      case 32:
+        if ($($box.find('.hovered')).length || $($box.find('option:hover')).length) {
+          var val = $($box.find('.hovered')).length ? $($box.find('.hovered')).val() : $($('#userSelectionBox').find('option:hover')).val();
+          $('#userSelectionBox > select').val(val).trigger('change');
+        }
+        break;
+
+      case 40:
+        $event.preventDefault();
+        var $currenSelc = $box.find('.hovered');
+        $currenSelc.removeClass('hovered');
+        if ($currenSelc.next().length) {
+          $currenSelc.next().addClass('hovered');
+        } else {
+          $($box.find('option')[0]).addClass('hovered');
+        }
+        break;
+
+      case 38:
+        $event.preventDefault();
+        var $currenSelc = $box.find('.hovered');
+        $currenSelc.removeClass('hovered');
+        if ($currenSelc.prev().length) {
+          $currenSelc.prev().addClass('hovered');
+        } else {
+          $box.find('option').last().addClass('hovered');
+        }
+        break;
+
+      case 27:
+        $box.hide();
+        $('#userSelectionBox > select').val('');
+        break;
+    }
+  }
 }
 
 module.exports = MentionMenu;
\ No newline at end of file
diff --git a/src/inject/preload.js b/src/inject/preload.js
index f65c8b3a..1b3e47a9 100644
--- a/src/inject/preload.js
+++ b/src/inject/preload.js
@@ -50,21 +50,23 @@ class Injector {
   }
 
   initInjectBundle() {
-    let initModules = ()=> {
-      if (!window.$) {
-        return setTimeout(initModules, 3000);
-      }
+    var self = this;
+    setTimeout(function(){
+
+        if (!window.$) {
+
+          self.initInjectBundle();
 
-      MentionMenu.init();
-      BadgeCount.init();
-    };
+        }else{
+
+          window.addEventListener('online', ()=> {
+                ipcRenderer.send('reload', true);
+          });
+          MentionMenu.init();
+          BadgeCount.init();
+        }
 
-    window.onload = () => {
-      initModules();
-      window.addEventListener('online', ()=> {
-        ipcRenderer.send('reload', true);
-      });
-    };
+    },1000)
   }
 
   transformResponse(value, constants) {