Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -ra9baa21a7112e1f9c9aec0e78d3e483b3bbd17f1 -r85c9bb1cef2a5b0fe0b561d60ecc599280eff310 --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision a9baa21a7112e1f9c9aec0e78d3e483b3bbd17f1) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 85c9bb1cef2a5b0fe0b561d60ecc599280eff310) @@ -34,8 +34,12 @@ autoRefreshInterval = 30 * 1000, autoRefreshIntervalObject = null, // when user is doing something, do not auto refresh - autoRefreshBlocked = false; + autoRefreshBlocked = false, +// double tap support + tapTimeout = 500, + lastTap = 0; + // ********* GENERAL TABS FUNCTIONS ********* function initTabs(){ @@ -742,23 +746,17 @@ .fadeIn(); var canvasHeight = sequenceCanvas.height(), - canvasWidth = sequenceCanvas.width(), + canvasWidth = Math.min('1010', sequenceCanvas.width()), svg = $('svg', sequenceCanvas), - canvasPaddingTop = canvasHeight/2 - svg.attr('height')/2, - canvasPaddingLeft = canvasWidth/2 - svg.attr('width')/2; + canvasPaddingTop = Math.max(0, canvasHeight/2 - svg.attr('height')/2), + canvasPaddingLeft = Math.max(0, canvasWidth/2 - svg.attr('width')/2); - if (canvasPaddingTop > 0) { - sequenceCanvas.css({ - 'padding-top' : canvasPaddingTop, - 'height' : canvasHeight - canvasPaddingTop - }); - } - if (canvasPaddingLeft > 0) { - sequenceCanvas.css({ - 'padding-left' : canvasPaddingLeft, - 'width' : canvasWidth - canvasPaddingLeft - }); - } + sequenceCanvas.css({ + 'padding-top' : canvasPaddingTop, + 'padding-left' : canvasPaddingLeft, + 'width' : canvasWidth - canvasPaddingLeft, + 'height' : canvasHeight - canvasPaddingTop + }); } }); } @@ -819,21 +817,29 @@ addActivityIconsHandlers(activity); if (activity.url || activity.isBranching) { + var dblClickFunction = + // different behaviour for regular/branching activities + activity.isBranching ? + function(){ showBranchingSequence(activity.id); } + : + function(){ + // double click on activity shape to open Monitoring for this activity + openPopUp(LAMS_URL + activity.url, "MonitorActivity", 720, 900, true, true); + }; // find activity group, if it is not hidden $('g#' + activity.id, sequenceCanvas) .css('cursor', 'pointer') - .dblclick( - // different behaviour for regular/branching activities - activity.isBranching ? - function(){ - showBranchingSequence(activity.id); - } - : - function(){ - // double click on activity shape to open Monitoring for this activity - openPopUp(LAMS_URL + activity.url, "MonitorActivity", 720, 900, true, true); - } - ); + .dblclick(dblClickFunction) + // double tap detection on mobile devices + .tap(function(event){ + var currentTime = new Date().getTime(), + tapLength = currentTime - lastTap; + if (tapLength < tapTimeout && tapLength > 0) { + event.preventDefault(); + dblClickFunction(); + } + lastTap = currentTime; + }); } }); Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r85c9bb1cef2a5b0fe0b561d60ecc599280eff310 --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 85c9bb1cef2a5b0fe0b561d60ecc599280eff310) @@ -16,6 +16,14 @@ + + @@ -102,7 +110,7 @@ -
+