Fix bot-list scroll and height (#166)

* Add collapse on bots menu(similar to Settings) - hide/show bot(names). * Fix bot-list scroll and height(optimise for mobile devices). * Add configurable request frequency.
tehp · Aug 11, 2016 · 1d95163 · 1d95163
1 parent 56f79b6
commit 1d95163
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/config/userdata.js.example b/config/userdata.js.example
@@ -9,3 +9,9 @@ var userInfo = {
 	botPath: true,
 	actionsEnabled: false
 };
+//milliseconds
+var dataUpdates = {
+    updateTrainer: 1000,
+    addCatchable: 1000,
+    addInventory: 5000
+};
diff --git a/css/main.css b/css/main.css
@@ -74,7 +74,8 @@ html, body {
     float: left;
 }
 #bots-list {
-	max-height: 80vh;
+	max-height: 70vh;
+	overflow-y: scroll;
 }
 #bots-list::-webkit-scrollbar {
 	display: none;

diff --git a/js/main.js b/js/main.js
@@ -161,7 +161,7 @@ var mapView = {
   settings: {},
   init: function() {
     var self = this;
-    self.settings = $.extend(true, self.settings, userInfo);
+    self.settings = $.extend(true, self.settings, userInfo, dataUpdates);
     self.bindUi();
 
     $.getScript('https://maps.googleapis.com/maps/api/js?key={0}&libraries=drawing'.format(self.settings.gMapsAPIKey), function() {
@@ -290,9 +290,9 @@ var mapView = {
     });
     self.placeTrainer();
     self.addCatchable();
-    setInterval(self.updateTrainer, 1000);
-    setInterval(self.addCatchable, 1000);
-    setInterval(self.addInventory, 5000);
+    setInterval(self.updateTrainer, self.settings.updateTrainer);
+    setInterval(self.addCatchable, self.settings.addCatchable);
+    setInterval(self.addInventory, self.settings.addInventory);
   },
   addCatchable: function() {
     var self = mapView;
@@ -979,8 +979,12 @@ var mapView = {
     xhr.onreadystatechange = function() {
       if (xhr.readyState === XMLHttpRequest.DONE) {
         if (xhr.status === 200) {
-          if (success)
-            success(JSON.parse(xhr.responseText.replace(/\bNaN\b/g, 'null')), successData);
+          if (success) {
+            try {
+              success(JSON.parse(xhr.responseText.replace(/\bNaN\b/g, 'null')), successData);
+            } catch (err) {
+            }
+          }
         } else {
           if (error)
             error(xhr);