Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2017-12-19 14:00:27 +08:00
parent ab4f445f19 f157829c16
commit a0b1844984
6 changed files with 76 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/js/batchcreate.js
+13 -1
View File
@@ -139,7 +139,19 @@ if(navigator.userAgent.indexOf("Firefox") < 0)
$(document).keydown(function(event)
{
if(event.keyCode == 38)
if(event.ctrlKey && event.keyCode == 38)
{
event.stopPropagation();
event.preventDefault();
selectFocusJump('up');
}
else if(event.ctrlKey && event.keyCode == 40)
{
event.stopPropagation();
event.preventDefault();
selectFocusJump('down');
}
else if(event.keyCode == 38)
{
inputFocusJump('up');
}
module/story/js/batchcreate.js
+13 -1
View File
@@ -37,7 +37,19 @@ $(document).on('mousedown', 'select', function()
$(document).keydown(function(event)
{
if(event.keyCode == 38)
if(event.ctrlKey && event.keyCode == 38)
{
event.stopPropagation();
event.preventDefault();
selectFocusJump('up');
}
else if(event.ctrlKey && event.keyCode == 40)
{
event.stopPropagation();
event.preventDefault();
selectFocusJump('down');
}
else if(event.keyCode == 38)
{
inputFocusJump('up');
}
module/task/js/batchcreate.js
+13 -1
View File
@@ -156,7 +156,19 @@ $(function()
$(document).keydown(function(event)
{
if(event.keyCode == 38)
if(event.ctrlKey && event.keyCode == 38)
{
event.stopPropagation();
event.preventDefault();
selectFocusJump('up');
}
else if(event.ctrlKey && event.keyCode == 40)
{
event.stopPropagation();
event.preventDefault();
selectFocusJump('down');
}
else if(event.keyCode == 38)
{
inputFocusJump('up');
}
module/task/model.php
+1 -1
View File
@@ -259,7 +259,7 @@ class taskModel extends model
{
if(!$taskID) return true;
$tasks = $this->dao->select('`id`,`estimate`,`consumed`,`left`')->from(TABLE_TASK)->where('parent')->eq($taskID)->fetchAll('id');
$tasks = $this->dao->select('`id`,`estimate`,`consumed`,`left`')->from(TABLE_TASK)->where('parent')->eq($taskID)->andWhere('status')->ne('cancel')->fetchAll('id');
if(empty($tasks)) return true;
$estimate = 0;
module/testcase/js/batchcreate.js
+13 -1
View File
@@ -60,7 +60,19 @@ $(document).ready(function()
$(document).keydown(function(event)
{
if(event.keyCode == 38)
if(event.ctrlKey && event.keyCode == 38)
{
event.stopPropagation();
event.preventDefault();
selectFocusJump('up');
}
else if(event.ctrlKey && event.keyCode == 40)
{
event.stopPropagation();
event.preventDefault();
selectFocusJump('down');
}
else if(event.keyCode == 38)
{
inputFocusJump('up');
}
www/js/my.full.js
+23
View File
@@ -1963,6 +1963,29 @@ function inputFocusJump(type){
}
}
/**
* Focus move up or down for select.
*
* @param type
*/
function selectFocusJump(type)
{
var hasFocus = $('select').is(':focus');
if(hasFocus)
{
var title = $("select:focus").attr('name').replace(/\[\d]/g, '');
var $select = $("select[name^=" + title + "]:not([name*='%'])");
var num = $select.length;
var index = parseInt($("select:focus").attr('name').replace(/[^0-9]/g, ''));
var nextIndex = type == 'down' ? index + 1 : index - 1;
if(nextIndex < num && nextIndex >= 0)
{
$select[nextIndex].focus();
}
}
}
/* Ping the server every some minutes to keep the session. */
needPing = true;