diff options
16 files changed, 54 insertions, 14 deletions
diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index dd562cb3..8904f386 100755 --- a/StoneIsland/config.xml +++ b/StoneIsland/config.xml @@ -24,7 +24,7 @@ <preference name="SuppressesIncrementalRendering" value="true"/> <preference name="DisallowOverscroll" value="true" /> <preference name="HideKeyboardFormAccessoryBar" value="true" /> - + <preference name="orientation" value="portrait" /> <preference name="StatusBarOverlaysWebView" value="false" /> <preference name="StatusBarBackgroundColor" value="#000000" /> <preference name="StatusBarStyle" value="lightcontent" /> 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 Binary files differindex 6f93dc99..2ebf59ce 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin Binary files differindex d07355ac..459093b8 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary files differindex c0eccf6f..af1606df 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin Binary files differindex 6893fc73..4ad9ac52 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary files differindex adc17cdd..0345b619 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin diff --git a/StoneIsland/platforms/android/AndroidManifest.xml b/StoneIsland/platforms/android/AndroidManifest.xml index d460bdeb..22019d7b 100755 --- a/StoneIsland/platforms/android/AndroidManifest.xml +++ b/StoneIsland/platforms/android/AndroidManifest.xml @@ -5,7 +5,7 @@ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <application android:hardwareAccelerated="true" android:icon="@drawable/icon" android:label="@string/app_name" android:supportsRtl="true"> - <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.Black.NoTitleBar" android:windowSoftInputMode="adjustResize"> + <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.Black.NoTitleBar" android:windowSoftInputMode="adjustResize"> <intent-filter android:label="@string/launcher_name"> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> diff --git a/StoneIsland/platforms/android/assets/www/index.html b/StoneIsland/platforms/android/assets/www/index.html index 4c32c10b..e0925f65 100755 --- a/StoneIsland/platforms/android/assets/www/index.html +++ b/StoneIsland/platforms/android/assets/www/index.html @@ -11,9 +11,8 @@ * Enable inline JS: add 'unsafe-inline' to default-src --> -<!-- - <meta http-equiv="Content-Security-Policy" content="default-src 'self' https://ltho.s3.amazonaws.com/* lvh.me lvh.me:5000 data: gap: https://ssl.gstatic.com 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; connect-src *"> ---> + +<meta http-equiv="Content-Security-Policy" content="default-src * 'unsafe-inline' 'unsafe-eval'; script-src * 'unsafe-inline' 'unsafe-eval'; object-src * 'unsafe-inline' 'unsafe-eval'; style-src * 'unsafe-inline' 'unsafe-eval'; img-src * 'unsafe-inline' 'unsafe-eval'; media-src * 'unsafe-inline' 'unsafe-eval'; frame-src * 'unsafe-inline' 'unsafe-eval'; font-src * 'unsafe-inline' 'unsafe-eval'; connect-src * 'unsafe-inline' 'unsafe-eval'"> <meta name="format-detection" content="telephone=no"> <meta name="msapplication-tap-highlight" content="no"> diff --git a/StoneIsland/platforms/android/assets/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/android/assets/www/js/lib/products/CollectionView.js index d4315514..7a020798 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/products/CollectionView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/products/CollectionView.js @@ -32,6 +32,7 @@ var CollectionView = ScrollableView.extend({ app.footer.show("FILTER") document.body.className = "collection" if (this.loaded) { + console.log("collection this loaded") return this.populate(this.data) } // this.fetch() @@ -42,7 +43,11 @@ var CollectionView = ScrollableView.extend({ }, fetch: function(){ - if (this.loaded) return + console.log("collection fetch") + if (this.loaded) { + console.log("collection loaded") + return + } this.$loader.show() sdk.product.collection({ gallery_id: app.gallery_id, @@ -52,12 +57,16 @@ var CollectionView = ScrollableView.extend({ populate: function(data){ if (this.loaded && ! data) { + console.log("populate 1") data = this.data } else { + console.log("populate 2") this.data = data + console.log(data) } if (! this.loaded) { + console.log("populate 3") this.loaded = true this.$loader.hide() this.$content.empty() diff --git a/StoneIsland/platforms/android/res/xml/config.xml b/StoneIsland/platforms/android/res/xml/config.xml index c0da36d1..69078b96 100755 --- a/StoneIsland/platforms/android/res/xml/config.xml +++ b/StoneIsland/platforms/android/res/xml/config.xml @@ -56,6 +56,7 @@ <preference name="SuppressesIncrementalRendering" value="true" /> <preference name="DisallowOverscroll" value="true" /> <preference name="HideKeyboardFormAccessoryBar" value="true" /> + <preference name="orientation" value="portrait" /> <preference name="StatusBarOverlaysWebView" value="false" /> <preference name="StatusBarBackgroundColor" value="#000000" /> <preference name="StatusBarStyle" value="lightcontent" /> diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index d5fe1394..922e8c25 100755 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -191,5 +191,19 @@ </array> <key>UIRequiresFullScreen</key> <true/> + <key>UIInterfaceOrientation</key> + <array> + <string>UIInterfaceOrientationPortrait</string> + </array> + <key>UISupportedInterfaceOrientations</key> + <array> + <string>UIInterfaceOrientationPortrait</string> + <string>UIInterfaceOrientationPortraitUpsideDown</string> + </array> + <key>UISupportedInterfaceOrientations~ipad</key> + <array> + <string>UIInterfaceOrientationPortrait</string> + <string>UIInterfaceOrientationPortraitUpsideDown</string> + </array> </dict> </plist>
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index e75369da..1114ca1f 100755 --- a/StoneIsland/platforms/ios/Stone Island/config.xml +++ b/StoneIsland/platforms/ios/Stone Island/config.xml @@ -70,6 +70,7 @@ <preference name="SuppressesIncrementalRendering" value="true" /> <preference name="DisallowOverscroll" value="true" /> <preference name="HideKeyboardFormAccessoryBar" value="true" /> + <preference name="orientation" value="portrait" /> <preference name="StatusBarOverlaysWebView" value="false" /> <preference name="StatusBarBackgroundColor" value="#000000" /> <preference name="StatusBarStyle" value="lightcontent" /> diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index 4c32c10b..e0925f65 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -11,9 +11,8 @@ * Enable inline JS: add 'unsafe-inline' to default-src --> -<!-- - <meta http-equiv="Content-Security-Policy" content="default-src 'self' https://ltho.s3.amazonaws.com/* lvh.me lvh.me:5000 data: gap: https://ssl.gstatic.com 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; connect-src *"> ---> + +<meta http-equiv="Content-Security-Policy" content="default-src * 'unsafe-inline' 'unsafe-eval'; script-src * 'unsafe-inline' 'unsafe-eval'; object-src * 'unsafe-inline' 'unsafe-eval'; style-src * 'unsafe-inline' 'unsafe-eval'; img-src * 'unsafe-inline' 'unsafe-eval'; media-src * 'unsafe-inline' 'unsafe-eval'; frame-src * 'unsafe-inline' 'unsafe-eval'; font-src * 'unsafe-inline' 'unsafe-eval'; connect-src * 'unsafe-inline' 'unsafe-eval'"> <meta name="format-detection" content="telephone=no"> <meta name="msapplication-tap-highlight" content="no"> diff --git a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js index d4315514..7a020798 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js @@ -32,6 +32,7 @@ var CollectionView = ScrollableView.extend({ app.footer.show("FILTER") document.body.className = "collection" if (this.loaded) { + console.log("collection this loaded") return this.populate(this.data) } // this.fetch() @@ -42,7 +43,11 @@ var CollectionView = ScrollableView.extend({ }, fetch: function(){ - if (this.loaded) return + console.log("collection fetch") + if (this.loaded) { + console.log("collection loaded") + return + } this.$loader.show() sdk.product.collection({ gallery_id: app.gallery_id, @@ -52,12 +57,16 @@ var CollectionView = ScrollableView.extend({ populate: function(data){ if (this.loaded && ! data) { + console.log("populate 1") data = this.data } else { + console.log("populate 2") this.data = data + console.log(data) } if (! this.loaded) { + console.log("populate 3") this.loaded = true this.$loader.hide() this.$content.empty() diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index 4c32c10b..e0925f65 100755 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -11,9 +11,8 @@ * Enable inline JS: add 'unsafe-inline' to default-src --> -<!-- - <meta http-equiv="Content-Security-Policy" content="default-src 'self' https://ltho.s3.amazonaws.com/* lvh.me lvh.me:5000 data: gap: https://ssl.gstatic.com 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; connect-src *"> ---> + +<meta http-equiv="Content-Security-Policy" content="default-src * 'unsafe-inline' 'unsafe-eval'; script-src * 'unsafe-inline' 'unsafe-eval'; object-src * 'unsafe-inline' 'unsafe-eval'; style-src * 'unsafe-inline' 'unsafe-eval'; img-src * 'unsafe-inline' 'unsafe-eval'; media-src * 'unsafe-inline' 'unsafe-eval'; frame-src * 'unsafe-inline' 'unsafe-eval'; font-src * 'unsafe-inline' 'unsafe-eval'; connect-src * 'unsafe-inline' 'unsafe-eval'"> <meta name="format-detection" content="telephone=no"> <meta name="msapplication-tap-highlight" content="no"> diff --git a/StoneIsland/www/js/lib/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js index d4315514..7a020798 100755 --- a/StoneIsland/www/js/lib/products/CollectionView.js +++ b/StoneIsland/www/js/lib/products/CollectionView.js @@ -32,6 +32,7 @@ var CollectionView = ScrollableView.extend({ app.footer.show("FILTER") document.body.className = "collection" if (this.loaded) { + console.log("collection this loaded") return this.populate(this.data) } // this.fetch() @@ -42,7 +43,11 @@ var CollectionView = ScrollableView.extend({ }, fetch: function(){ - if (this.loaded) return + console.log("collection fetch") + if (this.loaded) { + console.log("collection loaded") + return + } this.$loader.show() sdk.product.collection({ gallery_id: app.gallery_id, @@ -52,12 +57,16 @@ var CollectionView = ScrollableView.extend({ populate: function(data){ if (this.loaded && ! data) { + console.log("populate 1") data = this.data } else { + console.log("populate 2") this.data = data + console.log(data) } if (! this.loaded) { + console.log("populate 3") this.loaded = true this.$loader.hide() this.$content.empty() |