diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js index 49f06f9bba..9e704131eb 100644 --- a/module/bug/js/browse.js +++ b/module/bug/js/browse.js @@ -3,24 +3,6 @@ $(document).ready(function() if(browseType == 'bysearch') ajaxGetSearchForm(); if($('#bugList thead th.w-title').width() < 150) $('#bugList thead th.w-title').width(150); - $('.dropdown-menu .with-search .menu-search').click(function(e) - { - e.stopPropagation(); - return false; - }).on('keyup change paste', 'input', function() - { - var val = $(this).val().toLowerCase(); - var $options = $(this).closest('.dropdown-menu.with-search').find('.option'); - if(val == '') return $options.removeClass('hide'); - $options.each(function() - { - var $option = $(this); - $option.toggleClass('hide', $option.text().toString().toLowerCase().indexOf(val) < 0 && $option.data('key').toString().toLowerCase().indexOf(val) < 0); - }); - }); - setTimeout(function(){fixedTfootAction('#bugForm')}, 100); - setTimeout(function(){fixedTheadOfList('#bugList')}, 100); - if(flow == 'onlyTest') { $('#modulemenu > .nav').append($('#featurebar > .submenu').html()); diff --git a/module/build/js/view.js b/module/build/js/view.js index 5f8a510b82..a05c919eb0 100644 --- a/module/build/js/view.js +++ b/module/build/js/view.js @@ -8,7 +8,6 @@ function showLink(buildID, type, param) $('#' + type + 'List').closest('form').hide(); var formID = type == 'story' ? '#unlinkedStoriesForm' : '#unlinkedBugsForm'; - setTimeout(function(){fixedTfootAction(formID)}, 100); $('[data-ride="table"]').table(); }); @@ -18,7 +17,6 @@ $(function() if(flow != 'onlyTest') { if(link == 'true') showLink(buildID, type, param); - fixedTfootAction($('#' + type + 'List').closest('form')); $('.nav.nav-tabs a[data-toggle="tab"]').on('shown.zui.tab', function(e) { var href = $(e.target).attr('href'); @@ -26,7 +24,6 @@ $(function() if(tabPane.size() == 0) return; var formID = tabPane.find('.linkBox').find('form:last'); if(formID.size() == 0) formID = tabPane.find('form:last'); - setTimeout(function(){fixedTfootAction(formID)}, 100); }); } }) diff --git a/module/company/js/browse.js b/module/company/js/browse.js index 8b2bc52ed0..e69de29bb2 100644 --- a/module/company/js/browse.js +++ b/module/company/js/browse.js @@ -1,5 +0,0 @@ -$(function() -{ - setTimeout(function(){fixedTfootAction('#userListForm')}, '100'); - setTimeout(function(){fixedTheadOfList('#userList')}, '100'); -}) diff --git a/module/my/js/common.js b/module/my/js/common.js index d6befcca8d..bb309aff62 100644 --- a/module/my/js/common.js +++ b/module/my/js/common.js @@ -4,25 +4,4 @@ $(function() var sign = config.requestType == 'GET' ? '&' : '?'; sp.attr('href', sp.attr('href') + sign + 'onlybody=yes').modalTrigger({width:600, type:'iframe'}); scp.attr('href', scp.attr('href') + sign + 'onlybody=yes').modalTrigger({width:500, type:'iframe'}); - - /* Fixed table actions */ - if($('table.tablesorter').closest('form').size() > 0) fixedTfootAction($('table.tablesorter').closest('form')); - /* Fixed table header */ - if($('table.tablesorter').size() > 0) fixedTheadOfList($('table.tablesorter:first')); - - $('.dropdown-menu .with-search .menu-search').click(function(e) - { - e.stopPropagation(); - return false; - }).on('keyup change paste', 'input', function() - { - var val = $(this).val().toLowerCase(); - var $options = $(this).closest('.dropdown-menu.with-search').find('.option'); - if(val == '') return $options.removeClass('hide'); - $options.each(function() - { - var $option = $(this); - $option.toggleClass('hide', $option.text().toString().toLowerCase().indexOf(val) < 0 && $option.data('key').toString().toLowerCase().indexOf(val) < 0); - }); - }); }); diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index 39a1531b68..2fe940949c 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -36,28 +36,28 @@ idAB);?> - bug->severityAB);?> - priAB);?> + bug->severityAB);?> + priAB);?> typeAB);?> bug->title);?> openedByAB);?> bug->assignedTo);?> bug->resolvedByAB);?> bug->resolutionAB);?> - actions;?> + actions;?> +
- - - id);?>
+ + id);?> bug->severityList, $bug->severity, $bug->severity)?>'>bug->severityList, $bug->severity, $bug->severity);?> pri?>'>bug->priList, $bug->pri)?> diff --git a/module/my/view/score.html.php b/module/my/view/score.html.php index e6c91d59e9..bbd746d5b1 100644 --- a/module/my/view/score.html.php +++ b/module/my/view/score.html.php @@ -20,8 +20,8 @@ my->scoreRule, '', "class='btn btn-primary'");?> -
- +
+
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index e17fc348c2..989c02eb12 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -38,31 +38,31 @@ idAB);?> - + - + - + - + diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index cb34fe4cc1..9b0345a8b6 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -25,9 +25,9 @@ ?> -
+
-
score->time; ?> priAB);?> priAB);?> task->project);?> task->name);?> openedByAB);?> task->assignedTo);?> task->finishedBy);?> task->estimateAB);?> task->estimateAB);?> task->consumedAB);?> task->leftAB);?> task->leftAB);?> task->deadlineAB);?> statusAB);?>actions;?>actions;?>
+
- - - id);?>
+ + id);?> 		pri;?>'>task->priList, $task->pri);?> createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?>
+
app->loadLang('testtask'); @@ -44,7 +44,7 @@ idAB);?> - + @@ -52,7 +52,7 @@ - + @@ -63,12 +63,13 @@ ?> @@ -79,20 +80,23 @@ diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index e603402700..c22dd1e61c 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -22,8 +22,8 @@ ?> -
-
priAB);?> priAB);?> testcase->title);?> typeAB);?> openedByAB);?> testtask->lastRunTime);?> testtask->lastRunResult);?> statusAB);?> actions;?> actions;?>
+
- - - id);?> +
+ + id);?> 		pri?>'>testcase->priList, $case->pri, $case->pri)?> createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title, null, "style='color: $case->color'");?>lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> testcase->statusList[$case->status];?> - version", '', 'list', 'play', '', 'iframe', '', "data-width='95%'"); - common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', '', "data-width='95%'"); - common::printIcon('testcase', 'edit', "caseID=$caseID", $case, 'list', 'edit'); - common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$caseID", $case, 'list', 'copy'); +
+ product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug'); + common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$caseID", $case, 'list', 'copy'); - if(common::hasPriv('testcase', 'delete')) - { - $deleteURL = $this->createLink('testcase', 'delete', "caseID=$caseID&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "class='btn' title='{$lang->testcase->delete}'"); - } - - common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug'); - ?> + if(common::hasPriv('testcase', 'delete')) + { + $deleteURL = $this->createLink('testcase', 'delete', "caseID=$caseID&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "class='btn' title='{$lang->testcase->delete}'"); + } + ?> +
+ version", '', 'list', 'play', '', 'iframe', '', "data-width='95%'"); + common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', '', "data-width='95%'"); + common::printIcon('testcase', 'edit', "caseID=$caseID", $case, 'list', 'edit'); + ?>
+
+
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 7b7cce7779..7eca698051 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -68,13 +68,13 @@ diff --git a/module/product/js/all.js b/module/product/js/all.js index 25ecb6b959..f35f9625b9 100644 --- a/module/product/js/all.js +++ b/module/product/js/all.js @@ -6,6 +6,4 @@ $(function() for(i = 0; i < data.list.length; i++) list += $(data.list[i]).attr('data-id') + ','; $.post(createLink('product', 'updateOrder'), {'products' : list, 'orderBy' : orderBy}); }); - fixedTfootAction('#productsForm'); - fixedTheadOfList('#productList'); }); diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index 0b45a006b6..0cc2079efb 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -58,7 +58,7 @@ '> -
+
- - - id?>
+ + id?> 		date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?> todo->typeList[$todo->type];?>
+
recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index b11e313c33..84f50a2d54 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -218,50 +218,6 @@ echo ''; } - if(common::hasPriv('story', 'batchChangeModule')) - { - $withSearch = count($modules) > 8; - echo "
  • "; - echo html::a('javascript:;', $lang->story->moduleAB, '', "id='moduleItem'"); - echo "
    "; - echo "
      "; - foreach($modules as $moduleId => $module) - { - $actionLink = $this->createLink('story', 'batchChangeModule', "moduleID=$moduleId"); - echo "
    • " . html::a('#', empty($module) ? '/' : $module, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . "
      • "; - } - echo '
    '; - if($withSearch) echo "
    "; - echo '
    • '; - } - else - { - echo '
  • ' . html::a('javascript:;', $lang->story->moduleAB, '', $class) . '
    • '; - } - - if(common::hasPriv('story', 'batchChangePlan')) - { - unset($plans['']); - $plans = array(0 => $lang->null) + $plans; - $withSearch = count($plans) > 8; - echo "
  • "; - echo html::a('javascript:;', $lang->story->planAB, '', "id='planItem'"); - echo "
    "; - echo "
      "; - foreach($plans as $planID => $plan) - { - $actionLink = $this->createLink('story', 'batchChangePlan', "planID=$planID"); - echo "
    • " . html::a('#', $plan, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "
      • "; - } - echo '
    '; - if($withSearch) echo "
    "; - echo '
    • '; - } - else - { - echo '
  • ' . html::a('javascript:;', $lang->story->planAB, '', $class) . '
    • '; - } - if(common::hasPriv('story', 'batchChangeStage')) { echo "
  • "; @@ -283,6 +239,59 @@ + +
    + +
    + 8;?> + +
    + + + +
    + +
    + $module) + { + $actionLink = $this->createLink('story', 'batchChangeModule', "moduleID=$moduleId"); + echo html::a('#', empty($module) ? '/' : $module, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\""); + } + ?> +
    +
    +
    + + +
    + +
    + $lang->null) + $plans; + $withSearch = count($plans) > 8; + ?> + +
    + + + +
    + +
    + $plan) + { + $actionLink = $this->createLink('story', 'batchChangePlan', "planID=$planID"); + echo html::a('#', $plan, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\""); + } + ?> +
    +
    +
    + +
    @@ -303,7 +312,7 @@ $value):?>
    diff --git a/module/productplan/js/view.js b/module/productplan/js/view.js index bc20914615..3adf829b46 100644 --- a/module/productplan/js/view.js +++ b/module/productplan/js/view.js @@ -8,7 +8,6 @@ function showLink(planID, type, orderBy, param) $('#' + type + 'List').closest('form').hide(); var formID = type == 'story' ? '#unlinkedStoriesForm' : '#unlinkedBugsForm'; - setTimeout(function(){fixedTfootAction(formID)}, 100); $('[data-ride="table"]').table(); }); @@ -16,7 +15,6 @@ function showLink(planID, type, orderBy, param) $(function() { if(link == 'true') showLink(planID, type, orderBy, param); - fixedTfootAction($('#' + type + 'List').closest('form')); $('.nav.nav-tabs a[data-toggle="tab"]').on('shown.zui.tab', function(e) { var href = $(e.target).attr('href'); @@ -24,7 +22,6 @@ $(function() if(tabPane.size() == 0) return; var formID = tabPane.find('.linkBox').find('form:last'); if(formID.size() == 0) formID = tabPane.find('form:last'); - setTimeout(function(){fixedTfootAction(formID)}, 100); }); $('.dropdown-menu.with-search .menu-search').click(function(e) diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index ecd284c006..ae8e2c74f2 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -112,9 +112,4 @@ - diff --git a/module/project/js/all.js b/module/project/js/all.js index 0ba06f31c0..95a52b9583 100644 --- a/module/project/js/all.js +++ b/module/project/js/all.js @@ -6,8 +6,6 @@ $(function() for(i = 0; i < data.list.length; i++) list += $(data.list[i]).attr('data-id') + ','; $.post(createLink('project', 'updateOrder'), {'projects' : list, 'orderBy' : orderBy}); }); - setTimeout(function(){fixedTfootAction('#projectsForm')}, 100); - setTimeout(function(){fixedTheadOfList('#projectList')}, 100); }); function byProduct(productID, projectID) diff --git a/module/project/js/grouptask.js b/module/project/js/grouptask.js index 6f11dd69e0..492c437805 100644 --- a/module/project/js/grouptask.js +++ b/module/project/js/grouptask.js @@ -1,6 +1,5 @@ $(function() { - setTimeout(function(){fixedTheadOfList('#groupTable')}, 100); $(document).on('click', '.expandAll', function() { $('.expandAll').addClass('hidden'); diff --git a/module/project/js/importbug.js b/module/project/js/importbug.js index b6a46de5f1..12ab9d4edc 100644 --- a/module/project/js/importbug.js +++ b/module/project/js/importbug.js @@ -2,5 +2,4 @@ $(function() { $('#' + browseType + 'Tab').addClass('active'); ajaxGetSearchForm(); - setTimeout(function(){fixedTfootAction('#importBugForm')}, 500); }); diff --git a/module/project/js/importtask.js b/module/project/js/importtask.js index 65cf6f7dbd..7b76460b86 100644 --- a/module/project/js/importtask.js +++ b/module/project/js/importtask.js @@ -3,7 +3,3 @@ function reload(toProject, fromProject) link = createLink('project','importtask','toProject='+toProject + '&fromProject='+fromProject); location.href = link; } -$(function() -{ - setTimeout(function(){fixedTfootAction('#importTaskForm')}, 500); -}); diff --git a/module/project/js/task.js b/module/project/js/task.js index e2a60c94f4..e6a030eba9 100644 --- a/module/project/js/task.js +++ b/module/project/js/task.js @@ -2,24 +2,6 @@ $(function() { setOuterBox(); if(browseType == 'bysearch') ajaxGetSearchForm(); - setTimeout(function(){fixedTfootAction('#projectTaskForm')}, 100); - setTimeout(function(){fixedTheadOfList('#taskList')}, 100); - - $('.dropdown-menu .with-search .menu-search').click(function(e) - { - e.stopPropagation(); - return false; - }).on('keyup change paste', 'input', function() - { - var val = $(this).val().toLowerCase(); - var $options = $(this).closest('.dropdown-menu.with-search').find('.option'); - if(val == '') return $options.removeClass('hide'); - $options.each(function() - { - var $option = $(this); - $option.toggleClass('hide', $option.text().toString().toLowerCase().indexOf(val) < 0 && $option.data('key').toString().toLowerCase().indexOf(val) < 0); - }); - }); if($('#taskList thead th.w-name').width() < 150) $('#taskList thead th.w-name').width(150); @@ -67,10 +49,6 @@ function showCheckedSummary() .replace('%left%', checkedLeft); $summary.html(summary); } - else - { - $('tfoot .table-actions .text:last').html(taskSummary); - } } $('#module' + moduleID).addClass('active'); diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index f69dfc6b0e..b0b472461d 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -213,77 +213,87 @@ js::set('browseType', $browseType);
    +
    createLink('task', 'batchEdit', "projectID=$projectID"); - $disabled = $canBatchEdit ? '' : "disabled='disabled'"; + $actionLink = $this->createLink('task', 'batchEdit', "projectID=$projectID"); + $disabled = $canBatchEdit ? '' : "disabled='disabled'"; - echo html::commonButton($lang->edit, "data-form-action='$actionLink' $disabled"); - echo ""; - echo "
      "; + echo html::commonButton($lang->edit, "data-form-action='$actionLink' $disabled"); + echo ""; + echo "
        "; - $actionLink = $this->createLink('task', 'batchClose'); - $misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#moreAction')\"" : "class='disabled'"; - echo "
      • " . html::a('#', $lang->close, '', $misc) . "
        • "; + $actionLink = $this->createLink('task', 'batchClose'); + $misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#taskList')\"" : "class='disabled'"; + echo "
      • " . html::a('#', $lang->close, '', $misc) . "
        • "; - $actionLink = $this->createLink('task', 'batchCancel'); - $misc = $canBatchCancel ? "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#moreAction')\"" : "class='disabled'"; - echo "
      • " . html::a('#', $lang->task->cancel, '', $misc) . "
        • "; - - if($canBatchChangeModule) - { - $withSearch = count($modules) > 10; - echo "
      • "; - echo html::a('javascript:;', $lang->task->moduleAB, '', "id='moduleItem'"); - echo "
        "; - echo '
          '; - foreach($modules as $moduleId => $module) - { - $actionLink = $this->createLink('task', 'batchChangeModule', "moduleID=$moduleId"); - echo "
        • " . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#moreAction')\"") . "
          • "; - } - echo '
        '; - if($withSearch) echo "
        "; - echo '
        • '; - } - else - { - echo '
      • ' . html::a('javascript:;', $lang->task->moduleAB, '', $misc) . '
        • '; - } - - /* Batch assign. */ - if($canBatchAssignTo) - { - $withSearch = count($memberPairs) > 10; - $actionLink = $this->createLink('task', 'batchAssignTo', "projectID=$projectID"); - echo html::select('assignedTo', $memberPairs, '', 'class="hidden"'); - echo "
      • "; - echo html::a('javascript::', $lang->task->assignedTo, 'id="assignItem"'); - echo "
        "; - echo '
          '; - foreach ($memberPairs as $key => $value) - { - if(empty($key)) continue; - echo "
        • " . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\", \"hiddenwin\", \"#moreAction\")", $value, '', '') . '
          • '; - } - echo "
        "; - if($withSearch) echo "
        "; - echo "
        • "; - } - echo "
      "; - } + $actionLink = $this->createLink('task', 'batchCancel'); + $misc = $canBatchCancel ? "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#taskList')\"" : "class='disabled'"; + echo "
    • " . html::a('#', $lang->task->cancel, '', $misc) . "
      • "; + echo "
    "; ?> +
    + +
    + +
    + 10;?> + +
    + + + +
    + +
    + $module) + { + $actionLink = $this->createLink('task', 'batchChangeModule', "moduleID=$moduleId"); + echo html::a('#', $module, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#taskList')\""); + } + ?> +
    - show('right', 'pagerjs');?> + + + +
    + +
    + 10; + $actionLink = $this->createLink('task', 'batchAssignTo', "projectID=$projectID"); + echo html::select('assignedTo', $memberPairs, '', 'class="hidden"'); + if($withSearch): + ?> +
    + + + +
    + +
    + $value) + { + if(empty($key)) continue; + echo html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\", \"hiddenwin\", \"#taskList\")", $value); + } + ?> +
    +
    +
    +
    + show('right', 'pagerjs');?>
    @@ -292,22 +302,16 @@ js::set('browseType', $browseType); project->checkedSummary);?> diff --git a/module/release/js/view.js b/module/release/js/view.js index db4e8df12f..e82d814e21 100644 --- a/module/release/js/view.js +++ b/module/release/js/view.js @@ -10,7 +10,6 @@ function showLink(releaseID, type, param) $('#' + type + 'List').closest('form').hide(); var formID = type == 'story' ? '#unlinkedStoriesForm' : (type == 'leftBug' ? '#unlinkedLeftBugsForm' : '#unlinkedBugsForm'); - setTimeout(function(){fixedTfootAction(formID)}, 100); $('[data-ride="table"]').table(); }); @@ -18,7 +17,6 @@ function showLink(releaseID, type, param) $(function() { if(link == 'true') showLink(releaseID, type, param); - fixedTfootAction($('#' + type + 'List').closest('form')); $('.nav.nav-tabs a[data-toggle="tab"]').on('shown.zui.tab', function(e) { var href = $(e.target).attr('href'); @@ -26,6 +24,5 @@ $(function() if(tabPane.size() == 0) return; var formID = tabPane.find('.linkBox').find('form:last'); if(formID.size() == 0) formID = tabPane.find('form:last'); - setTimeout(function(){fixedTfootAction(formID)}, 100); }); }) diff --git a/module/story/js/zerocase.js b/module/story/js/zerocase.js index 87d942d86f..618b5d612c 100644 --- a/module/story/js/zerocase.js +++ b/module/story/js/zerocase.js @@ -1,6 +1,4 @@ $(document).ready(function() { - $('#zerocaseTab').addClass('active'); - fixedTfootAction('#productStoryForm'); - fixedTheadOfList('#storyList'); + $('#zerocaseTab').addClass('btn-active-text'); }); diff --git a/module/story/model.php b/module/story/model.php index a7b0c7f00d..71002bb3c8 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2343,7 +2343,7 @@ class storyModel extends model switch($id) { case 'id': - echo '
    ' . sprintf('%03d', $story->id) . '
    '; + echo html::checkbox('storyIDList', array($story->id => sprintf('%03d', $story->id))); break; case 'pri': echo ""; diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js index 0d3aeb0ae0..cdc140f65d 100644 --- a/module/testcase/js/browse.js +++ b/module/testcase/js/browse.js @@ -24,26 +24,8 @@ function confirmBatchDelete(actionLink) $(document).ready(function() { if(browseType == 'bysearch') ajaxGetSearchForm(); - setTimeout(function(){fixedTfootAction('#batchForm')}, 100); - setTimeout(function(){fixedTheadOfList('#caseList')}, 100); if($('#caseList thead th.w-title').width() < 150) $('#caseList thead th.w-title').width(150); - $('.dropdown-menu .with-search .menu-search').click(function(e) - { - e.stopPropagation(); - return false; - }).on('keyup change paste', 'input', function() - { - var val = $(this).val().toLowerCase(); - var $options = $(this).closest('.dropdown-menu.with-search').find('.option'); - if(val == '') return $options.removeClass('hide'); - $options.each(function() - { - var $option = $(this); - $option.toggleClass('hide', $option.text().toString().toLowerCase().indexOf(val) < 0 && $option.data('key').toString().toLowerCase().indexOf(val) < 0); - }); - }); - setModal4List('runCase', 'caseList'); if(flow == 'onlyTest') diff --git a/module/testcase/js/importfromlib.js b/module/testcase/js/importfromlib.js index 8099a6a25e..e245411100 100644 --- a/module/testcase/js/importfromlib.js +++ b/module/testcase/js/importfromlib.js @@ -23,5 +23,4 @@ function setModule(obj) $(function() { ajaxGetSearchForm('#querybox'); - setTimeout(function(){fixedTfootAction('#importFromLib')}, 500); }); diff --git a/module/testsuite/js/library.js b/module/testsuite/js/library.js index eeaa60011a..c35f8d4b52 100644 --- a/module/testsuite/js/library.js +++ b/module/testsuite/js/library.js @@ -24,22 +24,4 @@ function confirmBatchDelete(actionLink) $(document).ready(function() { if(browseType == 'bysearch') ajaxGetSearchForm(); - setTimeout(function(){fixedTfootAction('#batchForm')}, 100); - setTimeout(function(){fixedTheadOfList('#caseList')}, 100); - - $('.dropdown-menu .with-search .menu-search').click(function(e) - { - e.stopPropagation(); - return false; - }).on('keyup change paste', 'input', function() - { - var val = $(this).val().toLowerCase(); - var $options = $(this).closest('.dropdown-menu.with-search').find('.option'); - if(val == '') return $options.removeClass('hide'); - $options.each(function() - { - var $option = $(this); - $option.toggleClass('hide', $option.text().toString().toLowerCase().indexOf(val) < 0 && $option.data('key').toString().toLowerCase().indexOf(val) < 0); - }); - }); }); diff --git a/module/testtask/js/cases.js b/module/testtask/js/cases.js index 8f8a14db11..63155a80fc 100644 --- a/module/testtask/js/cases.js +++ b/module/testtask/js/cases.js @@ -2,7 +2,5 @@ $(document).ready(function() { setModal4List('runCase', 'caseList', function(){$(".iframe").modalTrigger({width:1024, type:'iframe'});}, 1024); if(browseType == 'bysearch') ajaxGetSearchForm(); - setTimeout(function(){fixedTfootAction('#casesForm')}, 100); - setTimeout(function(){fixedTheadOfList('#caseList')}, 100); if($('#caseList thead th.w-title').width() < 150) $('#caseList thead th.w-title').width(150); });