diff --git a/module/doc/css/tablecontents.css b/module/doc/css/tablecontents.css index b657460f78..e010aa54ec 100644 --- a/module/doc/css/tablecontents.css +++ b/module/doc/css/tablecontents.css @@ -9,7 +9,7 @@ .overflow-auto {overflow: auto;} .overflow-visible {overflow: visible;} .overflow-hidden {overflow: hidden;} -.img-lib {width: 14px; height: 14px; margin-bottom: 2px;} +.img-lib {width: 14px; height: 14px; margin-bottom: 2px; flex: 0 0 14px;} #mainContent {padding-top: 0; padding-bottom: 0; height: calc(100vh - 125px);} #mainContent #createDropdown {display: inline-block;} #mainContent #createDropdown ul {position: absolute;} diff --git a/module/doc/js/tablecontents.js b/module/doc/js/tablecontents.js index c1eea85e7d..e56f92a0b7 100644 --- a/module/doc/js/tablecontents.js +++ b/module/doc/js/tablecontents.js @@ -29,11 +29,13 @@ $(function() data: treeData, itemCreator: function($li, item) { - var libClass = ['lib', 'annex', 'api'].indexOf(item.type) !== -1 ? 'lib' : ''; + var libClass = ['lib', 'annex', 'api', 'execution'].indexOf(item.type) !== -1 ? 'lib' : ''; var hasChild = item.children ? !!item.children.length : false; - var $item = ''; + var link = item.hasAction ? '###' : '#'; + var $item = ''; + $item += '
'; - if(libClass == 'lib') $item += '
'; + if(libClass == 'lib' && item.type != 'execution') $item += '
'; $item += ''; $item += item.name $item += ''; @@ -52,6 +54,7 @@ $(function() $('#fileTree').on('mousemove', 'a', function() { if($(this).data('type') == 'annex') return; + if(!$(this).data('action')) return; var libClass = '.libDorpdown'; if(!$(this).hasClass('lib')) libClass = '.moduleDorpdown'; @@ -65,6 +68,8 @@ $(function() $(this).removeClass('show-icon'); }).on('click', 'a', function(e) { + if(!$(this).data('action')) return; + var isLib = $(this).hasClass('lib'); var moduleID = $(this).data('id'); var libID = 0; diff --git a/module/doc/model.php b/module/doc/model.php index 0defd8ed39..3dd955286c 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -2867,15 +2867,17 @@ class docModel extends model if(empty($libTree['execution'][$executionID])) { $execution = new stdclass(); - $execution->id = $executionID; - $execution->name = zget($executionPairs, $executionID); - $execution->type = 'execution'; - $execution->active = $item->active; - $execution->children = array(); + $execution->id = $executionID; + $execution->name = zget($executionPairs, $executionID); + $execution->type = 'execution'; + $execution->active = $item->active; + $execution->hasAction = false; + $execution->children = array(); if(count($executionLibs[$executionID]) == 1) { - $execution->id = $item->id; - $execution->children = $item->children; + $execution->id = $item->id; + $execution->hasAction = true; + $execution->children = $item->children; } $libTree['execution'][$executionID] = $execution;