Improves Language selection JS to allow other folders (better logic moving forward)

bordoni · bordoni · commit 0485a40cf8a7 · 2016-07-03T15:25:49.000-03:00
diff --git a/_includes/languages.html b/_includes/languages.html
@@ -25,11 +25,10 @@
 		count = opts.length;
 
 	for ( var i = 0; i < count; i++ ){
-		if ( -1 === opts[ i ].value.indexOf( window.location.pathname ) ) {
-			continue;
+		// Only happens if you have language path on the start of the location.pathname
+		if ( 0 === window.location.pathname.indexOf( opts[ i ].value ) ) {
+			opts[ i ].setAttribute( 'selected', 'selected' );
 		}
-
-		opts[ i ].setAttribute( 'selected', 'selected' );
 	}
 } )();
 </script>

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,10 @@`
`25`	`25`	`count = opts.length;`
`26`	`26`
`27`	`27`	`for ( var i = 0; i < count; i++ ){`
`28`		`- if ( -1 === opts[ i ].value.indexOf( window.location.pathname ) ) {`
`29`		`- continue;`
	`28`	`+ // Only happens if you have language path on the start of the location.pathname`
	`29`	`+ if ( 0 === window.location.pathname.indexOf( opts[ i ].value ) ) {`
	`30`	`+ opts[ i ].setAttribute( 'selected', 'selected' );`
`30`	`31`	`}`
`31`		`-`
`32`		`- opts[ i ].setAttribute( 'selected', 'selected' );`
`33`	`32`	`}`
`34`	`33`	`} )();`
`35`	`34`	`</script>`