wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 706644 - Going back from about:home still displays about:home [r=blassey]

Browse Source
This commit is contained in:
Mark Finkle 2011-12-02 11:12:43 -05:00
parent 4f75250356
commit 1de81ac3e5
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mobile/android/base/GeckoApp.java
View File

@ -655,6 +655,13 @@ abstract public class GeckoApp
final Tab tab = Tabs.getInstance().getTab(tabId);
if (tab == null)
return;
if (Tabs.getInstance().isSelectedTab(tab)) {
if (uri.equals("about:home"))
showAboutHome();
else
hideAboutHome();
}
String oldBaseURI = tab.getURL();
tab.updateURL(uri);
@ -873,8 +880,6 @@ abstract public class GeckoApp
mBrowserToolbar.setVisibility(View.VISIBLE);
}
});
} else if (event.equals("AboutHome:Show")) {
showAboutHome();
} else if (event.equals("AgentMode:Changed")) {
Tab.AgentMode agentMode = message.getString("agentMode").equals("mobile") ? Tab.AgentMode.MOBILE : Tab.AgentMode.DESKTOP;
int tabId = message.getInt("tabId");
@ -976,9 +981,8 @@ abstract public class GeckoApp
void handleAddTab(final int tabId, final String uri, final boolean selected) {
final Tab tab = Tabs.getInstance().addTab(tabId, uri);
if (selected) {
if (selected)
Tabs.getInstance().selectTab(tabId);
}
mMainHandler.post(new Runnable() {
public void run() {
@ -1364,7 +1368,6 @@ abstract public class GeckoApp
GeckoAppShell.registerGeckoEventListener("ToggleChrome:Hide", GeckoApp.mAppContext);
GeckoAppShell.registerGeckoEventListener("ToggleChrome:Show", GeckoApp.mAppContext);
GeckoAppShell.registerGeckoEventListener("AgentMode:Changed", GeckoApp.mAppContext);
GeckoAppShell.registerGeckoEventListener("AboutHome:Show", GeckoApp.mAppContext);
mConnectivityFilter = new IntentFilter();
mConnectivityFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
@ -1909,7 +1912,6 @@ abstract public class GeckoApp
}
public void loadUrl(String url, AwesomeBar.Type type) {
hideAboutHome();
mBrowserToolbar.setTitle(url);
Log.d(LOGTAG, type.name());
if (type == AwesomeBar.Type.ADD) {

15
mobile/android/chrome/content/aboutHome.xhtml
View File

@ -52,20 +52,5 @@
<link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
</head>
<body>
<script type="application/javascript;version=1.8"><![CDATA[
let Cc = Components.classes;
let Ci = Components.interfaces;
window.addEventListener("pageshow", onPageshow, false);
function onPageshow() {
let bridge = Cc["@mozilla.org/android/bridge;1"].getService(Ci.nsIAndroidBridge);
let obj = { gecko: {
type: "AboutHome:Show"
}
};
bridge.handleGeckoMessage(JSON.stringify(obj));
}
]]></script>
</body>
</html>