You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by db...@apache.org on 2015/11/06 21:35:03 UTC
docs commit: Switching to /latest by default. Fixing 404 page to
recognize it.
Repository: cordova-docs
Updated Branches:
refs/heads/master 0649826fb -> 366718c18
Switching to /latest by default. Fixing 404 page to recognize it.
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/366718c1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/366718c1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/366718c1
Branch: refs/heads/master
Commit: 366718c18b99db75c1476aa02ffae3593c32a348
Parents: 0649826
Author: Dmitry Blotsky <dm...@gmail.com>
Authored: Wed Nov 4 21:22:14 2015 -0800
Committer: Dmitry Blotsky <dm...@gmail.com>
Committed: Fri Nov 6 12:32:39 2015 -0800
----------------------------------------------------------------------
www/.htaccess | 2 +-
www/_includes/header.html | 2 +-
www/_layouts/docs.html | 8 +++++---
www/static/js/404.js | 24 +++++++++++++++++++-----
4 files changed, 26 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/366718c1/www/.htaccess
----------------------------------------------------------------------
diff --git a/www/.htaccess b/www/.htaccess
index b7bce8b..a76676c 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -26,7 +26,7 @@ RewriteEngine on
# NOTE:
# these can both apply, turning "/docs" into "/docs/en/latest/"
RewriteRule ^.*docs/$ {{site.baseurl}}/docs/en/
-RewriteRule ^.*docs/(\w\w)/$ {{site.baseurl}}/docs/$1/latest/ [R=302]
+RewriteRule ^.*docs/(\w\w)/$ {{site.baseurl}}/docs/$1/latest/ [R=302,L]
# rewrite only:
# /docs/XX/latest/* -> /docs/XX/Y.Y.Y/*
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/366718c1/www/_includes/header.html
----------------------------------------------------------------------
diff --git a/www/_includes/header.html b/www/_includes/header.html
index f667942..fa81447 100644
--- a/www/_includes/header.html
+++ b/www/_includes/header.html
@@ -15,7 +15,7 @@
<div class="nav_bar_center">
<ul class="nav navbar-nav">
<li {% if page.docs_tab %}class="active"{% endif %}>
- <a href="{{ site.baseurl }}/docs/en/{{ site.latest_docs_version }}/guide/overview/">Documentation</a>
+ <a href="{{ site.baseurl }}/docs/en/latest/guide/overview/">Documentation</a>
</li>
<li {% if page.plugins_tab %}class="active"{% endif %}>
<a href="{{ site.baseurl }}/plugins">Plugins</a>
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/366718c1/www/_layouts/docs.html
----------------------------------------------------------------------
diff --git a/www/_layouts/docs.html b/www/_layouts/docs.html
index b313bd7..8c8cf79 100644
--- a/www/_layouts/docs.html
+++ b/www/_layouts/docs.html
@@ -154,7 +154,7 @@ analytics_id: UA-64283057-1
<!-- Get URL for this page in the latest version -->
{% capture current_version_path %}/docs/{{ page.language }}/{{ page.version }}/{% endcapture %}
- {% capture latest_version_path %}/docs/{{ page.language }}/{{ site.latest_docs_version }}/{% endcapture %}
+ {% capture latest_version_path %}/docs/{{ page.language }}/latest/{% endcapture %}
{% assign latest_url = page.url | replace:current_version_path,latest_version_path %}
<!-- Show warnings for special versions (i.e. non-latest, and edge) -->
@@ -172,8 +172,10 @@ analytics_id: UA-64283057-1
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
- {{ warning_text }} {{ page.click_here_text }}:
- <a href="{{ site.baseurl }}{{ latest_url }}">{{ site.latest_docs_version }}</a>
+ {{ warning_text }}
+ <a href="{{ site.baseurl }}{{ latest_url }}">
+ {{ page.click_here_text }}
+ </a>
</div>
{% endif %}
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/366718c1/www/static/js/404.js
----------------------------------------------------------------------
diff --git a/www/static/js/404.js b/www/static/js/404.js
index c4225ba..c477282 100644
--- a/www/static/js/404.js
+++ b/www/static/js/404.js
@@ -1,8 +1,19 @@
(function () {
- var DOCS_VERSION_PATTERN = /(docs\/..\/[\d\.edge]+)/;
+
+ // regexes as strings
+ // NOTE:
+ // these patterns should NOT contain capturing groups (parentheses)
+ // because they might be combined with other regexes
+ var DOCS_VERSION_PATTERN = "(?:[\\d\\.]+|edge|latest)";
+ var DOCS_VERSION_PATH_PATTERN = "docs\\/..\\/" + DOCS_VERSION_PATTERN;
+
+ function splitDocsURL(url) {
+ var splitPattern = new RegExp("(" + DOCS_VERSION_PATH_PATTERN + ")");
+ return url.split(splitPattern);
+ }
function transformOldURL(oldURL) {
- var splitURL = oldURL.split(DOCS_VERSION_PATTERN);
+ var splitURL = splitDocsURL(oldURL);
var baseURL = splitURL[0];
var versionString = splitURL[1];
@@ -27,11 +38,13 @@
}
function getEdgeURL(url) {
- return url.replace(/docs\/(..)\/([\d\.]+|latest|edge)/, 'docs/$1/edge');
+ var replaceWhat = new RegExp("docs\\/(..)\\/" + DOCS_VERSION_PATTERN);
+ var replaceWith = "docs/$1/edge";
+ return url.replace(replaceWhat, replaceWith);
}
function getRootURL(url) {
- var splitURL = url.split(DOCS_VERSION_PATTERN);
+ var splitURL = splitDocsURL(url);
var baseURL = splitURL[0];
var versionString = splitURL[1];
@@ -39,7 +52,8 @@
}
function isDocsURL(url) {
- return DOCS_VERSION_PATTERN.test(url);
+ var testPattern = new RegExp(DOCS_VERSION_PATH_PATTERN);
+ return testPattern.test(url);
}
function showNewRedirect(url) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org