diff options
| author | Rene Ae <aehtyb@gmail.com> | 2015-12-22 01:26:29 -0600 |
|---|---|---|
| committer | Rene Ae <aehtyb@gmail.com> | 2015-12-22 01:26:29 -0600 |
| commit | c8ea1aef25e28665478b9d94c4f63d26cda784b1 (patch) | |
| tree | 2bc079dac25e40c5f818be8f698ccc1594d4bc9f /StoneIsland/www/js | |
| parent | 89b39c69c00c180287912f4777ea2ec487fa6412 (diff) | |
| parent | bed982d4cbea6752ed2fe03c3163842f2205601c (diff) | |
Merge branch 'android' of https://github.com/okfocus/stone-island into android
Diffstat (limited to 'StoneIsland/www/js')
| -rwxr-xr-x | StoneIsland/www/js/index.js | 2 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/nav/NavView.js | 3 | ||||
| -rwxr-xr-x | StoneIsland/www/js/vendor/util.js | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js index ad4c6d20..050a729c 100755 --- a/StoneIsland/www/js/index.js +++ b/StoneIsland/www/js/index.js @@ -3,7 +3,7 @@ var app = (function(){ app.init = function(){ - sdk.init({ env: "development" }) + sdk.init({ env: "production" }) app.bind() app.build() diff --git a/StoneIsland/www/js/lib/nav/NavView.js b/StoneIsland/www/js/lib/nav/NavView.js index 1000e16e..fc373858 100755 --- a/StoneIsland/www/js/lib/nav/NavView.js +++ b/StoneIsland/www/js/lib/nav/NavView.js @@ -146,7 +146,7 @@ var NavView = View.extend({ fb: function(){ - window.open("https://www.facebook.com/StoneIsland", '_system') + window.open(is_ios ? "facebook://profile/231623463406" : "https://www.facebook.com/StoneIsland", '_system') }, insta: function(){ window.open("https://instagram.com/stoneisland_official", '_system') @@ -155,7 +155,6 @@ var NavView = View.extend({ window.open("https://twitter.com/stoneisland", '_system') }, yt: function(){ - console.log("youtube") window.open("https://www.youtube.com/user/StoneIslandOfficial", '_system') }, diff --git a/StoneIsland/www/js/vendor/util.js b/StoneIsland/www/js/vendor/util.js index e09b6ada..d45c4b98 100755 --- a/StoneIsland/www/js/vendor/util.js +++ b/StoneIsland/www/js/vendor/util.js @@ -173,6 +173,7 @@ var browser = (function( ua ) { // Naive useragent detection pattern var is_iphone = (navigator.userAgent.match(/iPhone/i)) || (navigator.userAgent.match(/iPod/i)) var is_ipad = (navigator.userAgent.match(/iPad/i)) +var is_ios = is_iphone || is_ipad var is_android = (navigator.userAgent.match(/Android/i)) var is_mobile = is_iphone || is_ipad || is_android var is_desktop = ! is_mobile; |
