From c5933fe1f8d3ca62dfc9eccff70a2c3a3699b7b0 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Wed, 27 Mar 2019 17:49:58 +0800
Subject: [PATCH 1/7] add description and preload for index html

---
 src/index.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/index.html b/src/index.html
index 64ee69ea87..207971298f 100755
--- a/src/index.html
+++ b/src/index.html
@@ -5,9 +5,10 @@
 
     <meta charset="UTF-8">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta http-equiv="Pragma"        content="no-cache" />
+    <meta http-equiv="Expires"       content="0" />
+    <meta name="viewport"            content="width=device-width, initial-scale=1">
+    <meta name="description"         content="Webtrader is an advanced trading platform that's fully-customisable according to your personal preferences with intuitive trading interface">
 
     <title>Binary.com : Webtrader</title>
 
@@ -32,7 +33,7 @@
     <link rel="icon" type="image/png" sizes="32x32" href="v<version>/lib/binary-style/src/images/favicons/favicon-32x32.png">
 
     <link rel="stylesheet" type="text/css" href="v<version>/lib/binary-style/binary.css">
-    <link rel="stylesheet" type="text/css" href="v<version>/index.css">
+    <link rel="preload" type="text/css" href="v<version>/index.css" as="style">
 
 </head>
 

From b769d983b1a2ce5fbce1a818b7413610917414ff Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Wed, 27 Mar 2019 19:09:20 +0800
Subject: [PATCH 2/7] refactor html and add trade navigation click

---
 src/index.html                 |  8 ++++----
 src/main.html                  |  3 ++-
 src/navigation/navigation.es6  | 16 ++++++++++++++++
 src/navigation/navigation.scss |  7 +------
 src/trade/tradeMenu.es6        |  2 --
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/index.html b/src/index.html
index 207971298f..bb05a5f93c 100755
--- a/src/index.html
+++ b/src/index.html
@@ -5,10 +5,10 @@
 
     <meta charset="UTF-8">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma"        content="no-cache" />
-    <meta http-equiv="Expires"       content="0" />
-    <meta name="viewport"            content="width=device-width, initial-scale=1">
-    <meta name="description"         content="Webtrader is an advanced trading platform that's fully-customisable according to your personal preferences with intuitive trading interface">
+    <meta http-equiv="Pragma" content="no-cache" />
+    <meta http-equiv="Expires" content="0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="Webtrader is an advanced trading platform that's fully-customisable according to your personal preferences with intuitive trading interface">
 
     <title>Binary.com : Webtrader</title>
 
diff --git a/src/main.html b/src/main.html
index f5a892961e..f6ad812d57 100755
--- a/src/main.html
+++ b/src/main.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="Webtrader is an advanced trading platform that's fully-customisable according to your personal preferences with intuitive trading interface">
     <title>Binary.com : Webtrader</title>
 
     <link rel="apple-touch-icon" sizes="57x57" href="lib/binary-style/src/images/favicons/apple-touch-icon-57x57.png">
@@ -60,7 +61,7 @@
     <noscript>
         <iframe src="//www.googletagmanager.com/ns.html?id=GTM-PDDC6F" height="0" width="0" style="display:none;visibility:hidden"></iframe>
     </noscript>
-    <script>
+    <script rel="preload">
         (function (w, d, s, l, i) {
             w[l] = w[l] || []; w[l].push({
                 'gtm.start':
diff --git a/src/navigation/navigation.es6 b/src/navigation/navigation.es6
index 5c96841bd5..5d2eb1e2b4 100644
--- a/src/navigation/navigation.es6
+++ b/src/navigation/navigation.es6
@@ -8,6 +8,13 @@ import workspace from '../workspace/workspace.js';
 import '../common/util';
 import 'css!navigation/navigation.css';
 
+const menu_selectors = [
+   '.trade',
+   '.instruments',
+   '.resources',
+   '.workspace',
+]
+
 const getType = (acc) => {
    let id = acc.loginid || acc.id;
    if(!acc || !id) return;
@@ -355,6 +362,15 @@ export const init = (callback) => {
    if (is_beta()) {
       root.find("a.config").closest('li').show();
    }
+      const nav_selector = 'nav #nav-menu';
+      const dialog_selector = `${nav_selector} .trade > ul`;
+      const visible = { 'visibility': 'visible', 'opacity': 1 };
+      const invisible = { 'visibility': 'invisible', 'opacity': 0 };
+      $(`${nav_selector} .trade`).click(() => {
+         $(dialog_selector).toggle( 'fast',
+            () => {$(dialog_selector).css(visible)}
+         );
+      });
 }
 
 export default {
diff --git a/src/navigation/navigation.scss b/src/navigation/navigation.scss
index 84c6d3d4bb..5c4a39a651 100644
--- a/src/navigation/navigation.scss
+++ b/src/navigation/navigation.scss
@@ -40,12 +40,7 @@ nav {
             visibility: hidden;
             z-index: 999999;
             opacity: 0;
-            transition: visibility 0.5s, opacity 0.1s linear 0.1s;
-         }
-         &:hover > ul {
-            visibility: visible;
-            opacity: 1;
-            transition: visibility 0s 0.1s;
+            transition: visibility 0.2s;
          }
       }
      .resources {
diff --git a/src/trade/tradeMenu.es6 b/src/trade/tradeMenu.es6
index ab87e9a7c3..f14216cbb8 100644
--- a/src/trade/tradeMenu.es6
+++ b/src/trade/tradeMenu.es6
@@ -55,8 +55,6 @@ export const init = () => {
       liveapi.events.on('login', refresh_active_symbols);
       liveapi.events.on('logout', refresh_active_symbols);
    });
-   /* refresh menu on mouse leave */
-   const trade = $("#nav-menu").find(".trade").on('mouseleave', refresh_active_symbols);
 }
 
 export default  { init };

From 3910de504a0b87aa93273584bb9586f303b93ee6 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Wed, 27 Mar 2019 19:15:06 +0800
Subject: [PATCH 3/7] handle click outside

---
 src/navigation/navigation.es6 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/navigation/navigation.es6 b/src/navigation/navigation.es6
index 5d2eb1e2b4..aba8f3a76e 100644
--- a/src/navigation/navigation.es6
+++ b/src/navigation/navigation.es6
@@ -371,6 +371,11 @@ export const init = (callback) => {
             () => {$(dialog_selector).css(visible)}
          );
       });
+      $(document).mouseup((e) => {
+         if (!$(dialog_selector).is(e.target) && $(dialog_selector).has(e.target).length === 0) {
+            $(dialog_selector).css(invisible);
+         }
+      })
 }
 
 export default {

From b51119867eedb579fe515f218bc9524452aa00f5 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Thu, 28 Mar 2019 10:19:53 +0800
Subject: [PATCH 4/7] fix dialog hide when click outside

---
 src/navigation/navigation.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/navigation/navigation.es6 b/src/navigation/navigation.es6
index aba8f3a76e..b50f1929e6 100644
--- a/src/navigation/navigation.es6
+++ b/src/navigation/navigation.es6
@@ -373,7 +373,7 @@ export const init = (callback) => {
       });
       $(document).mouseup((e) => {
          if (!$(dialog_selector).is(e.target) && $(dialog_selector).has(e.target).length === 0) {
-            $(dialog_selector).css(invisible);
+            $(dialog_selector).hide();
          }
       })
 }

From 17ed7c0a513b878816a1e86d326aeee3052b3086 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Thu, 28 Mar 2019 10:22:56 +0800
Subject: [PATCH 5/7] get for all selectors

---
 src/navigation/navigation.es6 | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/navigation/navigation.es6 b/src/navigation/navigation.es6
index b50f1929e6..60ae3da30d 100644
--- a/src/navigation/navigation.es6
+++ b/src/navigation/navigation.es6
@@ -362,20 +362,27 @@ export const init = (callback) => {
    if (is_beta()) {
       root.find("a.config").closest('li').show();
    }
+
+   menu_selectors.forEach((selector) => {
       const nav_selector = 'nav #nav-menu';
-      const dialog_selector = `${nav_selector} .trade > ul`;
-      const visible = { 'visibility': 'visible', 'opacity': 1 };
-      const invisible = { 'visibility': 'invisible', 'opacity': 0 };
-      $(`${nav_selector} .trade`).click(() => {
-         $(dialog_selector).toggle( 'fast',
-            () => {$(dialog_selector).css(visible)}
+      const dialog_selector = `${nav_selector} ${selector} > ul`;
+      const visible = {
+         'visibility': 'visible',
+         'opacity': 1
+      };
+      $(`${nav_selector} ${selector}`).click(() => {
+         $(dialog_selector).toggle('fast',
+            () => {
+               $(dialog_selector).css(visible)
+            }
          );
       });
       $(document).mouseup((e) => {
          if (!$(dialog_selector).is(e.target) && $(dialog_selector).has(e.target).length === 0) {
             $(dialog_selector).hide();
          }
-      })
+      });
+   });
 }
 
 export default {

From fef15a041e4e9c38c8c65bbd4d2451d3f67dc5d4 Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Thu, 28 Mar 2019 10:23:43 +0800
Subject: [PATCH 6/7] add comment

---
 src/navigation/navigation.es6 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/navigation/navigation.es6 b/src/navigation/navigation.es6
index 60ae3da30d..d17e8ead05 100644
--- a/src/navigation/navigation.es6
+++ b/src/navigation/navigation.es6
@@ -363,6 +363,7 @@ export const init = (callback) => {
       root.find("a.config").closest('li').show();
    }
 
+   // Handle click navigation to show menu dialog
    menu_selectors.forEach((selector) => {
       const nav_selector = 'nav #nav-menu';
       const dialog_selector = `${nav_selector} ${selector} > ul`;

From abf4cb7b9052a5fd0db59b968622fa97a769682a Mon Sep 17 00:00:00 2001
From: Amam Mustofa <mustofa@binary.com>
Date: Thu, 28 Mar 2019 14:23:49 +0800
Subject: [PATCH 7/7] fix navigation selector

---
 src/navigation/navigation.es6 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/navigation/navigation.es6 b/src/navigation/navigation.es6
index d17e8ead05..4755f01a41 100644
--- a/src/navigation/navigation.es6
+++ b/src/navigation/navigation.es6
@@ -367,19 +367,20 @@ export const init = (callback) => {
    menu_selectors.forEach((selector) => {
       const nav_selector = 'nav #nav-menu';
       const dialog_selector = `${nav_selector} ${selector} > ul`;
+      const current_selector = `${nav_selector} ${selector}`;
       const visible = {
          'visibility': 'visible',
          'opacity': 1
       };
-      $(`${nav_selector} ${selector}`).click(() => {
-         $(dialog_selector).toggle('fast',
+      $(current_selector).click((e) => {
+            $(dialog_selector).toggle('fast',
             () => {
                $(dialog_selector).css(visible)
             }
          );
       });
       $(document).mouseup((e) => {
-         if (!$(dialog_selector).is(e.target) && $(dialog_selector).has(e.target).length === 0) {
+         if (!$(current_selector).is(e.target) && $(current_selector).has(e.target).length === 0) {
             $(dialog_selector).hide();
          }
       });