Skip to content

Commit 5e2c7d5

Browse files
committed
adding recursive tree to theme
1 parent 86b7e69 commit 5e2c7d5

3 files changed

Lines changed: 6 additions & 18 deletions

File tree

doks.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"language": "coffee",
33
"glob": "lib/parser.coffee",
4+
"keySort": ["package", "category", "name"],
45
"arrayTags": [
56
"supports",
67
"param"

themes/bootstrap-angular/core/page.js

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,8 @@ angular.module('doks', ['mgcrea.ngStrap', 'ui.router', 'ui.select', 'ncy-angular
8282
.split('%filePath').join(dok.filePath);
8383
};
8484

85-
var cleanList = function(list) {
86-
return _.uniq(_.compact(list));
87-
};
88-
89-
var filterArray = function(dataSet, configKey) {
90-
return cleanList(_.map(dataSet, function(item) {
91-
var key = item[$scope.config.keys[configKey]];
92-
return key ? key.basicInfo : null;
93-
}));
85+
var filterArray = function(dataSet) {
86+
return _.pluck(dataSet, '_name');
9487
};
9588

9689
var orderArray = function(mainKey, subKey, nameKey) {
@@ -145,15 +138,9 @@ angular.module('doks', ['mgcrea.ngStrap', 'ui.router', 'ui.select', 'ncy-angular
145138
$http.get('output.json')
146139
.success(function(data) {
147140
$scope.data = data;
141+
$scope.categories = filterArray($scope.data.parsed);
148142
});
149143
});
150-
151-
$scope.$watch('data', function(newVal, oldVal) {
152-
if(newVal === oldVal) return;
153-
154-
$scope.categories = filterArray($scope.data.parsed, 'category');
155-
$scope.orderedData = orderArray('category', 'mainType', 'subType');
156-
});
157144
}])
158145

159146
.controller('Content', ['$scope', '$stateParams', '$state', function($scope, $stateParams, $state) {

themes/bootstrap-angular/views/main-content.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<div class="panel-heading">Navigate Doks</div>
6464
<div class="panel-body nav-container" ng-class="{'no-padding-top': config.options.nav.categorySeparate || config.options.nav.mainTypeRight}">
6565

66-
<div ng-repeat="category in orderedData" ng-hide="urlParams.category && category._name !== urlParams.category">
66+
<div ng-repeat="category in data.parsed" ng-hide="urlParams.category && category._name !== urlParams.category">
6767
<ng-include src="'nav-template'" ng-init="mainObj = category" ng-class="{'special-category': config.options.nav.categorySeparate}"></ng-include>
6868

6969
<div ng-repeat="mainType in category._children track by $index" ng-hide="urlParams.mainType && mainType._name !== urlParams.mainType">
@@ -84,7 +84,7 @@
8484
<div class="col-md-12" ncy-breadcrumb></div>
8585
</div>
8686
<div class="row">
87-
<div ng-repeat="category in orderedData" ng-hide="urlParams.category && category._name !== urlParams.category">
87+
<div ng-repeat="category in data.parsed" ng-hide="urlParams.category && category._name !== urlParams.category">
8888

8989
<div ng-repeat="mainType in category._children track by $index" ng-hide="urlParams.mainType && mainType._name !== urlParams.mainType">
9090
<ng-include src="'item-template'" ng-hide="urlParams.subType" ng-init="mainObj = mainType"></ng-include>

0 commit comments

Comments
 (0)