aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/config/processors/git-data.js7
-rw-r--r--docs/config/templates/indexPage.template.html2
-rw-r--r--docs/docs.config.js5
3 files changed, 7 insertions, 7 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">
diff --git a/docs/docs.config.js b/docs/docs.config.js
index 2e163254..883f80f0 100644
--- a/docs/docs.config.js
+++ b/docs/docs.config.js
@@ -1,13 +1,12 @@
var path = require('canonical-path');
-var gruntUtils = require('../lib/grunt/utils');
+var versionInfo = require('../lib/versions/version-info');
var basePath = __dirname;
var basePackage = require('./config');
module.exports = function(config) {
- var version = gruntUtils.getVersion();
- var cdnUrl = "//ajax.googleapis.com/ajax/libs/angularjs/" + version.cdn;
+ var cdnUrl = "//ajax.googleapis.com/ajax/libs/angularjs/" + versionInfo.currentPackage.cdnVersion;
var getVersion = function(component, sourceFolder, packageFile) {
sourceFolder = sourceFolder || '../bower_components';