@@ -7,7 +7,6 @@ window.setupLanguageFilter = function () {
7
7
$refresh = $ ( "#refresh" ) ;
8
8
var current = window . location . href ;
9
9
10
-
11
10
// Handle resetting the filter to all
12
11
function reset ( ) {
13
12
$id . val ( '' ) ;
@@ -33,7 +32,7 @@ window.setupLanguageFilter = function () {
33
32
34
33
// Handle the filter selection changing
35
34
function change ( ) {
36
- var languageId = $id . val ( ) ;
35
+ var languageId = $id . val ( )
37
36
var url = '/languages/projects/' + languageId ;
38
37
$ . ajax ( {
39
38
type : 'GET' ,
@@ -49,7 +48,6 @@ window.setupLanguageFilter = function () {
49
48
$message . text ( defaultMessage ) ;
50
49
// reset URL to remove original query when filter is removed
51
50
var removeQueryURL = current . split ( "?" ) [ 0 ] ;
52
- console . log ( removeQueryURL ) ;
53
51
history . pushState ( null , " " , removeQueryURL ) ;
54
52
} else {
55
53
$message . text ( 'Displaying ' + $id . find ( "option:selected" ) . text ( ) + ' projects only' ) ;
@@ -60,8 +58,6 @@ window.setupLanguageFilter = function () {
60
58
history . pushState ( null , " " , "?language=" + new_lang_url ) ;
61
59
}
62
60
}
63
- // Deal with browsers remembering last state of select
64
- change ( ) ;
65
61
66
62
// Detect the select change event
67
63
$id . change ( change ) ;
@@ -87,10 +83,9 @@ window.setupLanguageFilter = function () {
87
83
88
84
// compare query_param to items in final text array
89
85
function languageURL ( ) {
90
- for ( var i = 1 ; i < final . length ; i ++ ) {
86
+ for ( var i = 0 ; i < final . length ; i ++ ) {
91
87
//keep track of index of match
92
88
count ++ ;
93
-
94
89
if ( query_param == final [ i ] ) {
95
90
var indexNum = count - 1 ;
96
91
var selectedOption = indexNum ;
@@ -108,7 +103,7 @@ window.setupLanguageFilter = function () {
108
103
var search_params = new URLSearchParams ( query_string ) ;
109
104
search_params . set ( "language" , final [ i ] ) ;
110
105
url . search = search_params . toString ( ) ;
111
- var new_url = url . toString ( ) ;
106
+ new_url = url . toString ( ) ;
112
107
history . pushState ( null , " " , new_url ) ;
113
108
114
109
change ( ) ;
@@ -121,35 +116,33 @@ window.setupLanguageFilter = function () {
121
116
}
122
117
//end of languageURL function
123
118
124
- function extractLang ( ) {
125
- if ( convertURL . includes ( "language=" ) == true ) {
126
- let extract = convertURL . slice ( 9 ) ;
127
- query_param = extract ;
128
- languageURL ( ) ;
129
- } else {
119
+ function extractLang ( ) {
120
+ if ( convertURL . includes ( "language=" ) == true ) {
121
+ let extract = convertURL . slice ( 9 ) ;
122
+ query_param = extract ;
123
+ languageURL ( ) ;
124
+ } else {
130
125
// there is no 'language=' in the URL so there is no need to extract the query
131
126
// go straight to calling comparison function
132
127
languageURL ( ) ;
128
+ }
133
129
}
134
- }
135
130
136
131
function convertText ( ) {
137
- for ( var k = 0 ; k < textArr . length ; k ++ ) {
132
+ for ( var k = 1 ; k < textArr . length ; k ++ ) {
138
133
// turn option items into lowercase
139
- var lowercase_opt = textArr [ k ] . toLowerCase ( ) ;
134
+ var lowercase_opt = textArr [ k - 1 ] . toLowerCase ( ) ;
140
135
// remove any whitespace
141
136
var no_space = lowercase_opt . replace ( / \s / g, '' ) ;
142
137
// final result to compare against query_param
143
138
final . push ( no_space ) ;
144
- console . log ( final ) ;
145
139
}
146
140
extractLang ( ) ;
147
141
}
148
142
149
143
function storeOptionText ( ) {
150
144
for ( var j = 0 ; j < lang_option . length ; j ++ ) {
151
145
textArr . push ( lang_option [ j ] . text ) ;
152
- console . log ( textArr ) ;
153
146
}
154
147
convertText ( ) ;
155
148
}
0 commit comments