From 2b645413fc163863d000bddde5bc27a836321422 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sat, 13 Apr 2019 23:06:48 +0000
Subject: [PATCH] Get rid of jQuery dependency - use XHR and Promise
---
common.js | 81 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 5 deletions(-)
diff --git a/common.js b/common.js
index 6733d46..b434bf1 100644
--- a/common.js
+++ b/common.js
@@ -8,7 +8,6 @@
};
var ttss_types = ['t', 'b'];
-// Special directions
var special_directions = {
'Zajezdnia Nowa Huta' : 'ZH',
'Zajezdnia Podgórze' : 'ZP',
@@ -17,12 +16,77 @@
'Przejazd techniczny' : 'PT',
};
+
+/********
+ * AJAX *
+ ********/
+
+function Deferred(promise, request) {
+ return {
+ promise: promise,
+ request: request,
+ abort: function() {
+ request.abort.bind(request)
+ return Deferred(promise, request);
+ },
+ done: function(func) {
+ return Deferred(promise.then(func), request);
+ },
+ fail: function(func) {
+ return Deferred(promise.catch(func), request);
+ },
+ always: function(func) {
+ return Deferred(promise.finally(func), request);
+ },
+ };
+}
+
+Deferred.all = function(iterable) {
+ return Deferred(
+ Promise.all(
+ iterable.map(x => x.promise)
+ )
+ );
+};
+
+var $ = {
+ timeout: 10000,
+ dataType: 'json',
+ get: function(url) {
+ var self = this;
+ var request = new XMLHttpRequest();
+ var promise = new Promise(function(resolve, reject) {
+ request.timeout = self.timeout;
+ request.onreadystatechange = function() {
+ if(this.readyState == 4) {
+ if(this.status == 200) {
+ if(self.dataType == 'json') {
+ resolve(JSON.parse(this.responseText));
+ } else {
+ resolve(this.responseText);
+ }
+ } else {
+ reject(request);
+ }
+ }
+ };
+ request.open("GET", url, true);
+ request.send();
+ });
+ return Deferred(promise, request);
+ },
+};
+
+
+/***********
+ * VERSION *
+ ***********/
+
var script_version;
var script_version_xhr;
var vehicles_info = {};
-// Check for website updates
function checkVersion() {
if(script_version_xhr) script_version_xhr.abort();
@@ -46,7 +110,11 @@
setInterval(checkVersion, 3600000);
}
-/* Parsing of received JSON parts */
+
+/***********
+ * PARSING *
+ ***********/
+
function parseStatus(status) {
switch(status.status) {
case 'STOPPING':
@@ -91,7 +159,6 @@
return lang.time_minutes_prefix + ((actual.getTime() - planned.getTime()) / 1000 / 60) + lang.time_minutes_suffix;
}
-// Webservice-related functions
function parseVehicle(vehicleId) {
if(!vehicleId) return false;
if(!vehicles_info || !vehicles_info[vehicleId]) {
@@ -159,7 +226,11 @@
return span;
}
-// Element mangling
+
+/*******
+ * DOM *
+ *******/
+
function deleteChildren(element) {
while(element.lastChild) element.removeChild(element.lastChild);
}
--
Gitblit v1.9.1