You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/08/20 00:14:14 UTC
[1/4] git commit: add "clearallcache" and "clearsessioncache" option
to InAppbrowser
Updated Branches:
refs/heads/dev 3b38378c1 -> be364c081
add "clearallcache" and "clearsessioncache" option to InAppbrowser
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/629964d6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/629964d6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/629964d6
Branch: refs/heads/dev
Commit: 629964d61cf9f6e57e96950791b0e7f6aa8bf340
Parents: 57126a4
Author: kira <ca...@gmail.com>
Authored: Sat May 4 17:21:43 2013 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Fri Aug 9 00:16:47 2013 -0400
----------------------------------------------------------------------
src/android/InAppBrowser.java | 30 +++++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/629964d6/src/android/InAppBrowser.java
----------------------------------------------------------------------
diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java
index 581a4a0..fedfa0d 100644
--- a/src/android/InAppBrowser.java
+++ b/src/android/InAppBrowser.java
@@ -51,6 +51,7 @@ import android.view.WindowManager;
import android.view.WindowManager.LayoutParams;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
+import android.webkit.CookieManager;
import android.webkit.WebChromeClient;
import android.webkit.GeolocationPermissions.Callback;
import android.webkit.JsPromptResult;
@@ -78,6 +79,9 @@ public class InAppBrowser extends CordovaPlugin {
private static final String LOAD_STOP_EVENT = "loadstop";
private static final String LOAD_ERROR_EVENT = "loaderror";
private static final String CLOSE_BUTTON_CAPTION = "closebuttoncaption";
+ private static final String CLEAR_ALL_CACHE = "clearallcache";
+ private static final String CLEAR_SESSION_CACHE = "clearsessioncache";
+
private long MAX_QUOTA = 100 * 1024 * 1024;
private Dialog dialog;
@@ -87,7 +91,9 @@ public class InAppBrowser extends CordovaPlugin {
private boolean showLocationBar = true;
private boolean openWindowHidden = false;
private String buttonLabel = "Done";
-
+ private boolean clearAllCache= false;
+ private boolean clearSessionCache=false;
+
/**
* Executes the request and returns PluginResult.
*
@@ -382,9 +388,18 @@ public class InAppBrowser extends CordovaPlugin {
showLocationBar = show.booleanValue();
}
Boolean hidden = features.get(HIDDEN);
- if(hidden != null) {
+ if (hidden != null) {
openWindowHidden = hidden.booleanValue();
}
+ Boolean cache = features.get(CLEAR_ALL_CACHE);
+ if (cache != null) {
+ clearAllCache = cache.booleanValue();
+ } else {
+ cache = features.get(CLEAR_SESSION_CACHE);
+ if (cache != null) {
+ clearSessionCache = cache.booleanValue();
+ }
+ }
}
final CordovaWebView thatWebView = this.webView;
@@ -522,14 +537,19 @@ public class InAppBrowser extends CordovaPlugin {
//Toggle whether this is enabled or not!
Bundle appSettings = cordova.getActivity().getIntent().getExtras();
boolean enableDatabase = appSettings == null ? true : appSettings.getBoolean("InAppBrowserStorageEnabled", true);
- if(enableDatabase)
- {
+ if (enableDatabase) {
String databasePath = cordova.getActivity().getApplicationContext().getDir("inAppBrowserDB", Context.MODE_PRIVATE).getPath();
settings.setDatabasePath(databasePath);
settings.setDatabaseEnabled(true);
}
settings.setDomStorageEnabled(true);
-
+
+ if (clearAllCache) {
+ CookieManager.getInstance().removeAllCookie();
+ } else if (clearSessionCache) {
+ CookieManager.getInstance().removeSessionCookie();
+ }
+
inAppWebView.loadUrl(url);
inAppWebView.setId(6);
inAppWebView.getSettings().setLoadWithOverviewMode(true);
[3/4] git commit: [Windows8] add support for Windows 8 ( limited )
Posted by st...@apache.org.
[Windows8] add support for Windows 8 ( limited )
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/e5840eef
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/e5840eef
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/e5840eef
Branch: refs/heads/dev
Commit: e5840eef45492db3ca1ef167133125a0cfc5a7bb
Parents: 0916db9
Author: purplecabbage <pu...@gmail.com>
Authored: Mon Aug 12 13:51:54 2013 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Mon Aug 12 13:52:43 2013 -0700
----------------------------------------------------------------------
plugin.xml | 7 ++
www/windows8/InAppBrowserProxy.js | 117 +++++++++++++++++++++++++++++++++
2 files changed, 124 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/e5840eef/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 0ae3936..4c5bd62 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -65,6 +65,13 @@
<source-file src="src/wp/InAppBrowser.cs" />
</platform>
+
+ <!-- windows8 -->
+ <platform name="windows8">
+ <js-module src="www/windows8/InAppBrowserProxy.js" name="InAppBrowserProxy">
+ <merges target="" />
+ </js-module>
+ </platform>
</plugin>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/e5840eef/www/windows8/InAppBrowserProxy.js
----------------------------------------------------------------------
diff --git a/www/windows8/InAppBrowserProxy.js b/www/windows8/InAppBrowserProxy.js
new file mode 100644
index 0000000..9928d19
--- /dev/null
+++ b/www/windows8/InAppBrowserProxy.js
@@ -0,0 +1,117 @@
+cordova.define("org.apache.cordova.core.inappbrowser.InAppBrowserProxy", function(require, exports, module) { /*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+/*global Windows:true */
+
+
+
+var cordova = require('cordova'),
+ channel = require('cordova/channel');
+
+var browserWrap;
+
+var IAB = {
+
+ close: function (win,lose) {
+ if (browserWrap) {
+ browserWrap.parentNode.removeChild(browserWrap);
+ browserWrap = null;
+ }
+ },
+ show: function (win,lose) {
+ if (browserWrap) {
+
+ }
+ },
+ open: function (win,lose,args) {
+ var strUrl = args[0];
+ var target = args[1];
+ var features = args[2];
+
+ if (target == "_system") {
+ var url = new Windows.Foundation.Uri(strUrl)
+ Windows.System.Launcher.launchUriAsync(url);
+ }
+ else if (target == "_blank") {
+ if (!browserWrap) {
+ browserWrap = document.createElement("div");
+ browserWrap.style.position = "absolute";
+ browserWrap.style.width = (window.innerWidth - 80) + "px";
+ browserWrap.style.height = (window.innerHeight - 80) + "px";
+ browserWrap.style.borderWidth = "40px";
+ browserWrap.style.borderStyle = "solid";
+ browserWrap.style.borderColor = "rgba(0,0,0,0.25)";
+
+ browserWrap.onclick = function () {
+ setTimeout(function () {
+ IAB.close();
+ }, 0);
+ }
+
+ document.body.appendChild(browserWrap);
+ }
+
+ var elem = document.createElement("iframe");
+ elem.style.width = (window.innerWidth - 80)+ "px";
+ elem.style.height = (window.innerHeight - 80) + "px";
+ elem.style.borderWidth = "0px";
+ elem.name = "targetFrame";
+ elem.src = strUrl;
+
+ window.addEventListener("resize", function () {
+ if (browserWrap && elem) {
+ elem.style.width = (window.innerWidth - 80) + "px";
+ elem.style.height = (window.innerHeight - 80) + "px";
+ }
+ });
+
+ browserWrap.appendChild(elem);
+ }
+ else {
+ window.location = strUrl;
+ }
+
+
+
+
+
+ //var object = new WinJS.UI.HtmlControl(elem, { uri: strUrl });
+
+
+ },
+
+ injectScriptCode:function(code, bCB) {
+
+ // "(function(d) { var c = d.createElement('script'); c.src = %@; d.body.appendChild(c); })(document)"
+ },
+
+ injectScriptFile:function(file, bCB) {
+
+ }
+};
+
+
+
+
+module.exports = IAB;
+
+
+require("cordova/commandProxy").add("InAppBrowser",IAB);});
[2/4] git commit: [CB-3616] Change option name to "clearcache" to
match original proposal
Posted by st...@apache.org.
[CB-3616] Change option name to "clearcache" to match original proposal
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/0916db9b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/0916db9b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/0916db9b
Branch: refs/heads/dev
Commit: 0916db9bdb2fb3a699540faaa16b59e3feb97abf
Parents: 629964d
Author: Ian Clelland <ic...@chromium.org>
Authored: Fri Aug 9 10:20:02 2013 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Fri Aug 9 10:20:02 2013 -0400
----------------------------------------------------------------------
src/android/InAppBrowser.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/0916db9b/src/android/InAppBrowser.java
----------------------------------------------------------------------
diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java
index fedfa0d..189601c 100644
--- a/src/android/InAppBrowser.java
+++ b/src/android/InAppBrowser.java
@@ -79,7 +79,7 @@ public class InAppBrowser extends CordovaPlugin {
private static final String LOAD_STOP_EVENT = "loadstop";
private static final String LOAD_ERROR_EVENT = "loaderror";
private static final String CLOSE_BUTTON_CAPTION = "closebuttoncaption";
- private static final String CLEAR_ALL_CACHE = "clearallcache";
+ private static final String CLEAR_ALL_CACHE = "clearcache";
private static final String CLEAR_SESSION_CACHE = "clearsessioncache";
private long MAX_QUOTA = 100 * 1024 * 1024;
[4/4] git commit: Merge branch 'master' into dev
Posted by st...@apache.org.
Merge branch 'master' into dev
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/be364c08
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/be364c08
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/be364c08
Branch: refs/heads/dev
Commit: be364c081d796bf479ca709a56571d890807f333
Parents: 3b38378 e5840ee
Author: Steven Gill <st...@gmail.com>
Authored: Mon Aug 19 15:09:47 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Aug 19 15:09:47 2013 -0700
----------------------------------------------------------------------
plugin.xml | 7 ++
src/android/InAppBrowser.java | 30 +++++++--
www/windows8/InAppBrowserProxy.js | 117 +++++++++++++++++++++++++++++++++
3 files changed, 149 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/be364c08/plugin.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/be364c08/src/android/InAppBrowser.java
----------------------------------------------------------------------