diff --git a/html/index.html b/html/index.html
index 0ee883a..e359d37 100644
--- a/html/index.html
+++ b/html/index.html
@@ -779,7 +779,7 @@
-
diff --git a/html/libs/jquery.ui.touch-punch-1.12.1.js b/html/libs/jquery.ui.touch-punch-1.12.1.js
index 31272ce..28bcf70 100644
--- a/html/libs/jquery.ui.touch-punch-1.12.1.js
+++ b/html/libs/jquery.ui.touch-punch-1.12.1.js
@@ -1,11 +1,244 @@
/*!
- * jQuery UI Touch Punch 0.2.3
+ * jQuery UI Touch Punch 1.0.8 as modified by RWAP Software
+ * based on original touchpunch v0.2.3 which has not been updated since 2014
*
+ * Updates by RWAP Software to take account of various suggested changes on the original code issues
+ *
+ * Original: https://github.com/furf/jquery-ui-touch-punch
* Copyright 2011–2014, Dave Furfero
* Dual licensed under the MIT or GPL Version 2 licenses.
*
+ * Fork: https://github.com/RWAP/jquery-ui-touch-punch
+ *
* Depends:
- * jquery.ui.widget.js
- * jquery.ui.mouse.js
+ * jquery.ui.widget.js
+ * jquery.ui.mouse.js
*/
-!function(a){function f(a,b){if(!(a.originalEvent.touches.length>1)){a.preventDefault();var c=a.originalEvent.changedTouches[0],d=document.createEvent("MouseEvents");d.initMouseEvent(b,!0,!0,window,1,c.screenX,c.screenY,c.clientX,c.clientY,!1,!1,!1,!1,0,null),a.target.dispatchEvent(d)}}if(a.support.touch="ontouchend"in document,a.support.touch){var e,b=a.ui.mouse.prototype,c=b._mouseInit,d=b._mouseDestroy;b._touchStart=function(a){var b=this;!e&&b._mouseCapture(a.originalEvent.changedTouches[0])&&(e=!0,b._touchMoved=!1,f(a,"mouseover"),f(a,"mousemove"),f(a,"mousedown"))},b._touchMove=function(a){e&&(this._touchMoved=!0,f(a,"mousemove"))},b._touchEnd=function(a){e&&(f(a,"mouseup"),f(a,"mouseout"),this._touchMoved||f(a,"click"),e=!1)},b._mouseInit=function(){var b=this;b.element.bind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),c.call(b)},b._mouseDestroy=function(){var b=this;b.element.unbind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),d.call(b)}}}(jQuery);
\ No newline at end of file
+
+(function( factory ) {
+ if ( typeof define === "function" && define.amd ) {
+
+ // AMD. Register as an anonymous module.
+ define([ "jquery", "jquery.ui" ], factory );
+ } else {
+
+ // Browser globals
+ factory( jQuery );
+ }
+}(function ($) {
+
+ // Detect touch support - Windows Surface devices and other touch devices
+ $.support.mspointer = window.navigator.msPointerEnabled;
+ $.support.touch = ( 'ontouchstart' in document
+ || 'ontouchstart' in window
+ || window.TouchEvent
+ || (window.DocumentTouch && document instanceof DocumentTouch)
+ || navigator.maxTouchPoints > 0
+ || navigator.msMaxTouchPoints > 0
+ );
+
+ // Ignore browsers without touch or mouse support
+ if ((!$.support.touch && !$.support.mspointer) || !$.ui.mouse) {
+ return;
+ }
+
+ var mouseProto = $.ui.mouse.prototype,
+ _mouseInit = mouseProto._mouseInit,
+ _mouseDestroy = mouseProto._mouseDestroy,
+ touchHandled;
+
+ /**
+ * Get the x,y position of a touch event
+ * @param {Object} event A touch event
+ */
+ function getTouchCoords (event) {
+ return {
+ x: event.originalEvent.changedTouches[0].pageX,
+ y: event.originalEvent.changedTouches[0].pageY
+ };
+ }
+
+ /**
+ * Simulate a mouse event based on a corresponding touch event
+ * @param {Object} event A touch event
+ * @param {String} simulatedType The corresponding mouse event
+ */
+ function simulateMouseEvent (event, simulatedType) {
+
+ // Ignore multi-touch events
+ if (event.originalEvent.touches.length > 1) {
+ return;
+ }
+
+ // Prevent "Ignored attempt to cancel a touchmove event with cancelable=false" errors
+ if (event.cancelable) {
+ event.preventDefault();
+ }
+
+ var touch = event.originalEvent.changedTouches[0],
+ simulatedEvent = document.createEvent('MouseEvents');
+
+ // Initialize the simulated mouse event using the touch event's coordinates
+ simulatedEvent.initMouseEvent(
+ simulatedType, // type
+ true, // bubbles
+ true, // cancelable
+ window, // view
+ 1, // detail
+ touch.screenX, // screenX
+ touch.screenY, // screenY
+ touch.clientX, // clientX
+ touch.clientY, // clientY
+ false, // ctrlKey
+ false, // altKey
+ false, // shiftKey
+ false, // metaKey
+ 0, // button
+ null // relatedTarget
+ );
+
+ // Dispatch the simulated event to the target element
+ event.target.dispatchEvent(simulatedEvent);
+ }
+
+ /**
+ * Handle the jQuery UI widget's touchstart events
+ * @param {Object} event The widget element's touchstart event
+ */
+ mouseProto._touchStart = function (event) {
+
+ var self = this;
+
+ // Interaction time
+ this._startedMove = event.timeStamp;
+
+ // Track movement to determine if interaction was a click
+ self._startPos = getTouchCoords(event);
+
+ // Ignore the event if another widget is already being handled
+ if (touchHandled || !self._mouseCapture(event.originalEvent.changedTouches[0])) {
+ return;
+ }
+
+ // Set the flag to prevent other widgets from inheriting the touch event
+ touchHandled = true;
+
+ // Track movement to determine if interaction was a click
+ self._touchMoved = false;
+
+ // Simulate the mouseover event
+ simulateMouseEvent(event, 'mouseover');
+
+ // Simulate the mousemove event
+ simulateMouseEvent(event, 'mousemove');
+
+ // Simulate the mousedown event
+ simulateMouseEvent(event, 'mousedown');
+ };
+
+ /**
+ * Handle the jQuery UI widget's touchmove events
+ * @param {Object} event The document's touchmove event
+ */
+ mouseProto._touchMove = function (event) {
+
+ // Ignore event if not handled
+ if (!touchHandled) {
+ return;
+ }
+
+ // Interaction was moved
+ this._touchMoved = true;
+
+ // Simulate the mousemove event
+ simulateMouseEvent(event, 'mousemove');
+ };
+
+ /**
+ * Handle the jQuery UI widget's touchend events
+ * @param {Object} event The document's touchend event
+ */
+ mouseProto._touchEnd = function (event) {
+
+ // Ignore event if not handled
+ if (!touchHandled) {
+ return;
+ }
+
+ // Simulate the mouseup event
+ simulateMouseEvent(event, 'mouseup');
+
+ // Simulate the mouseout event
+ simulateMouseEvent(event, 'mouseout');
+
+ // If the touch interaction did not move, it should trigger a click
+ // Check for this in two ways - length of time of simulation and distance moved
+ // Allow for Apple Stylus to be used also
+ var timeMoving = event.timeStamp - this._startedMove;
+ if (!this._touchMoved || timeMoving < 500) {
+ // Simulate the click event
+ simulateMouseEvent(event, 'click');
+ } else {
+ var endPos = getTouchCoords(event);
+ if ((Math.abs(endPos.x - this._startPos.x) < 10) && (Math.abs(endPos.y - this._startPos.y) < 10)) {
+
+ // If the touch interaction did not move, it should trigger a click
+ if (!this._touchMoved || event.originalEvent.changedTouches[0].touchType === 'stylus') {
+ // Simulate the click event
+ simulateMouseEvent(event, 'click');
+ }
+ }
+ }
+
+ // Unset the flag to determine the touch movement stopped
+ this._touchMoved = false;
+
+ // Unset the flag to allow other widgets to inherit the touch event
+ touchHandled = false;
+ };
+
+ /**
+ * A duck punch of the $.ui.mouse _mouseInit method to support touch events.
+ * This method extends the widget with bound touch event handlers that
+ * translate touch events to mouse events and pass them to the widget's
+ * original mouse event handling methods.
+ */
+ mouseProto._mouseInit = function () {
+
+ var self = this;
+
+ // Microsoft Surface Support = remove original touch Action
+ if ($.support.mspointer) {
+ self.element[0].style.msTouchAction = 'none';
+ }
+
+ // Delegate the touch handlers to the widget's element
+ self.element.on({
+ touchstart: $.proxy(self, '_touchStart'),
+ touchmove: $.proxy(self, '_touchMove'),
+ touchend: $.proxy(self, '_touchEnd')
+ });
+
+ // Call the original $.ui.mouse init method
+ _mouseInit.call(self);
+ };
+
+ /**
+ * Remove the touch event handlers
+ */
+ mouseProto._mouseDestroy = function () {
+
+ var self = this;
+
+ // Delegate the touch handlers to the widget's element
+ self.element.off({
+ touchstart: $.proxy(self, '_touchStart'),
+ touchmove: $.proxy(self, '_touchMove'),
+ touchend: $.proxy(self, '_touchEnd')
+ });
+
+ // Call the original $.ui.mouse destroy method
+ _mouseDestroy.call(self);
+ };
+
+}));
\ No newline at end of file
diff --git a/html/script.js b/html/script.js
index 9d9e280..27883a8 100644
--- a/html/script.js
+++ b/html/script.js
@@ -2340,8 +2340,7 @@ function refreshFeatures() {
return xf - yf;
}
- let cols = planesTable.cols = {};
-
+ const cols = planesTable.cols = {};
cols.icao = {
text: 'Hex id',
@@ -2362,7 +2361,6 @@ function refreshFeatures() {
value: function(plane) { return (flightawareLinks ? getFlightAwareModeSLink(plane.icao, plane.flight, plane.name) : plane.name); },
html: flightawareLinks,
text: 'Callsign' };
-
cols.registration = {
sort: function () { sortBy('registration', compareAlpha, function(x) { return x.registration; }); },
value: function(plane) { return (flightawareLinks ? getFlightAwareIdentLink(plane.registration, plane.registration) : (plane.registration ? plane.registration : "")); },
@@ -2441,7 +2439,7 @@ function refreshFeatures() {
value: function(plane) { return format_data_source(plane.getDataSource()); },
align: 'right' };
- let colsEntries = Object.entries(cols);
+ const colsEntries = Object.entries(cols);
for (let i in colsEntries) {
let key = colsEntries[i][0];
let value = colsEntries[i][1];
@@ -2453,7 +2451,7 @@ function refreshFeatures() {
value.td = value.align ? ('| ') : ' | ';
}
- let columns = Object.values(cols);
+ let columns = createOrderedColumns();
let activeCols = null;
let initializing = true;
@@ -2485,6 +2483,7 @@ function refreshFeatures() {
planesTable.redraw();
initializing = false;
}
+
planesTable.redraw = function () {
activeCols = [];
for (let i in columns) {
@@ -2529,7 +2528,6 @@ function refreshFeatures() {
planesTable.redraw();
}
-
// Refreshes the larger table of all the planes
planesTable.refresh = function () {
if (initializing)
@@ -2671,7 +2669,6 @@ function refreshFeatures() {
let sortCompare = null;
let sortExtract = null;
let sortAscending = true;
- let columnVis = Array(30).fill(true);
function sortFunction(x,y) {
const xv = x._sort_value;
@@ -2786,18 +2783,28 @@ function refreshFeatures() {
//
function createColumnToggles() {
- let container = '#columns_block1';
+ const prefix = 'dd_';
+ const sortableColumns = $('#sortableColumns').sortable({
+ update: function (event, ui) {
+ const order = [];
+ $('#sortableColumns li').each(function (e) {
+ order.push($(this).attr('id').replace(prefix, ''));
+ });
- for (let i in columns) {
- let col = columns[i];
- if (col.id === 'distance') {
- container = '#columns_block2';
+ localStorage['columnOrder'] = JSON.stringify(order);
+ columns = createOrderedColumns();
+
+ planesTable.redraw();
}
+ });
+ for (let col of columns) {
+ sortableColumns.append(``);
+
new Toggle({
key: col.toggleKey,
display: col.text,
- container: container,
+ container: $(`#${prefix + col.id}`),
init: col.visible,
setState: function (state) {
planesTable.setColumnVis(col.id, state);
@@ -2806,6 +2813,23 @@ function refreshFeatures() {
}
}
+ function createOrderedColumns() {
+ const order = localStorage['columnOrder'];
+ if (order !== undefined) {
+ const columns = [];
+ for (let col of JSON.parse(order)) {
+ const column = cols[col];
+ if (column !== undefined) {
+ columns.push(column);
+ }
+ }
+ if (columns.length > 0) {
+ return columns;
+ }
+ }
+ return Object.values(cols);
+ }
+
return TAR;
}(window, jQuery, TAR || {}));
//
diff --git a/html/style.css b/html/style.css
index 9d72252..a37cc1d 100644
--- a/html/style.css
+++ b/html/style.css
@@ -759,3 +759,19 @@ table.infoSectionTable tr td {
font-size: var(--FS2);
text-align: center;
}
+
+#sortableColumns {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+ max-width: calc( 2 * 130px * var(--SCALE));
+}
+
+#sortableColumns li {
+ margin: 5px 5px 5px 0;
+ padding: calc( 1px * var(--SCALE));
+ float: left;
+ width: calc( 120px * var(--SCALE));
+ border-color: gainsboro;
+ background-color: ghostwhite;
+}
|