diff options
| author | Peter Bacon Darwin | 2014-03-11 06:34:09 +0000 |
|---|---|---|
| committer | Peter Bacon Darwin | 2014-03-11 06:35:19 +0000 |
| commit | 11c5bb7f3de13722a84c5503129097393056061e (patch) | |
| tree | af646817f443eead6d6f0fd3259363aba200bdd3 /docs/config | |
| parent | d6419d0aff4194675ed816f74eb688070ba45285 (diff) | |
| download | angular.js-11c5bb7f3de13722a84c5503129097393056061e.tar.bz2 | |
docs(versions): rework the version info extraction
The docs were relying on the grunt/util module for getting version info
but this was unreliable and full of custom regexes. This is moved into
a new version-info module that makes much better use of the semver library.
Diffstat (limited to 'docs/config')
| -rw-r--r-- | docs/config/processors/git-data.js | 7 | ||||
| -rw-r--r-- | docs/config/templates/indexPage.template.html | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/docs/config/processors/git-data.js b/docs/config/processors/git-data.js index 229864bb..16bbef43 100644 --- a/docs/config/processors/git-data.js +++ b/docs/config/processors/git-data.js @@ -1,4 +1,5 @@ var gruntUtils = require('../../../lib/grunt/utils'); +var versionInfo = require('../../../lib/versions/version-info'); module.exports = { name: 'git-data', @@ -6,9 +7,9 @@ module.exports = { description: 'This processor adds information from the local git repository to the extraData injectable', init: function(config, injectables) { injectables.value('gitData', { - version: gruntUtils.getVersion(), - versions: gruntUtils.getPreviousVersions(), - info: gruntUtils.getGitRepoInfo() + version: versionInfo.currentVersion, + versions: versionInfo.previousVersions, + info: versionInfo.gitRepoInfo }); }, process: function(extraData, gitData) { diff --git a/docs/config/templates/indexPage.template.html b/docs/config/templates/indexPage.template.html index 8b297cda..b5ec7122 100644 --- a/docs/config/templates/indexPage.template.html +++ b/docs/config/templates/indexPage.template.html @@ -175,7 +175,7 @@ <div class="container main-grid main-header-grid"> <div class="grid-left"> <div ng-controller="DocsVersionsCtrl" class="picker version-picker"> - <select ng-options="v as ('v' + v.full) group by (v.isStable?'Stable':'Unstable') for v in docs_versions" + <select ng-options="v as ('v' + v.version + (v.isSnapshot ? ' (snapshot)' : '')) group by (v.isStable?'Stable':'Unstable') for v in docs_versions" ng-model="docs_version" ng-change="jumpToDocsVersion(docs_version)" class="docs-version-jump"> |