Merge branch 'master' of https://github.com/okfocus/stone-island

2 files changed, 31 insertions, 1 deletions

diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 740f7db1..3d84d4dc 100644
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -945,13 +945,27 @@
         <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>
   <div class="half-input">
     <input type="text" name="ZipCode" placeholder="ZIP" required>
     <div class="country-wrapper-static">
-      UNITED STATES
+      <span class="country-label">UNITED STATES</span>
 <!-- 
       <div id="country-select">
         <input type="text" name="Country" placeholder="UNITED STATES" required>
diff --git a/StoneIsland/www/js/lib/nav/AddressView.js b/StoneIsland/www/js/lib/nav/AddressView.js
index 31e9d802..ad5745fb 100644
--- a/StoneIsland/www/js/lib/nav/AddressView.js
+++ b/StoneIsland/www/js/lib/nav/AddressView.js
@@ -6,6 +6,7 @@ var AddressView = SerializableView.extend({
   disabled: false,
   
   events: {
+    "change [name=Province]": 'update_country',
   },
   
   initialize: function(opt){
@@ -22,6 +23,7 @@ var AddressView = SerializableView.extend({
     data.Address2 = address[1]
     this.$(".address input").val("")
     this.load_data(data)
+    this.update_country()
   },
   
   validate_presence: {
@@ -43,8 +45,22 @@ var AddressView = SerializableView.extend({
     delete data.Address2
   },
 
+  update_country: function(){
+    var state = this.$("[name=Province]").val()
+      console.log(state)
+    if (CANADIAN_LOOKUP[state]) {
+      this.$(".country-label").html("CANADA")
+    }
+    else {
+      this.$(".country-label").html("UNITED STATES")
+    }
+  },
+
 })
 
+var CANADIAN_PROVINCES = "AB BC MB NB NL NS NT NU ON PE SK QC YT".split(" ")
+var CANADIAN_LOOKUP = {}
+CANADIAN_PROVINCES.forEach(function(k){ CANADIAN_LOOKUP[k] = true })
 
 var COUNTRIES = [
   ['Country Name', 'NONE'],