aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Arter <davea@mysociety.org>2015-07-28 17:27:05 +0100
committerDave Arter <davea@mysociety.org>2015-08-28 14:27:16 +0100
commitc980de6e47e9480dd3516fb6d9d3c4d88fe2e610 (patch)
tree4c6716db278fd26e7f4e2458a81cac55dab11431
parent8039f82db5958a314aa64c1f28ff86d0c2dace85 (diff)
Restore open-in-browser functionality
The target="_system" syntax no longer works with window.open. Instead a specific InAppBrowser plugin is required.
-rw-r--r--README.md3
-rw-r--r--www/js/app.js8
-rw-r--r--www/js/views/sent.js4
3 files changed, 10 insertions, 5 deletions
diff --git a/README.md b/README.md
index 4d05b73..e2eb93f 100644
--- a/README.md
+++ b/README.md
@@ -51,13 +51,14 @@ service, which we **don't** use!
cordova-plugin-file 2.1.0 "File"
cordova-plugin-file-transfer 1.2.1 "File Transfer"
cordova-plugin-geolocation 1.0.1 "Geolocation"
+ cordova-plugin-inappbrowser 1.0.1 "InAppBrowser"
cordova-plugin-network-information 1.0.1 "Network Information"
cordova-plugin-splashscreen 2.1.0 "Splashscreen"
cordova-plugin-statusbar 1.0.1 "StatusBar"
cordova-plugin-whitelist 1.0.0 "Whitelist"
```
- So to install them: `cordova plugin add cordova-plugin-camera cordova-plugin-device cordova-plugin-file cordova-plugin-file-transfer cordova-plugin-geolocation cordova-plugin-network-information cordova-plugin-splashscreen cordova-plugin-statusbar cordova-plugin-whitelist`
+ So to install them: `cordova plugin add cordova-plugin-camera cordova-plugin-device cordova-plugin-file cordova-plugin-file-transfer cordova-plugin-geolocation cordova-plugin-inappbrowser cordova-plugin-network-information cordova-plugin-splashscreen cordova-plugin-statusbar cordova-plugin-whitelist`
6. Copy `www/js/config.js-example to www/js/config.js` and edit if needed
diff --git a/www/js/app.js b/www/js/app.js
index e6f620f..40633d6 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -144,11 +144,15 @@ var tpl = {
openExternal: function(e) {
e.preventDefault();
- var el = $(e.srcElement);
- window.open(el.attr('href'), '_system');
+ var href = $(e.srcElement).attr('href');
+ FMS.openExternalURL(href);
return false;
},
+ openExternalURL: function(url) {
+ window.cordova.InAppBrowser.open(url, '_system');
+ },
+
setHelpHeight: function() {
var helpContent = $('#helpContent'),
viewHeight = $(window).height();
diff --git a/www/js/views/sent.js b/www/js/views/sent.js
index f25a178..efcf441 100644
--- a/www/js/views/sent.js
+++ b/www/js/views/sent.js
@@ -28,7 +28,7 @@
onClickOpenReport: function(e) {
e.preventDefault();
- window.open(FMS.createdReport.get('site_url'), '_system');
+ FMS.openExternalURL(FMS.createdReport.get('site_url'));
return false;
},
@@ -36,7 +36,7 @@
e.preventDefault();
var el = $('#rate_app');
var href = el.attr('href');
- window.open(href, '_system');
+ FMS.openExternalURL(href);
return false;
}
})