diff options
author | Allan Wang <me@allanwang.ca> | 2017-08-08 16:28:38 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-08 16:28:38 -0700 |
commit | 1e2a2d77169b5de968e29873e13a78a0d8c94a18 (patch) | |
tree | 6a9883f82205fb63ef3831996793631d6d878d5b /app/src/main/assets | |
parent | 397cc1f54725aee6fb542b08f965389272469309 (diff) | |
download | frost-1.4.1.1.tar.gz frost-1.4.1.1.tar.bz2 frost-1.4.1.1.zip |
* Update null
* Attempt to improve transparent theme backgrounds
* Update menu
* Move injections to visible method and reduce offset
* Update searchview and logging
* Clean temp strings and add network states
* Move console blacklist to web state
* Change some logs to info
Diffstat (limited to 'app/src/main/assets')
-rw-r--r-- | app/src/main/assets/js/menu.js | 18 | ||||
-rw-r--r-- | app/src/main/assets/js/menu.min.js | 23 |
2 files changed, 28 insertions, 13 deletions
diff --git a/app/src/main/assets/js/menu.js b/app/src/main/assets/js/menu.js index 7394c824..a43b1820 100644 --- a/app/src/main/assets/js/menu.js +++ b/app/src/main/assets/js/menu.js @@ -4,6 +4,8 @@ if (!window.hasOwnProperty('frost_menu')) { window.frost_menu = true; var viewport = document.querySelector('#viewport'); var root = document.querySelector('#root'); + if (!viewport) console.log('Menu.js: viewport is null'); + if (!root) console.log('Menu.js: root is null'); var y = new MutationObserver(function(mutations) { viewport.removeAttribute('style'); root.removeAttribute('style'); @@ -21,18 +23,24 @@ if (!window.hasOwnProperty('frost_menu')) { console.log('Found side menu'); while (root.firstChild) root.removeChild(root.firstChild); - while (menu.childNodes.length) - root.appendChild(menu.childNodes[0]); - Frost.emit(0); + while (menu.childNodes.length) { + console.log('append'); + viewport.appendChild(menu.childNodes[0]); + } + if (typeof Frost !== 'undefined') Frost.emit(0); setTimeout(function() { y.disconnect(); console.log('Unhook styler'); }, 500); } }); - x.observe(document.querySelector('#mJewelNav'), { + var jewel = document.querySelector('#mJewelNav'); + if (!jewel) console.log('Menu.js: jewel is null'); + x.observe(jewel, { childList: true, subtree: true }); - document.querySelector('#bookmarks_jewel').querySelector('a').click(); + var menuA = document.querySelector('#bookmarks_jewel').querySelector('a'); + if (!menuA) console.log('Menu.js: jewel is null') + menuA.click(); } diff --git a/app/src/main/assets/js/menu.min.js b/app/src/main/assets/js/menu.min.js index 5403e03a..5b65ac9b 100644 --- a/app/src/main/assets/js/menu.min.js +++ b/app/src/main/assets/js/menu.min.js @@ -1,8 +1,10 @@ if(!window.hasOwnProperty("frost_menu")){ console.log("Registering frost_menu"),window.frost_menu=!0 -;var viewport=document.querySelector("#viewport"),root=document.querySelector("#root"),y=new MutationObserver(function(e){ -viewport.removeAttribute("style"), -root.removeAttribute("style") +;var viewport=document.querySelector("#viewport"),root=document.querySelector("#root") +;viewport||console.log("Menu.js: viewport is null"), +root||console.log("Menu.js: root is null") +;var y=new MutationObserver(function(e){ +viewport.removeAttribute("style"),root.removeAttribute("style") }) ;y.observe(viewport,{ attributes:!0 @@ -13,14 +15,19 @@ attributes:!0 var o=document.querySelector(".mSideMenu") ;if(null!==o){ for(x.disconnect(),console.log("Found side menu");root.firstChild;)root.removeChild(root.firstChild) -;for(;o.childNodes.length;)root.appendChild(o.childNodes[0]) -;Frost.emit(0),setTimeout(function(){ +;for(;o.childNodes.length;)console.log("append"), +viewport.appendChild(o.childNodes[0]) +;"undefined"!=typeof Frost&&Frost.emit(0),setTimeout(function(){ y.disconnect(),console.log("Unhook styler") },500) } -}) -;x.observe(document.querySelector("#mJewelNav"),{ +}),jewel=document.querySelector("#mJewelNav") +;jewel||console.log("Menu.js: jewel is null"), +x.observe(jewel,{ childList:!0, subtree:!0 -}),document.querySelector("#bookmarks_jewel").querySelector("a").click() +}) +;var menuA=document.querySelector("#bookmarks_jewel").querySelector("a") +;menuA||console.log("Menu.js: jewel is null"), +menuA.click() }
\ No newline at end of file |