summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xStoneIsland/config.xml2
-rw-r--r--StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstatebin21238 -> 22903 bytes
-rw-r--r--StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist4
-rw-r--r--StoneIsland/platforms/ios/Stone Island/config.xml2
-rwxr-xr-xStoneIsland/platforms/ios/www/js/index.js10
-rw-r--r--StoneIsland/platforms/ios/www/js/lib/etc/analytics.js10
-rwxr-xr-xStoneIsland/platforms/ios/www/js/sdk/_sdk.js4
7 files changed, 20 insertions, 12 deletions
diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml
index 70a999ee..541b5deb 100755
--- a/StoneIsland/config.xml
+++ b/StoneIsland/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget id="us.okfoc.stoneisland" version="1.4.7" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="us.okfoc.stoneisland" version="1.4.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Stone Island</name>
<description>
Stone Island
diff --git a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
index fc6981f5..21ad325f 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
index 4765d97a..48e60769 100644
--- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
+++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.4.6</string>
+ <string>1.4.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.4.6</string>
+ <string>1.4.8</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSMainNibFile</key>
diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml
index 587110ac..955ae40a 100644
--- a/StoneIsland/platforms/ios/Stone Island/config.xml
+++ b/StoneIsland/platforms/ios/Stone Island/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget id="us.okfoc.stoneisland" version="1.4.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="us.okfoc.stoneisland" version="1.4.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<feature name="CDVWebViewEngine">
<param name="ios-package" value="CDVWebViewEngine" />
</feature>
diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js
index 0e9ee355..b61e545d 100755
--- a/StoneIsland/platforms/ios/www/js/index.js
+++ b/StoneIsland/platforms/ios/www/js/index.js
@@ -6,7 +6,7 @@ var app = (function(){
if (window.location.hostname === 'lvh.me' || window.location.hostname === 'dev.stone.giraffe.life' || window.location.hostname === 'staging.stone.giraffe.life') {
console.log('launching in test mode')
- sdk.init({ env: "test" })
+ sdk.init({ env: "development" })
}
else {
sdk.init({ env: "production" })
@@ -115,7 +115,9 @@ var app = (function(){
// }
push.init()
- window.open = cordova.InAppBrowser.open
+ if (window.cordova) {
+ window.open = cordova.InAppBrowser.open
+ }
if (navigator.onLine) {
app.account.connect(window.deepLinkRoute || '/intro')
@@ -150,11 +152,11 @@ var app = (function(){
var refresh_time = +Date.now()
app.paused = function(){}
app.resumed = function(){
- console.log( "app is ready?", app.is_ready )
+ console.log("app resumed")
geo.fetch()
var now = +Date.now()
- if (now - refresh_time > 60 * 60 * 1000) {
+ if (now - refresh_time > 10 * 1000) {
refresh_time = now
app.blog.refresh()
}
diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/analytics.js b/StoneIsland/platforms/ios/www/js/lib/etc/analytics.js
index f5f871f5..fcf42d5f 100644
--- a/StoneIsland/platforms/ios/www/js/lib/etc/analytics.js
+++ b/StoneIsland/platforms/ios/www/js/lib/etc/analytics.js
@@ -11,10 +11,12 @@ var analytics = (function() {
analytics.sendPageView = function(path) {
console.log("/a\\ send", path)
- FirebasePlugin.logEvent("select_content", {
- content_type: "page_view",
- item_id: path,
- })
+ if (window.FirebasePlugin) {
+ FirebasePlugin.logEvent("select_content", {
+ content_type: "page_view",
+ item_id: path,
+ })
+ }
}
return analytics
diff --git a/StoneIsland/platforms/ios/www/js/sdk/_sdk.js b/StoneIsland/platforms/ios/www/js/sdk/_sdk.js
index 4a76a519..3b1c98a9 100755
--- a/StoneIsland/platforms/ios/www/js/sdk/_sdk.js
+++ b/StoneIsland/platforms/ios/www/js/sdk/_sdk.js
@@ -44,6 +44,10 @@ var sdk = (function(){
// // possibly: application/json; charset=utf-8"
// contentType: "application/json",
// })
+ if (!window.cordova) {
+ return $.ajax(opt)
+ }
+
var method = opt.method.toLowerCase()
var url = opt.url
var xhrOptions = {