|
157 | 157 | } |
158 | 158 | for (var v in versions) { |
159 | 159 | var version = versions[v]; |
160 | | - if(version !== null) |
161 | | - version.forEach(folderIn); |
| 160 | + if (version !== null) { |
| 161 | + for (var i = 0; i < version.length; i++) { |
| 162 | + folderIn(version[i]); |
| 163 | + } |
| 164 | + } |
162 | 165 | } |
163 | 166 | return versions; |
164 | 167 | }; |
|
394 | 397 | retObj.locationPath = location.path; |
395 | 398 |
|
396 | 399 | //If index file |
397 | | - if (typeof($route.current.params.file) === 'undefined') { |
398 | | - $location.path(retObj.locationPath); |
399 | | - } |
400 | 400 |
|
401 | | - var pathCheck = location.path.split('/'); |
402 | | - var lastPath = pathCheck[pathCheck.length-1]; |
403 | | - |
404 | | - if ($route.current.params.file === 'index' || lastPath === 'index') { |
| 401 | + if ($route.current.params.file === 'index') { |
405 | 402 | retObj.index = true; |
406 | 403 | retObj.currentFolder = $route.current.params.folder; |
407 | 404 | deferred.resolve(retObj); |
|
501 | 498 | $scope.github = data.github; |
502 | 499 | $scope.navbarHtml = Docbase.options.navbarHtml; |
503 | 500 | $scope.logoSrc = Docbase.options.logoSrc; |
504 | | - |
| 501 | + |
505 | 502 | function versionIn(folder) { |
506 | 503 | if (folder.name === data.currentFolder) { |
507 | 504 | $scope.indexList = folder.files; |
|
515 | 512 |
|
516 | 513 | for (var version in data.map) { |
517 | 514 | if (version === data.currentVersion) { |
518 | | - if(data.map[version] !== null) |
519 | | - data.map[version].forEach(versionIn); |
| 515 | + if (data.map[version] !== null) |
| 516 | + for (var j = 0; j < data.map[version].length; j++) { |
| 517 | + versionIn(data.map[version][j]); |
| 518 | + } |
520 | 519 | } |
521 | 520 | } |
522 | 521 | } else { |
|
640 | 639 | })[0]; |
641 | 640 |
|
642 | 641 | // allow files in TL menu |
643 | | - file = file || (folderObj.files && 'index'); |
| 642 | + file = file || (folderObj.files && folderObj.files[0].name); |
644 | 643 | var path = '/' + version + '/' + folder + '/' + file; |
645 | 644 | if (typeof(file) === "undefined") |
646 | 645 | path = '/' + version + '/' + folder; |
|
0 commit comments