Add listener logic

1 files changed, 38 insertions, 35 deletions

diff --git a/app/src/main/assets/js/menu.js b/app/src/main/assets/js/menu.js
index 2c517ed2..4a39a93b 100644
--- a/app/src/main/assets/js/menu.js
+++ b/app/src/main/assets/js/menu.js
@@ -1,35 +1,38 @@
-var viewport = document.getElementById('viewport');
-var root = document.getElementById('root');
-var y = new MutationObserver(function(mutations) {
-  viewport.removeAttribute('style');
-  root.removeAttribute('style');
-});
-y.observe(viewport, {
-  attributes: true
-});
-y.observe(root, {
-  attributes: true
-});
-var x = new MutationObserver(function(mutations) {
-  var menuChildren = document.getElementsByClassName('mSideMenu');
-  if (menuChildren.length > 0) {
-    x.disconnect();
-    console.log('Found side menu');
-    var menu = menuChildren[0];
-    while (root.firstChild)
-      root.removeChild(root.firstChild);
-    while (menu.childNodes.length)
-      root.appendChild(menu.childNodes[0]);
-    Frost.emit(0);
-    setTimeout(function() {
-      y.disconnect();
-      console.log('Unhook styler');
-      Frost.handleHtml(document.documentElement.outerHTML);
-    }, 500);
-  }
-});
-x.observe(document.getElementById('mJewelNav'), {
-  childList: true,
-  subtree: true
-});
-document.getElementById('bookmarks_jewel').getElementsByTagName('a')[0].click();
+if (document.querySelector('#mJewelNav') !== null) {
+  console.log('Fetching menu');
+  var viewport = document.querySelector('#viewport');
+  var root = document.querySelector('#root');
+  var y = new MutationObserver(function(mutations) {
+    viewport.removeAttribute('style');
+    root.removeAttribute('style');
+  });
+  y.observe(viewport, {
+    attributes: true
+  });
+  y.observe(root, {
+    attributes: true
+  });
+  var x = new MutationObserver(function(mutations) {
+    var menu = document.querySelector('.mSideMenu');
+    if (menu !== null) {
+      x.disconnect();
+      console.log('Found side menu');
+      while (root.firstChild)
+        root.removeChild(root.firstChild);
+      while (menu.childNodes.length)
+        root.appendChild(menu.childNodes[0]);
+      Frost.emit(0);
+      setTimeout(function() {
+        y.disconnect();
+        console.log('Unhook styler');
+        Frost.handleHtml(document.documentElement.outerHTML);
+      }, 500);
+    }
+  });
+  x.observe(document.querySelector('#mJewelNav'), {
+    childList: true,
+    subtree: true
+  });
+  document.querySelector('#bookmarks_jewel').querySelector('a').click();
+}
+//otherwise we've already found the side nav and this is unnecessary