Skip to content

Commit b9abd63

Browse files
reworked click/tap events; rossengeorgiev#85
* chrome & opera can't drag scroll in any configuration, wierd * links and buttons work inside vehicle panels
1 parent 21dbfe4 commit b9abd63

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

css/main.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,12 @@ header > div {
222222
#main {
223223
float: left;
224224
overflow: hidden;
225+
-webkit-touch-callout: none;
226+
-webkit-user-select: none;
227+
-khtml-user-select: none;
228+
-moz-user-select: none;
229+
-ms-user-select: none;
230+
user-select: none;
225231
}
226232

227233
header .search {

js/app.js

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
// detect if mobile
22
var is_mobile = false;
33

4-
if(
5-
navigator.userAgent.match(/Android/i) ||
6-
navigator.userAgent.match(/iPhone/i) ||
7-
navigator.userAgent.match(/iPod/i) ||
8-
navigator.userAgent.match(/iPad/i) ||
9-
navigator.userAgent.match(/Windows Phone/i) ||
10-
navigator.userAgent.match(/webOS/i) ||
11-
navigator.userAgent.match(/BlackBerry/i)
12-
) is_mobile = true;
4+
(function(a,b){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) is_mobile = true;})(navigator.userAgent||navigator.vendor||window.opera);
135

146
// hash url
157
var history_supported = (typeof history !== 'undefined');
@@ -530,7 +522,8 @@ $(window).ready(function() {
530522
scrollbars: true,
531523
scrollbarClass: 'scrollStyle',
532524
shrinkScrollbars: 'scale',
533-
tap: true,
525+
tap: is_mobile,
526+
click: is_mobile,
534527
});
535528

536529
$('#telemetry_graph').on('click', '.graph_label', function() {
@@ -565,7 +558,7 @@ $(window).ready(function() {
565558
if(wvar.graph_expanded) $('#telemetry_graph .graph_label').click();
566559

567560
// hysplit button
568-
$("#main").on('tap','.row .data .vbutton.hysplit', function(event) {
561+
$("#main").on('click','.row .data .vbutton.hysplit', function(event) {
569562
event.stopPropagation();
570563

571564
var elm = $(this);
@@ -581,7 +574,7 @@ $(window).ready(function() {
581574
}
582575
});
583576

584-
$("#main").on('tap','.row .data .vbutton.path', function(event) {
577+
$("#main").on('click','.row .data .vbutton.path', function(event) {
585578
event.stopPropagation();
586579

587580
var elm = $(this);
@@ -613,24 +606,24 @@ $(window).ready(function() {
613606
});
614607

615608
// confirm dialog when launchnig a native map app with coordinates
616-
$('#main').on('click', '#launch_mapapp', function() {
617-
var answer = confirm("Launch your maps app?");
609+
//$('#main').on('click', '#launch_mapapp', function() {
610+
// var answer = confirm("Launch your maps app?");
618611

619-
//analytics
620-
if(typeof _gaq == 'object') _gaq.push(['_trackEvent', 'Functionality', ((answer)?"Yes":"No"), 'Coord Click']);
612+
// //analytics
613+
// if(typeof _gaq == 'object') _gaq.push(['_trackEvent', 'Functionality', ((answer)?"Yes":"No"), 'Coord Click']);
621614

622-
return answer;
623-
});
615+
// return answer;
616+
//});
624617

625618
// follow vehicle by clicking on data
626-
$('#main').on('tap', '.row .data', function() {
619+
$('#main').on('click', '.row .data', function() {
627620
var e = $(this).parent();
628621

629622
followVehicle(e.attr('data-vcallsign'));
630623
});
631624

632625
// expand/collapse data when header is clicked
633-
$('#main').on('tap', '.row .header', function() {
626+
$('#main').on('click', '.row .header', function() {
634627
var e = $(this).parent();
635628
if(e.hasClass('active')) {
636629
// collapse data for selected vehicle

js/iscroll.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ IScroll.prototype = {
604604
this.endTime = utils.getTime();
605605

606606
// reset if we are outside of the boundaries
607-
if ( this.resetPosition(this.options.bounceTime) ) {
607+
if ( this.moved && this.resetPosition(this.options.bounceTime) ) {
608608
return;
609609
}
610610

0 commit comments

Comments
 (0)