Locale selector, for whatever reason, continually calls onChange in Dojo 1.6

A simple check to see if it actually changes makes the OPAC load correctly with Dojo 1.6

Signed-off-by: James Fournie <jfournie@sitka.bclibraries.ca>

diff --git a/Open-ILS/web/opac/skin/default/xml/common/fonts.xml b/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
index c7ebef3..d03c69d 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
@@ -14,7 +14,10 @@
                     opacLocaleSelector.setValue(locale);
                     dojo.connect(opacLocaleSelector, 'onChange', 
                         function () {
-                            location.href = location.href.replace(/opac\/[^\/]+\/skin/, 'opac/' + this.getValue() + '/skin');
+                                var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' );
+                                if(this.getValue() != locale){
+                                    location.href = location.href.replace(/opac\/[^\/]+\/skin/, 'opac/' + this.getValue() + '/skin');
+                                }
                         }
                     );
                 });

diff --git a/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml b/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
index 30ca9a3..cb1c74a 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
+++ b/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
@@ -115,7 +115,10 @@
                             opacLocaleSelector.setValue(locale);
                             dojo.connect(opacLocaleSelector, 'onChange', 
                                 function () {
-                                                       location.href = location.href.replace(/opac\/[^\/]+\/skin/, 'opac/' + this.getValue() + '/skin');
+                                    var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' );
+                                    if(this.getValue() != locale){
+                                        location.href = location.href.replace(/opac\/[^\/]+\/skin/, 'opac/' + this.getValue() + '/skin');
+                                    }
                                 }
                             );
                         });