Merge pull request #18 from hatone/addcss_delete

changing buttons design
hatone · Feb 7, 2016 · c823623 · c823623
2 parents 078129f + 1b77afb
commit c823623
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 22 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/index.html b/index.html
@@ -67,7 +67,7 @@ <h3>set your timezone:</h3>
             <h3>add timezone:</h3>
             <div id = "timezone_forms">
             </div>
-            <div class="btn btn-danger" id="add_timezone"><span class="fui-plus-24"></span></div>
+            <div class="btng" id="add_timezone"><span class="fui-plus-24"></span></div>
             <div class="modal-footer">
                 <input type="submit" class="btn btn-primary" />
             </div>

diff --git a/js/get_timezone_list.js b/js/get_timezone_list.js
@@ -39,7 +39,7 @@ function getTimezoneList(){
                 });
                 $('#timezone_forms').append('<br>');
                 $('#timezone_forms').append('<select class="timezones" id="tzbtn'+ltzindex+'">' + myTimezoneOptions + '</select>');
-                $('#timezone_forms').append('<button onclick = "deleteTimezone(event,'+ltzindex+');" form = "timezone_forms" id=dbtn'+ltzindex+'>☒</button>');
+                $('#timezone_forms').append(' <button onclick = "deleteTimezone(event,'+ltzindex+');" form = "timezone_forms" id=dbtn'+ltzindex+'><span class="fui-cross-16"></span></button>');
                 myTimezoneOptions = "";
             });
         } else {
@@ -72,13 +72,17 @@ function addTimezone(){
             txt = txt + '<option value="'+ index +'">' + tz.name + " (" + tz.difference + ")</option>";
         });
 
-        var a = $("#timezone_forms").find("select").filter(":last").get(0);
-        console.log(a.id);        
-        var index = parseInt(a.id.replace("tzbtn",""))+1;
-
+        var lastobj = $("#timezone_forms").find("select").filter(":last").get(0);
+        var index;
+        if(lastobj == null) {
+            index = 0;
+        } else {
+            index = parseInt(lastobj.id.replace("tzbtn",""))+1;
+        }
+
         $('#timezone_forms').append('<br>');
         $('#timezone_forms').append('<select class="timezones" id="tzbtn'+index+'">' + txt + '</select>');
-        $('#timezone_forms').append('<button onclick = "deleteTimezone(event,'+index+');" form = "timezone_forms" id=dbtn'+index+'>☒</button>');
+        $('#timezone_forms').append(' <button onclick = "deleteTimezone(event,'+index+');" form = "timezone_forms" id=dbtn'+index+'><span class="fui-cross-16"></span></button>');
     }
     httpObj.send(null);
 }