Skip to content

Commit 6f450c7

Browse files
committed
Doc switchers: Desambiguate the need of a replace(/\/+$/g, '') by proper naming.
1 parent e12dd32 commit 6f450c7

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

Doc/tools/static/switchers.js

+12-10
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
function on_version_switch() {
7070
var selected_version = $(this).children('option:selected').attr('value') + '/';
7171
var url = window.location.href;
72-
var current_language = find_language_in_url(url);
73-
var current_version = find_version_in_url(url);
72+
var current_language = language_segment_from_url(url);
73+
var current_version = version_segment_in_url(url);
7474
var new_url = url.replace('.org/' + current_language + current_version,
7575
'.org/' + current_language + selected_version);
7676
if (new_url != url) {
@@ -82,8 +82,8 @@
8282
function on_language_switch() {
8383
var selected_language = $(this).children('option:selected').attr('value') + '/';
8484
var url = window.location.href;
85-
var current_language = find_language_in_url(url);
86-
var current_version = find_version_in_url(url);
85+
var current_language = language_segment_from_url(url);
86+
var current_version = version_segment_in_url(url);
8787
if (selected_language == 'en/') // Special 'default' case for english.
8888
selected_language = '';
8989
var new_url = url.replace('.org/' + current_language + current_version,
@@ -94,17 +94,19 @@
9494
}
9595
}
9696

97-
// Returns the path segment as a string, like 'fr/' or '' if not found.
98-
function find_language_in_url(url) {
97+
// Returns the path segment of the language as a string, like 'fr/'
98+
// or '' if not found.
99+
function language_segment_from_url(url) {
99100
var language_regexp = '\.org/(' + Object.keys(all_languages).join('|') + '/)';
100101
var match = url.match(language_regexp);
101102
if (match !== null)
102103
return match[1];
103104
return '';
104105
}
105106

106-
// Returns the path segment as a string, like '3.6/' or '' if not found.
107-
function find_version_in_url(url) {
107+
// Returns the path segment of the version as a string, like '3.6/'
108+
// or '' if not found.
109+
function version_segment_in_url(url) {
108110
var language_segment = '(?:(?:' + Object.keys(all_languages).join('|') + ')/)';
109111
var version_segment = '(?:(?:' + version_regexs.join('|') + ')/)';
110112
var version_regexp = '\\.org/' + language_segment + '?(' + version_segment + ')';
@@ -116,8 +118,8 @@
116118

117119
$(document).ready(function() {
118120
var release = DOCUMENTATION_OPTIONS.VERSION;
119-
var current_language = find_language_in_url(window.location.href).replace(
120-
/\/+$/g, '') || 'en';
121+
var language_segment = language_segment_from_url(window.location.href);
122+
var current_language = language_segment.replace(/\/+$/g, '') || 'en';
121123
var version = release.substr(0, 3);
122124
var version_select = build_version_select(version, release);
123125

0 commit comments

Comments
 (0)