Changeset 2115

Timestamp:

11/23/2015 02:22:51 AM (9 years ago)

Author:

dd32

Message:

Translate: Fix the Filter Javascript when paging is involved.
Fixes #1408

Location:

sites/trunk/translate.wordpress.org/public_html

Files:

• gp-templates-new/locale-projects.php (modified) (1 diff)
• gp-templates/locale-projects.php (modified) (1 diff)

sites/trunk/translate.wordpress.org/public_html/gp-templates-new/locale-projects.php

@@ -98 +98 @@
 <script>
     jQuery('#sort-filter').change( function() {
-        var current_url = document.location.href.replace(/[?&]filter=[^&$]*/, '' );
-        document.location.replace(
-            current_url +
-            ( -1 == current_url.indexOf('?') ? '?filter=' : '&filter=' ) +
-            this.options[ this.options.selectedIndex ].value
-        );
+        var current_url = document.location.href;
+        var filter = this.options[ this.options.selectedIndex ].value;
+
+        if ( current_url.indexOf( 'filter=' ) > -1 ) {
+            document.location.replace(
+                current_url.replace(/([?&]filter=)([^&$]*)/, '$1' + filter )
+            );
+        } else {
+            document.location.replace(
+                current_url +
+                ( -1 == current_url.indexOf('?') ? '?filter=' : '&filter=' ) +
+                filter
+            );
+        }
     } ).prop('disabled', '');
 </script>

sites/trunk/translate.wordpress.org/public_html/gp-templates/locale-projects.php

@@ -98 +98 @@
 <script>
     jQuery('#sort-filter').change( function() {
-        var current_url = document.location.href.replace(/[?&]filter=[^&$]*/, '' );
-        document.location.replace(
-            current_url +
-            ( -1 == current_url.indexOf('?') ? '?filter=' : '&filter=' ) +
-            this.options[ this.options.selectedIndex ].value
-        );
+        var current_url = document.location.href;
+        var filter = this.options[ this.options.selectedIndex ].value;
+
+        if ( current_url.indexOf( 'filter=' ) > -1 ) {
+            document.location.replace(
+                current_url.replace(/([?&]filter=)([^&$]*)/, '$1' + filter )
+            );
+        } else {
+            document.location.replace(
+                current_url +
+                ( -1 == current_url.indexOf('?') ? '?filter=' : '&filter=' ) +
+                filter
+            );
+        }
     } ).prop('disabled', '');
 </script>