diff options
| author | Rene Ae <aehtyb@gmail.com> | 2015-12-10 20:35:14 -0600 |
|---|---|---|
| committer | Rene Ae <aehtyb@gmail.com> | 2015-12-10 20:35:14 -0600 |
| commit | e0392872bb83b0570a3e295d3b8c1953704199f5 (patch) | |
| tree | 5bdec58d2927623ba1301d3c11c424b75c02bf01 /StoneIsland/platforms/ios/www | |
| parent | b10c59b70991ad32fc1c978310fd3d5e32a7e5ff (diff) | |
android semi working state
Diffstat (limited to 'StoneIsland/platforms/ios/www')
| -rwxr-xr-x | StoneIsland/platforms/ios/www/index.html | 5 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js | 11 |
2 files changed, 12 insertions, 4 deletions
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() |
