Weird merge error didn't account for isBackButtonBound

2026-04-23 00:00:09 +08:00 · 2012-06-22 10:37:33 -07:00
parent bf0df9f3c3
commit dcb127c14d
2 changed files with 6 additions and 1 deletions
@@ -208,7 +208,7 @@ public class App extends Plugin {
     * @return boolean
     */
    public boolean isBackbuttonOverridden() {
-        return this.cordova.isBackButtonBound();
+        return webView.isBackButtonBound();
    }

    /**
@@ -771,4 +771,9 @@ public class CordovaWebView extends WebView {
           keyUpCodes.add(keyCode);
       }
    }
+    
+    public boolean isBackButtonBound()
+    {
+        return this.bound;
+    }
 }