Index: lams_admin/web/WEB-INF/tags/TabBody.tag =================================================================== diff -u -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1 -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_admin/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1) +++ lams_admin/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -41,4 +41,13 @@ active -
+
+ + + + + + + + +
\ No newline at end of file Index: lams_admin/web/WEB-INF/tags/Tabs.tag =================================================================== diff -u -rf7cb84defcd7ff6e4f3232f2ef1856f1311215d9 -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_admin/web/WEB-INF/tags/Tabs.tag (.../Tabs.tag) (revision f7cb84defcd7ff6e4f3232f2ef1856f1311215d9) +++ lams_admin/web/WEB-INF/tags/Tabs.tag (.../Tabs.tag) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -31,6 +31,7 @@ <%@ attribute name="control" required="false" rtexprvalue="true"%> <%@ attribute name="title" required="false" rtexprvalue="true"%> <%@ attribute name="refreshOnClickAction" required="false" rtexprvalue="true"%> +<%@ attribute name="helpPage" required="false" rtexprvalue="true"%> <%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%> <%@ attribute name="helpModule" required="false" rtexprvalue="true"%> <%@ attribute name="extraControl" required="false" rtexprvalue="true"%> @@ -39,7 +40,7 @@ <%@ taglib uri="tags-lams" prefix="lams"%> - + @@ -62,27 +63,34 @@ - ${title} + + ${title} + Index: lams_central/web/WEB-INF/tags/TabBody.tag =================================================================== diff -u -r268809b34d41cef37fc1cbacc9aa0d2eeb245377 -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_central/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 268809b34d41cef37fc1cbacc9aa0d2eeb245377) +++ lams_central/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -41,4 +41,13 @@ active -
+
+ + + + + + + + +
\ No newline at end of file Index: lams_central/web/WEB-INF/tags/Tabs.tag =================================================================== diff -u -r98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09 -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_central/web/WEB-INF/tags/Tabs.tag (.../Tabs.tag) (revision 98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09) +++ lams_central/web/WEB-INF/tags/Tabs.tag (.../Tabs.tag) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -31,6 +31,7 @@ <%@ attribute name="control" required="false" rtexprvalue="true"%> <%@ attribute name="title" required="false" rtexprvalue="true"%> <%@ attribute name="refreshOnClickAction" required="false" rtexprvalue="true"%> +<%@ attribute name="helpPage" required="false" rtexprvalue="true"%> <%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%> <%@ attribute name="helpModule" required="false" rtexprvalue="true"%> <%@ attribute name="extraControl" required="false" rtexprvalue="true"%> @@ -39,7 +40,7 @@ <%@ taglib uri="tags-lams" prefix="lams"%> - + @@ -62,27 +63,34 @@ - ${title} + + ${title} + Index: lams_central/web/css/index.css =================================================================== diff -u -r64d328ea0d7c6839143a522755843fb3c5b50382 -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_central/web/css/index.css (.../index.css) (revision 64d328ea0d7c6839143a522755843fb3c5b50382) +++ lams_central/web/css/index.css (.../index.css) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -29,6 +29,7 @@ .dialogContainer .modal-body { height : 100%; max-height: calc(100% - 60px); + padding: 0; } .dialogContainer iframe { Index: lams_central/web/includes/javascript/dialog.js =================================================================== diff -u -r64d328ea0d7c6839143a522755843fb3c5b50382 -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_central/web/includes/javascript/dialog.js (.../dialog.js) (revision 64d328ea0d7c6839143a522755843fb3c5b50382) +++ lams_central/web/includes/javascript/dialog.js (.../dialog.js) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -126,6 +126,8 @@ 'at' : 'center top+20px', 'of' : window }); + + internalContent.trigger('resizestop'); }); $('.dialogMinimise', dialog).click(function() { Index: lams_central/web/includes/javascript/groupDisplay.js =================================================================== diff -u -rdc4ba204bb906332f9bb94cf9d24c1cf6d2c1630 -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_central/web/includes/javascript/groupDisplay.js (.../groupDisplay.js) (revision dc4ba204bb906332f9bb94cf9d24c1cf6d2c1630) +++ lams_central/web/includes/javascript/groupDisplay.js (.../groupDisplay.js) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -175,16 +175,26 @@ // if it was just created if (dialog) { // tell the dialog contents that it was resized - $('.modal-content', dialog).on('resizestop dialogextendmaximize dialogextendrestore', function(){ - var frame = $('iframe', dialog)[0], - win = frame.contentWindow || frame.contentDocument; - win.resizeSequenceCanvas(dialog.width() - 10, dialog.height() - 10); - }); + $('.modal-content', dialog).on('resizestop', resizeSequenceCanvas); + // initial resize + $('iframe', dialog).load(resizeSequenceCanvas); + dialog.modal('show'); } } +function resizeSequenceCanvas(){ + var body = $('.modal-body'), + frame = $('iframe', body); + if (frame.length > 0) { + var win = frame[0].contentWindow || frame[0].contentDocument; + if (win.resizeSequenceCanvas) { + win.resizeSequenceCanvas(body.width(), body.height()); + } + } +} + function showAddLessonDialog(orgID) { showDialog("dialogAddLesson", { 'data' : { Index: lams_gradebook/web/WEB-INF/tags/Tab.tag =================================================================== diff -u -re074865bde063cd3ac9e531a90857d07de9d121c -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_gradebook/web/WEB-INF/tags/Tab.tag (.../Tab.tag) (revision e074865bde063cd3ac9e531a90857d07de9d121c) +++ lams_gradebook/web/WEB-INF/tags/Tab.tag (.../Tab.tag) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -24,8 +24,8 @@ /** * Tab.tag - * Author: Mitchell Seaton - * Description: Creates a tab element. + * Author: Fiona Malikoff + * Description: Creates a tab element within the Hybrid Tab Header. * Wiki: */ %> @@ -54,6 +54,9 @@ <%-- Usually methodCall is selectTab, but the calling code can override methodCall if desired. this is handy if the page needs different logic on initialisation and user switching tabs + + -- onclick="${methodCall}(${id});return false;"> + --%> @@ -73,13 +76,14 @@ -
-
- -
-
+ + + class="active" + + + + + class="disabled" + + +
  • ${tabTitle}
    • Index: lams_gradebook/web/WEB-INF/tags/TabBody.tag =================================================================== diff -u -re074865bde063cd3ac9e531a90857d07de9d121c -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_gradebook/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision e074865bde063cd3ac9e531a90857d07de9d121c) +++ lams_gradebook/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -28,25 +28,26 @@ * Wiki: */ - %> -<%@ tag body-content="scriptless"%> +%> <%@ attribute name="id" required="true" rtexprvalue="true"%> <%@ attribute name="tabTitle" required="false" rtexprvalue="true"%> <%@ attribute name="titleKey" required="false" rtexprvalue="true"%> <%@ attribute name="page" required="false" rtexprvalue="true"%> <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-bean" prefix="bean"%> - -
    - - - - - - - - + + + active + -
    - +
    + + + + + + + + +
    \ No newline at end of file Index: lams_learning/web/WEB-INF/tags/Tab.tag =================================================================== diff -u -r472bcb813040efc160e074021be5c71c15455f00 -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_learning/web/WEB-INF/tags/Tab.tag (.../Tab.tag) (revision 472bcb813040efc160e074021be5c71c15455f00) +++ lams_learning/web/WEB-INF/tags/Tab.tag (.../Tab.tag) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -1,85 +1,89 @@ -<% - /**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * ============================================================= - * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2.0 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - * - * http://www.gnu.org/licenses/gpl.txt - * **************************************************************** - */ - - /** - * Tab.tag - * Author: Mitchell Seaton - * Description: Creates a tab element. - * Wiki: - */ -%> -<%@ tag body-content="empty"%> -<%@ attribute name="id" required="true" rtexprvalue="true"%> -<%@ attribute name="value" required="false" rtexprvalue="true"%> -<%@ attribute name="key" required="false" rtexprvalue="true"%> -<%@ attribute name="inactive" required="false" rtexprvalue="true"%> -<%@ attribute name="methodCall" required="false" rtexprvalue="true"%> - -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-fmt" prefix="fmt"%> -<%@ taglib uri="tags-lams" prefix="lams"%> - -<%-- Check if bundle is set --%> - - - - - - - - - - -<%-- - Usually methodCall is selectTab, but the calling code can override methodCall if desired. - this is handy if the page needs different logic on initialisation and user switching tabs ---%> - - - - - - - - - - - - - - - - - - -
    -
    - -
    -
    +<% + /**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + /** + * Tab.tag + * Author: Fiona Malikoff + * Description: Creates a tab element within the Hybrid Tab Header. + * Wiki: + */ +%> +<%@ tag body-content="empty"%> +<%@ attribute name="id" required="true" rtexprvalue="true"%> +<%@ attribute name="value" required="false" rtexprvalue="true"%> +<%@ attribute name="key" required="false" rtexprvalue="true"%> +<%@ attribute name="inactive" required="false" rtexprvalue="true"%> +<%@ attribute name="methodCall" required="false" rtexprvalue="true"%> + +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-lams" prefix="lams"%> + +<%-- Check if bundle is set --%> + + + + + + + + + + +<%-- + Usually methodCall is selectTab, but the calling code can override methodCall if desired. + this is handy if the page needs different logic on initialisation and user switching tabs + + -- onclick="${methodCall}(${id});return false;"> + +--%> + + + + + + + + + + + + + + + + + + + + + class="active" + + + + + class="disabled" + + +
  • ${tabTitle}
    • Index: lams_learning/web/WEB-INF/tags/TabBody.tag =================================================================== diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_learning/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6) +++ lams_learning/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -1,52 +1,53 @@ -<%/**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * ============================================================= - * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2.0 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - * - * http://www.gnu.org/licenses/gpl.txt - * **************************************************************** - */ - -/** - * TabBody.tag - * Author: Mitchell Seaton - * Description: Creates the body container for a tab element - * Wiki: - */ - - %> -<%@ tag body-content="scriptless"%> -<%@ attribute name="id" required="true" rtexprvalue="true"%> -<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%> -<%@ attribute name="titleKey" required="false" rtexprvalue="true"%> -<%@ attribute name="page" required="false" rtexprvalue="true"%> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-bean" prefix="bean"%> - - -
    - - - - - - - - - -
    - +<%/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/** + * TabBody.tag + * Author: Mitchell Seaton + * Description: Creates the body container for a tab element + * Wiki: + */ + +%> +<%@ attribute name="id" required="true" rtexprvalue="true"%> +<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%> +<%@ attribute name="titleKey" required="false" rtexprvalue="true"%> +<%@ attribute name="page" required="false" rtexprvalue="true"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-bean" prefix="bean"%> + + + + active + + +
    + + + + + + + + +
    \ No newline at end of file Index: lams_monitoring/web/WEB-INF/tags/TabBody.tag =================================================================== diff -u -r5848d955870689ca056a8f7ea7c147947d07dd0f -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_monitoring/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 5848d955870689ca056a8f7ea7c147947d07dd0f) +++ lams_monitoring/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -41,4 +41,13 @@ active -
    +
    + + + + + + + + +
    \ No newline at end of file Index: lams_monitoring/web/WEB-INF/tags/Tabs.tag =================================================================== diff -u -r5848d955870689ca056a8f7ea7c147947d07dd0f -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_monitoring/web/WEB-INF/tags/Tabs.tag (.../Tabs.tag) (revision 5848d955870689ca056a8f7ea7c147947d07dd0f) +++ lams_monitoring/web/WEB-INF/tags/Tabs.tag (.../Tabs.tag) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -31,6 +31,7 @@ <%@ attribute name="control" required="false" rtexprvalue="true"%> <%@ attribute name="title" required="false" rtexprvalue="true"%> <%@ attribute name="refreshOnClickAction" required="false" rtexprvalue="true"%> +<%@ attribute name="helpPage" required="false" rtexprvalue="true"%> <%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%> <%@ attribute name="helpModule" required="false" rtexprvalue="true"%> <%@ attribute name="extraControl" required="false" rtexprvalue="true"%> @@ -39,7 +40,7 @@ <%@ taglib uri="tags-lams" prefix="lams"%> - + @@ -62,27 +63,34 @@ - ${title} + + ${title} + Index: lams_monitoring/web/css/monitorLesson.css =================================================================== diff -u -r6712a950e89732a93a16f3a0c0433910284994aa -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_monitoring/web/css/monitorLesson.css (.../monitorLesson.css) (revision 6712a950e89732a93a16f3a0c0433910284994aa) +++ lams_monitoring/web/css/monitorLesson.css (.../monitorLesson.css) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -12,24 +12,22 @@ margin-top: 30%; } -div#tabs { - width: 99%; - overflow: hidden; - border: none; +#content { + width: 100%; + padding: 0; } -.ui-tabs .ui-tabs-panel { - padding: 0px; +#content > .panel { + border: none; + border-shadow: none; + box-shadow: none; } -div#tabs ul { - cursor: move; +#content .panel-monitor-page, #content .panel-monitor-body { + margin-bottom: 0; + padding-bottom: 0; } -div#tabs ul li a { - border-bottom: none; -} - .errorMessage { font-weight: bold; color: red; @@ -223,7 +221,8 @@ /********** SEQUENCE TAB STYLES **********/ div#sequenceCanvas { text-align: center; - width: 1024px; + width: 100%; + height: 100%; overflow: auto; } Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -r6712a950e89732a93a16f3a0c0433910284994aa -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 6712a950e89732a93a16f3a0c0433910284994aa) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -918,15 +918,8 @@ }, success : function(response) { originalSequenceCanvas = response; - // store body dimensions before manipulating HTML - // otherwise resizing will yield bad results - var width = $('body').width(), - height = $('body').height(); - // Remove previously set padding and dimensions, if any. - // For some reason sequenceCanvas needs to be assigned again here. sequenceCanvas = $('#sequenceCanvas').removeAttr('style') .html(originalSequenceCanvas); - resizeSequenceCanvas(width, height); }, error : function(error) { exit = true; @@ -1592,19 +1585,18 @@ */ function resizeSequenceCanvas(width, height){ // can the calculation it be done nicer? - var canvasHeight = height - $('#tabs>ul').height() - $('#sequenceTopButtonsContainer').height() - - Math.min(20, $('#completedLearnersContainer').height()) - 45, - canvasWidth = width - 15, + var canvasHeight = height - $('.navbar').height() - $('#sequenceTopButtonsContainer').height() + - Math.min(20, $('#completedLearnersContainer').height()), + canvasWidth = width, svg = $('svg', sequenceCanvas), // center a small SVG inside large DIV - canvasPaddingTop = Math.max(0, canvasHeight/2 - svg.attr('height')/2), - canvasPaddingLeft = Math.max(0, canvasWidth/2 - svg.attr('width')/2); + canvasPaddingTop = Math.max(0, canvasHeight/2 - svg.attr('height')/2 - 50), + canvasPaddingLeft = Math.max(0, canvasWidth/2 - svg.attr('width')/2 - 40); sequenceCanvas.css({ - 'padding-top' : canvasPaddingTop, - 'padding-left' : canvasPaddingLeft, - 'width' : canvasWidth - canvasPaddingLeft, - 'height' : canvasHeight - canvasPaddingTop + 'padding-top' : canvasPaddingTop + 'px', + 'padding-left' : canvasPaddingLeft + 'px', + 'height' : canvasHeight - 70 + 'px' }); } @@ -2018,17 +2010,30 @@ colorDialogList(learnerGroupDialog); if (!isRefresh) { - // show buttons and labels depending on parameters $('span#learnerGroupMultiSelectLabel, button#learnerGroupDialogForceCompleteButton', learnerGroupDialogParent) .css('display', allowForceComplete ? 'inline' : 'none'); $('button#learnerGroupDialogViewButton', learnerGroupDialogParent) .css('display', allowView ? 'inline' : 'none'); $('button#learnerGroupDialogEmailButton', learnerGroupDialogParent) .css('display', allowEmail ? 'inline' : 'none'); - - learnerGroupDialog - .dialog('option', +// +// showDialog('learnerGroupDialog', { +// 'data' : { +// +// }, +// 'height' : 650, +// 'width' : 850, +// 'title' : dialogTitle, +// 'open' : function() { +// $('.modal-body', this).empty().append($('#learnerGroupDialogContents')); +// }, +// 'beforeClose' : function(){ +// $('#learnerGroupDialogContents').appendTo('body') +// } +// }, false); + + learnerGroupDialog.dialog('option', { 'title' : dialogTitle, // save properties for refresh @@ -2038,8 +2043,8 @@ 'allowEmail' : allowEmail }) .dialog('open'); + } } -} /** @@ -2207,18 +2212,19 @@ */ function dblTap(elem, dblClickFunction) { // double tap detection on mobile devices; it works also for mouse clicks - elem.tap(function(event){ - var currentTime = new Date().getTime(); - // is the second click on the same element as the first one? - if (event.currentTarget == lastTapTarget) { - // was the second click quick enough after the first one? - var tapLength = currentTime - lastTapTime; - if (tapLength < tapTimeout && tapLength > 0) { - event.preventDefault(); - dblClickFunction(event); - } - } - lastTapTime = currentTime; - lastTapTarget = event.currentTarget; - }); + // temporarly switched to click as jQuery mobile was removed for bootstrapping + elem.click(function(event) { + var currentTime = new Date().getTime(); + // is the second click on the same element as the first one? + if (event.currentTarget == lastTapTarget) { + // was the second click quick enough after the first one? + var tapLength = currentTime - lastTapTime; + if (tapLength < tapTimeout && tapLength > 0) { + event.preventDefault(); + dblClickFunction(event); + } + } + lastTapTime = currentTime; + lastTapTarget = event.currentTarget; + }); } \ No newline at end of file Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r71f818a95ce2f920ffe087c33961f80f7294f78d -r36e474218e1201198ba926e57e56c7a885db1a9f --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 71f818a95ce2f920ffe087c33961f80f7294f78d) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) @@ -10,31 +10,35 @@ - + - + - - - + + + + + - -