From fe51373f5a95323d64f6d966888a2c6c62a36deb Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 11 Mar 2018 19:24:32 -0400
Subject: Enhancement/debug mode (#779)

* Update changelog

* Improve debugger

* Remove need for mapping urls

* Remove excess logs

* Clean up
---
 app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt   | 2 +-
 app/src/main/kotlin/com/pitchedapps/frost/injectors/JsActions.kt  | 3 ++-
 app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/injectors')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
index 637a5092..6981fd1c 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
@@ -9,7 +9,7 @@ import android.webkit.WebView
  */
 enum class CssHider(vararg val items: String) : InjectorContract {
     CORE("[data-sigil=m_login_upsell]", "role=progressbar"),
-//    HEADER("#header", "[data-sigil=MTopBlueBarHeader]",
+    //    HEADER("#header", "[data-sigil=MTopBlueBarHeader]",
 //            "#header-notices", "[data-sigil*=m-promo-jewel-header]"),
     ADS("article[data-xt*=sponsor]",
             "article[data-store*=sponsor]"),
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsActions.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsActions.kt
index 7be8cd3c..b4926355 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsActions.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsActions.kt
@@ -16,6 +16,7 @@ enum class JsActions(body: String) : InjectorContract {
     LOGIN_CHECK("document.getElementById('signup-button')&&Frost.loadLogin();"),
     BASE_HREF("""document.write("<base href='$FB_URL_BASE'/>");"""),
     FETCH_BODY("""setTimeout(function(){var e=document.querySelector("main");e||(e=document.querySelector("body")),Frost.handleHtml(e.outerHTML)},1e2);"""),
+    RETURN_BODY("return(document.getElementsByTagName('html')[0].innerHTML);"),
     CREATE_POST(clickBySelector("button[name=view_overview]")),
 //    CREATE_MSG(clickBySelector("a[rel=dialog]")),
     /**
@@ -23,7 +24,7 @@ enum class JsActions(body: String) : InjectorContract {
      */
     EMPTY("");
 
-    val function = "!function(){$body}();"
+    val function = "(function(){$body})();"
 
     override fun inject(webView: WebView, callback: (() -> Unit)?) =
             JsInjector(function).inject(webView, callback)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt
index 2d067e44..1698ae13 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsInjector.kt
@@ -101,8 +101,7 @@ fun WebView.jsInject(vararg injectors: InjectorContract, callback: ((Int) -> Uni
 }
 
 fun FrostWebViewClient.jsInject(vararg injectors: InjectorContract,
-                                callback: ((Int) -> Unit)? = null)
-        = web.jsInject(*injectors, callback = callback)
+                                callback: ((Int) -> Unit)? = null) = web.jsInject(*injectors, callback = callback)
 
 /**
  * Wrapper class to convert a function into an injector
-- 
cgit v1.2.3