deploy android

3 files changed, 15 insertions, 5 deletions

diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/BlogView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/BlogView.js
index 6eea977f..e58c975c 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/BlogView.js
@@ -54,6 +54,7 @@ var BlogView = View.extend({
         app.closed.storeClosedMessageTwo = app.store.StoreClosedMessageTwo
         break
     }
+    console.log(data)
 
     if (app.closed.storeIsClosed && sdk.env !== 'test') {
       app.closed.populate(app.store.ClosedStoreImages)
@@ -87,7 +88,7 @@ var BlogView = View.extend({
     }.bind(this))
 
     data.page.forEach(function(page){
-      app[page.tag].populate(page)
+      app[page.tag] && app[page.tag].populate(page)
     })
 
     console.log(app.store.StoreStatus)
diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js
index 5e2ff67e..b072a887 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/HubView.js
@@ -153,6 +153,7 @@ var HubLoader = (function(){
   var HubLoader = {}
   var loader
   var needed = false
+  var loading = false
   HubLoader.init = function(v){
     view = v
   }
@@ -163,7 +164,8 @@ var HubLoader = (function(){
   HubLoader.load = function(){
     item = queue.shift()
     count++
-    if (! item) return
+    if (! item || loading) return
+    loading = true
     if (item.image && item.image.length) {
       loader = new Loader (HubLoader.build)
       images = item.image.map(function(img){
@@ -179,11 +181,13 @@ var HubLoader = (function(){
   }
   HubLoader.isNeeded = function(){
     needed = true
+    if (!loading) HubLoader.load()
   }
   HubLoader.build = function(){
     view.append(item)
     view.scroller.refresh()
-    if (count < 2 && ! needed) return
+    loading = false
+    if (count > 3 && ! needed) return
     // if (count === 10) return
     setTimeout(HubLoader.load, count < 10 ? 1000 : 5000)
   }
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 f5f8ab2e..ae18091a 100755
--- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js
+++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/PageView.js
@@ -22,10 +22,11 @@ var PageView = ScrollableView.extend({
     this.$content.html(data.body.replace(/\n/g, "<br>"))
     this.$content.find("a").each(function(){
       var href = $(this).attr("href") // .substr(1, "fuck".length-2)
-      if (href.indexOf("“")) {
+      if (href.indexOf("“") !== -1) {
         href = href.substr(1, href.length-2)
         $(this).attr("href", href)
       }
+      console.log(href)
       $(this).attr("target", "_system")
     })
   },
@@ -35,7 +36,11 @@ var PageView = ScrollableView.extend({
     e.preventDefault()
     var href = $(e.currentTarget).attr("href")
     console.log(href)
-    window.open(href, '_system')
+    if (href.indexOf('http') !== 0) {
+      app.router.go(href.replace('!/', ''))
+    } else {
+      window.open(href, '_system')
+    }
   },
 
 })
\ No newline at end of file