From d8de54120038aee2e4c6fc1c638d49be8ac73452 Mon Sep 17 00:00:00 2001 From: Rene Ae Date: Fri, 11 Dec 2015 19:21:00 -0600 Subject: build release --- StoneIsland/platforms/android/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'StoneIsland/platforms/android/AndroidManifest.xml') diff --git a/StoneIsland/platforms/android/AndroidManifest.xml b/StoneIsland/platforms/android/AndroidManifest.xml index a210e5a7..5d1b6d6d 100755 --- a/StoneIsland/platforms/android/AndroidManifest.xml +++ b/StoneIsland/platforms/android/AndroidManifest.xml @@ -1,5 +1,5 @@ - + -- cgit v1.2.3-70-g09d2 From 33f9d73731c17d0b479721640a0c6a31230ac6bb Mon Sep 17 00:00:00 2001 From: Rene Ae Date: Sun, 13 Dec 2015 20:00:57 -0600 Subject: android release apk build --- .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../.gradle/2.2.1/taskArtifacts/fileHashes.bin | Bin 512935 -> 513439 bytes .../.gradle/2.2.1/taskArtifacts/fileSnapshots.bin | Bin 3479810 -> 3837158 bytes .../2.2.1/taskArtifacts/outputFileStates.bin | Bin 26372 -> 26372 bytes .../.gradle/2.2.1/taskArtifacts/taskArtifacts.bin | Bin 141878 -> 144895 bytes StoneIsland/platforms/android/AndroidManifest.xml | 2 +- .../build/intermediates/bundles/debug/classes.jar | Bin 119119 -> 119119 bytes .../intermediates/bundles/release/classes.jar | Bin 119042 -> 119042 bytes .../build/outputs/aar/CordovaLib-debug.aar | Bin 109668 -> 109676 bytes .../build/outputs/aar/CordovaLib-release.aar | Bin 109597 -> 109606 bytes .../android/assets/www/js/lib/blogs/PageView.js | 7 +- .../android/assets/www/js/lib/nav/FooterView.js | 1 + .../android/assets/www/js/lib/products/Selector.js | 2 + StoneIsland/platforms/android/res/xml/config.xml | 2 +- .../ios/Stone Island/Stone Island-Info.plist | 419 +++++++++++---------- .../www/cdv-plugin-parse.js | 0 16 files changed, 220 insertions(+), 213 deletions(-) mode change 100644 => 100755 StoneIsland/platforms/ios/www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js (limited to 'StoneIsland/platforms/android/AndroidManifest.xml') diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock index 34c07f3f..d9ada3ee 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin index 95a70969..91121bcb 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index b19e9605..72ac8d23 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin index 4ad9ac52..8e4a6a9f 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin differ diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index 0280e771..4abe1593 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ diff --git a/StoneIsland/platforms/android/AndroidManifest.xml b/StoneIsland/platforms/android/AndroidManifest.xml index 5d1b6d6d..4d9aeba5 100755 --- a/StoneIsland/platforms/android/AndroidManifest.xml +++ b/StoneIsland/platforms/android/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar index ca36fcb7..8b023c66 100755 Binary files a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar and b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar differ diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar index 35c41ca7..d4045400 100755 Binary files a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar and b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar differ diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar index 66e76651..144f7312 100755 Binary files a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar and b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar differ diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar index 9a41f6e6..e17128b3 100755 Binary files a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar and b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar differ diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js index c399a2a9..f5f8ab2e 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js @@ -1,7 +1,7 @@ var PageView = ScrollableView.extend({ events: { - "touchstart a": "follow_link" + "click a": "follow_link" }, initialize: function(opt){ @@ -31,8 +31,11 @@ var PageView = ScrollableView.extend({ }, follow_link: function(e){ + e.stopPropagation() + e.preventDefault() var href = $(e.currentTarget).attr("href") - window.open(row.link, '_system') + console.log(href) + window.open(href, '_system') }, }) \ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/FooterView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/FooterView.js index 74b249e6..8641668f 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/nav/FooterView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/FooterView.js @@ -10,6 +10,7 @@ var FooterView = View.extend({ initialize: function(){ this.$ok = this.$(".ok") this.$cancel = this.$(".cancel") + this.hide() }, show: function(ok, cancel){ diff --git a/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js b/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js index 17278a06..4e23ba1f 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js @@ -44,6 +44,8 @@ var Selector = View.extend({ }, pick: function(e){ + e.preventDefault() + e.stopPropagation() var $option = $(e.currentTarget) var id = String($option.data("id")) var selection = this.lookup[id] diff --git a/StoneIsland/platforms/android/res/xml/config.xml b/StoneIsland/platforms/android/res/xml/config.xml index 22f80eef..5992bf0c 100755 --- a/StoneIsland/platforms/android/res/xml/config.xml +++ b/StoneIsland/platforms/android/res/xml/config.xml @@ -1,5 +1,5 @@ - + diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index e72b52b5..203752b1 100755 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -1,212 +1,213 @@ - - CFBundleDevelopmentRegion - English - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - icon.png - CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconFiles - - icon-40 - icon-small - icon-60 - icon.png - icon@2x - icon-72 - icon-72@2x - - UIPrerenderedIcon - - - - CFBundleIcons~ipad - - CFBundlePrimaryIcon - - CFBundleIconFiles - - icon-small - icon-40 - icon-50 - icon-76 - icon-60 - icon - icon@2x - icon-72 - icon-72@2x - - UIPrerenderedIcon - - - - CFBundleIdentifier - us.okfoc.stoneisland - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 0.4.1 - CFBundleSignature - ???? - CFBundleURLTypes - - - CFBundleURLSchemes - - stoneisland - - - - CFBundleVersion - 0.4.1 - LSApplicationQueriesSchemes - - youtube - - LSRequiresIPhoneOS - - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - - NSLocationWhenInUseUsageDescription - - NSMainNibFile~ipad - - UIBackgroundModes - - remote-notification - - UIInterfaceOrientation - - UIInterfaceOrientationPortrait - - UILaunchImages - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default - UILaunchImageOrientation - Portrait - UILaunchImageSize - {320, 480} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default - UILaunchImageOrientation - Landscape - UILaunchImageSize - {320, 480} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-568h - UILaunchImageOrientation - Portrait - UILaunchImageSize - {320, 568} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-568h - UILaunchImageOrientation - Landscape - UILaunchImageSize - {320, 568} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-667h - UILaunchImageOrientation - Portrait - UILaunchImageSize - {375, 667} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-667h - UILaunchImageOrientation - Landscape - UILaunchImageSize - {375, 667} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-736h - UILaunchImageOrientation - Portrait - UILaunchImageSize - {414, 736} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-Landscape-736h - UILaunchImageOrientation - Landscape - UILaunchImageSize - {414, 736} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-Portrait - UILaunchImageOrientation - Portrait - UILaunchImageSize - {768, 1024} - - - UILaunchImageMinimumOSVersion - 8.0 - UILaunchImageName - Default-Landscape - UILaunchImageOrientation - Landscape - UILaunchImageSize - {768, 1024} - - - UIRequiresFullScreen - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - - - + + CFBundleDevelopmentRegion + English + CFBundleDisplayName + ${PRODUCT_NAME} + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + icon.png + CFBundleIcons + + CFBundlePrimaryIcon + + CFBundleIconFiles + + icon-40 + icon-small + icon-60 + icon.png + icon@2x + icon-72 + icon-72@2x + + UIPrerenderedIcon + + + + CFBundleIcons~ipad + + CFBundlePrimaryIcon + + CFBundleIconFiles + + icon-small + icon-40 + icon-50 + icon-76 + icon-60 + icon + icon@2x + icon-72 + icon-72@2x + + UIPrerenderedIcon + + + + CFBundleIdentifier + us.okfoc.stoneisland + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + 0.4.1 + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleURLSchemes + + stoneisland + + + + CFBundleVersion + 0.4.1 + LSApplicationQueriesSchemes + + youtube + + LSRequiresIPhoneOS + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + NSLocationWhenInUseUsageDescription + + NSMainNibFile~ipad + + UIBackgroundModes + + remote-notification + + UIInterfaceOrientation + + UIInterfaceOrientationPortrait + + UILaunchImages + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default + UILaunchImageOrientation + Portrait + UILaunchImageSize + {320, 480} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default + UILaunchImageOrientation + Landscape + UILaunchImageSize + {320, 480} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-568h + UILaunchImageOrientation + Portrait + UILaunchImageSize + {320, 568} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-568h + UILaunchImageOrientation + Landscape + UILaunchImageSize + {320, 568} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-667h + UILaunchImageOrientation + Portrait + UILaunchImageSize + {375, 667} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-667h + UILaunchImageOrientation + Landscape + UILaunchImageSize + {375, 667} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-736h + UILaunchImageOrientation + Portrait + UILaunchImageSize + {414, 736} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-Landscape-736h + UILaunchImageOrientation + Landscape + UILaunchImageSize + {414, 736} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-Portrait + UILaunchImageOrientation + Portrait + UILaunchImageSize + {768, 1024} + + + UILaunchImageMinimumOSVersion + 8.0 + UILaunchImageName + Default-Landscape + UILaunchImageOrientation + Landscape + UILaunchImageSize + {768, 1024} + + + UIRequiresFullScreen + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + + + \ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js b/StoneIsland/platforms/ios/www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js old mode 100644 new mode 100755 -- cgit v1.2.3-70-g09d2 From 0cd5ed392809b343c2f8d85df81f59021129723a Mon Sep 17 00:00:00 2001 From: Rene Ae Date: Tue, 15 Dec 2015 17:11:58 -0600 Subject: stoppropagation --- StoneIsland/config.xml | 1 + .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../.gradle/2.2.1/taskArtifacts/fileHashes.bin | Bin 513439 -> 513607 bytes .../.gradle/2.2.1/taskArtifacts/fileSnapshots.bin | Bin 3837158 -> 3910724 bytes .../2.2.1/taskArtifacts/outputFileStates.bin | Bin 26372 -> 26372 bytes .../.gradle/2.2.1/taskArtifacts/taskArtifacts.bin | Bin 144895 -> 144895 bytes StoneIsland/platforms/android/AndroidManifest.xml | 2 +- .../build/intermediates/bundles/debug/classes.jar | Bin 119119 -> 119119 bytes .../intermediates/bundles/release/classes.jar | Bin 119042 -> 119042 bytes .../build/outputs/aar/CordovaLib-debug.aar | Bin 109676 -> 109668 bytes .../build/outputs/aar/CordovaLib-release.aar | Bin 109606 -> 109597 bytes .../android/assets/www/js/lib/nav/IntroView.js | 24 +++++++++++++++++---- StoneIsland/platforms/android/res/xml/config.xml | 2 ++ .../platforms/ios/www/js/lib/nav/IntroView.js | 24 +++++++++++++++++---- StoneIsland/www/js/lib/nav/IntroView.js | 24 +++++++++++++++++---- 15 files changed, 64 insertions(+), 13 deletions(-) (limited to 'StoneIsland/platforms/android/AndroidManifest.xml') diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index f75605ea..35708e80 100755 --- a/StoneIsland/config.xml +++ b/StoneIsland/config.xml @@ -31,6 +31,7 @@ + diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock index d9ada3ee..ef0f1bfc 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin index 91121bcb..df09485f 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index 72ac8d23..1e0a68c2 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin index 8e4a6a9f..bf947b14 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin differ diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index 4abe1593..b2581f89 100755 Binary files a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ diff --git a/StoneIsland/platforms/android/AndroidManifest.xml b/StoneIsland/platforms/android/AndroidManifest.xml index 4d9aeba5..0feefa18 100755 --- a/StoneIsland/platforms/android/AndroidManifest.xml +++ b/StoneIsland/platforms/android/AndroidManifest.xml @@ -57,7 +57,7 @@ - + diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar index 8b023c66..2e52b1df 100755 Binary files a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar and b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar differ diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar index d4045400..4cc8c303 100755 Binary files a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar and b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar differ diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar index 144f7312..c943da67 100755 Binary files a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar and b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar differ diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar index e17128b3..a77826ed 100755 Binary files a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar and b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar differ diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js index 8797241f..5e5ea908 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/IntroView.js @@ -41,9 +41,25 @@ var IntroView = View.extend({ this.compass.style[transformProp] = "translateZ(0) translateX(-50%) translateY(-50%) rotate(" + heading + "deg)" }, - store: function(){ app.router.go("store") }, - hub: function(){ app.router.go("hub") }, - story: function(){ app.router.go("story") }, - archive: function(){ app.router.go("archive") }, + store: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("store") + }, + hub: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("hub") + }, + story: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("story") + }, + archive: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("archive") + }, }) diff --git a/StoneIsland/platforms/android/res/xml/config.xml b/StoneIsland/platforms/android/res/xml/config.xml index 5992bf0c..cdcf29d8 100755 --- a/StoneIsland/platforms/android/res/xml/config.xml +++ b/StoneIsland/platforms/android/res/xml/config.xml @@ -38,6 +38,8 @@ + + Stone Island Stone Island diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js b/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js index 8797241f..5e5ea908 100755 --- a/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js +++ b/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js @@ -41,9 +41,25 @@ var IntroView = View.extend({ this.compass.style[transformProp] = "translateZ(0) translateX(-50%) translateY(-50%) rotate(" + heading + "deg)" }, - store: function(){ app.router.go("store") }, - hub: function(){ app.router.go("hub") }, - story: function(){ app.router.go("story") }, - archive: function(){ app.router.go("archive") }, + store: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("store") + }, + hub: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("hub") + }, + story: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("story") + }, + archive: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("archive") + }, }) diff --git a/StoneIsland/www/js/lib/nav/IntroView.js b/StoneIsland/www/js/lib/nav/IntroView.js index 8797241f..5e5ea908 100755 --- a/StoneIsland/www/js/lib/nav/IntroView.js +++ b/StoneIsland/www/js/lib/nav/IntroView.js @@ -41,9 +41,25 @@ var IntroView = View.extend({ this.compass.style[transformProp] = "translateZ(0) translateX(-50%) translateY(-50%) rotate(" + heading + "deg)" }, - store: function(){ app.router.go("store") }, - hub: function(){ app.router.go("hub") }, - story: function(){ app.router.go("story") }, - archive: function(){ app.router.go("archive") }, + store: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("store") + }, + hub: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("hub") + }, + story: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("story") + }, + archive: function(e){ + e.preventDefault() + e.stopPropagation() + app.router.go("archive") + }, }) -- cgit v1.2.3-70-g09d2