4 files changed, 99 insertions, 74 deletions
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 7e660fe7..1d929f26 100755
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -975,72 +975,6 @@
     <div class="select-wrapper">
       <span>STATE</span>
       <select name="Province">
-        <option value="NONE" selected>State</option>
-        <option value="AL">Alabama</option>
-        <option value="AK">Alaska</option>
-        <option value="AZ">Arizona</option>
-        <option value="AR">Arkansas</option>
-        <option value="CA">California</option>
-        <option value="CO">Colorado</option>
-        <option value="CT">Connecticut</option>
-        <option value="DE">Delaware</option>
-        <option value="DC">District Of Columbia</option>
-        <option value="FL">Florida</option>
-        <option value="GA">Georgia</option>
-        <option value="HI">Hawaii</option>
-        <option value="ID">Idaho</option>
-        <option value="IL">Illinois</option>
-        <option value="IN">Indiana</option>
-        <option value="IA">Iowa</option>
-        <option value="KS">Kansas</option>
-        <option value="KY">Kentucky</option>
-        <option value="LA">Louisiana</option>
-        <option value="ME">Maine</option>
-        <option value="MD">Maryland</option>
-        <option value="MA">Massachusetts</option>
-        <option value="MI">Michigan</option>
-        <option value="MN">Minnesota</option>
-        <option value="MS">Mississippi</option>
-        <option value="MO">Missouri</option>
-        <option value="MT">Montana</option>
-        <option value="NE">Nebraska</option>
-        <option value="NV">Nevada</option>
-        <option value="NH">New Hampshire</option>
-        <option value="NJ">New Jersey</option>
-        <option value="NM">New Mexico</option>
-        <option value="NY">New York</option>
-        <option value="NC">North Carolina</option>
-        <option value="ND">North Dakota</option>
-        <option value="OH">Ohio</option>
-        <option value="OK">Oklahoma</option>
-        <option value="OR">Oregon</option>
-        <option value="PA">Pennsylvania</option>
-        <option value="RI">Rhode Island</option>
-        <option value="SC">South Carolina</option>
-        <option value="SD">South Dakota</option>
-        <option value="TN">Tennessee</option>
-        <option value="TX">Texas</option>
-        <option value="UT">Utah</option>
-        <option value="VT">Vermont</option>
-        <option value="VA">Virginia</option>
-        <option value="WA">Washington</option>
-        <option value="WV">West Virginia</option>
-        <option value="WI">Wisconsin</option>
-        <option value="WY">Wyoming</option>
-        <option disabled>_________________</option>
-        <option value="AB">Alberta</option>
-        <option value="BC">British Columbia</option>
-        <option value="MB">Manitoba</option>
-        <option value="NB">New Brunswick</option>
-        <option value="NL">Newfoundland and Labrador</option>
-        <option value="NS">Nova Scotia</option>
-        <option value="NT">Northwest Territories</option>
-        <option value="NU">Nunavut</option>
-        <option value="ON">Ontario</option>
-        <option value="PE">Prince Edward Island</option>
-        <option value="SK">Saskatchewan</option>
-        <option value="QC">Quebec</option>
-        <option value="YT">Yukon</option>
       </select>
     </div>
   </div>
@@ -1069,7 +1003,78 @@
     </div>
   </div>
 -->
+</script>
+
+<script type="text/html" id="us_states">
+  <option value="NONE" selected>State</option>
+  <option value="AL">Alabama</option>
+  <option value="AK">Alaska</option>
+  <option value="AZ">Arizona</option>
+  <option value="AR">Arkansas</option>
+  <option value="CA">California</option>
+  <option value="CO">Colorado</option>
+  <option value="CT">Connecticut</option>
+  <option value="DE">Delaware</option>
+  <option value="DC">District Of Columbia</option>
+  <option value="FL">Florida</option>
+  <option value="GA">Georgia</option>
+  <option value="HI">Hawaii</option>
+  <option value="ID">Idaho</option>
+  <option value="IL">Illinois</option>
+  <option value="IN">Indiana</option>
+  <option value="IA">Iowa</option>
+  <option value="KS">Kansas</option>
+  <option value="KY">Kentucky</option>
+  <option value="LA">Louisiana</option>
+  <option value="ME">Maine</option>
+  <option value="MD">Maryland</option>
+  <option value="MA">Massachusetts</option>
+  <option value="MI">Michigan</option>
+  <option value="MN">Minnesota</option>
+  <option value="MS">Mississippi</option>
+  <option value="MO">Missouri</option>
+  <option value="MT">Montana</option>
+  <option value="NE">Nebraska</option>
+  <option value="NV">Nevada</option>
+  <option value="NH">New Hampshire</option>
+  <option value="NJ">New Jersey</option>
+  <option value="NM">New Mexico</option>
+  <option value="NY">New York</option>
+  <option value="NC">North Carolina</option>
+  <option value="ND">North Dakota</option>
+  <option value="OH">Ohio</option>
+  <option value="OK">Oklahoma</option>
+  <option value="OR">Oregon</option>
+  <option value="PA">Pennsylvania</option>
+  <option value="RI">Rhode Island</option>
+  <option value="SC">South Carolina</option>
+  <option value="SD">South Dakota</option>
+  <option value="TN">Tennessee</option>
+  <option value="TX">Texas</option>
+  <option value="UT">Utah</option>
+  <option value="VT">Vermont</option>
+  <option value="VA">Virginia</option>
+  <option value="WA">Washington</option>
+  <option value="WV">West Virginia</option>
+  <option value="WI">Wisconsin</option>
+  <option value="WY">Wyoming</option>
+</script>
 
+<script type="text/html" id="ca_states">
+  <option disabled>_________________</option>
+  <option value="AB">Alberta</option>
+  <option value="BC">British Columbia</option>
+  <option value="MB">Manitoba</option>
+  <option value="NB">New Brunswick</option>
+  <option value="NL">Newfoundland and Labrador</option>
+  <option value="NS">Nova Scotia</option>
+  <option value="NT">Northwest Territories</option>
+  <option value="NU">Nunavut</option>
+  <option value="ON">Ontario</option>
+  <option value="PE">Prince Edward Island</option>
+  <option value="SK">Saskatchewan</option>
+  <option value="QC">Quebec</option>
+  <option value="YT">Yukon</option>
 </script>
 
 </body>
diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js
index 38a7eecf..d2d26787 100755
--- a/StoneIsland/www/js/lib/blogs/HubView.js
+++ b/StoneIsland/www/js/lib/blogs/HubView.js
@@ -22,6 +22,7 @@ var HubView = ScrollableView.extend({
     this.deferScrollToTop()
     app.footer.hide()
     document.body.className = "hub"
+    HubLoader.isNeeded()
     if (! this.populated) {
       this.populate( BACKUP_DB.hub )
     }
@@ -143,12 +144,13 @@ var HubLoader = (function(){
   var count = 0
   var HubLoader = {}
   var loader
+  var needed = false
   HubLoader.init = function(v){
     view = v
   }
   HubLoader.add = function(items){
     queue = items
-    this.load()
+    HubLoader.load()
   }
   HubLoader.load = function(){
     item = queue.shift()
@@ -167,10 +169,14 @@ var HubLoader = (function(){
       HubLoader.build()
     }
   }
+  HubLoader.isNeeded = function(){
+    needed = true
+  }
   HubLoader.build = function(){
     view.append(item)
     view.scroller.refresh()
-    setTimeout(HubLoader.load, count < 4 ? 50 : 5000)
+    if (count === 3 && ! needed) return
+    setTimeout(HubLoader.load, count < 3 ? 1000 : 30000)
   }
   return HubLoader
 })()
diff --git a/StoneIsland/www/js/lib/etc/sim.js b/StoneIsland/www/js/lib/etc/sim.js
index c9cb77fe..ca01ddc7 100644
--- a/StoneIsland/www/js/lib/etc/sim.js
+++ b/StoneIsland/www/js/lib/etc/sim.js
@@ -18,11 +18,13 @@ var sim = (function(){
   
   sim.success = function(data){
     console.log(data)
-    sim.data = data
-    sim.data.countryCode = sim.data.countryCode.toLowerCase()
-    // app is only available in US or Canada, so call the US API regardless
-    if (sim.data.countryCode !== 'ca') {
-      sim.data.countryCode = 'us'
+    if (sim.data.countryCode) {
+      sim.data = data
+      sim.data.countryCode = sim.data.countryCode.toLowerCase()
+      // app is only available in US or Canada, so call the US API regardless
+      if (sim.data.countryCode !== 'ca') {
+        sim.data.countryCode = 'us'
+      }
     }
     sim.loaded = true
     sim.afterFetch()
@@ -30,7 +32,12 @@ var sim = (function(){
   
   sim.error = function(){
     console.log("no SIM card detected")
-    sim.afterFetch()
+    $.ajax({
+      url: "http://ip-api.com/json/",
+      jsonp: "callback",
+      dataType: "jsonp",
+      success: sim.success,
+    })
   }
   
   return sim
diff --git a/StoneIsland/www/js/lib/nav/AddressView.js b/StoneIsland/www/js/lib/nav/AddressView.js
index 4a05c4b6..fd7df218 100755
--- a/StoneIsland/www/js/lib/nav/AddressView.js
+++ b/StoneIsland/www/js/lib/nav/AddressView.js
@@ -2,6 +2,8 @@
 var AddressView = SerializableView.extend({
   
   template: $("#address_template").html(),
+  us_states: $("#us_states").html(),
+  ca_states: $("#ca_states").html(),
   
   disabled: false,
   
@@ -18,6 +20,11 @@ var AddressView = SerializableView.extend({
   },
   
   populate: function(data){
+    this.$("[name=Province]").empty()
+    this.$("[name=Province]").append(this.us_states)
+    if (! app.store.notAvailableInCanada) {
+      this.$("[name=Province]").append(this.ca_states)
+    }
     this.data = data
     var address = data.Address.split("\n")
     data.Address1 = address[0]