Merge pull request #2054 from stkevintan/patch-2

[JS code style]Fix some irregular coding & Uniform indent
pull/1469/merge
devin-donnelly 2016-12-27 14:40:08 -08:00 committed by GitHub
commit 6f27d40f13
2 changed files with 402 additions and 402 deletions

View File

@ -1,9 +1,9 @@
$( document ).ready(function() { $( document ).ready(function() {
var oldURLs=["/README.md","/README.html",".html",".md","/v1.1/","/v1.0/"]; var oldURLs = ["/README.md","/README.html",".html",".md","/v1.1/","/v1.0/"];
var fwdDirs=["examples/","cluster/","docs/devel","docs/design"]; var fwdDirs = ["examples/","cluster/","docs/devel","docs/design"];
var doRedirect = false; var doRedirect = false;
var notHere = false; var notHere = false;
var forwardingURL=window.location.href; var forwardingURL = window.location.href;
var redirects = [{ var redirects = [{
"from": "resource-quota", "from": "resource-quota",
@ -26,14 +26,14 @@ $( document ).ready(function() {
"to": "http://kubernetes.io/docs/whatisk8s/" "to": "http://kubernetes.io/docs/whatisk8s/"
}]; }];
for (i=0;i<redirects.length;i++) { for (var i = 0; i < redirects.length; i++) {
if (forwardingURL.indexOf(redirects[i].from) > -1){ if (forwardingURL.indexOf(redirects[i].from) > -1){
notHere = true; notHere = true;
window.location.replace(redirects[i].to); window.location.replace(redirects[i].to);
} }
} }
for (i=0;i<fwdDirs.length;i++) { for (var i = 0; i < fwdDirs.length; i++) {
if (forwardingURL.indexOf(fwdDirs[i]) > -1){ if (forwardingURL.indexOf(fwdDirs[i]) > -1){
var urlPieces = forwardingURL.split(fwdDirs[i]); var urlPieces = forwardingURL.split(fwdDirs[i]);
var newURL = "https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/" + fwdDirs[i] + urlPieces[1]; var newURL = "https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/" + fwdDirs[i] + urlPieces[1];
@ -42,11 +42,11 @@ $( document ).ready(function() {
} }
} }
if (!notHere) { if (!notHere) {
for (i=0;i<oldURLs.length;i++) { for (var i = 0; i < oldURLs.length; i++) {
if (forwardingURL.indexOf(oldURLs[i]) > -1 && if (forwardingURL.indexOf(oldURLs[i]) > -1 &&
forwardingURL.indexOf("404.html") < 0){ forwardingURL.indexOf("404.html") < 0){
doRedirect=true; doRedirect = true;
forwardingURL=forwardingURL.replace(oldURLs[i],"/"); forwardingURL = forwardingURL.replace(oldURLs[i],"/");
} }
} }
if (doRedirect){ if (doRedirect){