only call setLocale() if locale has changed (#561)

rainlab · Mar 16, 2020 · c1d4726 · c1d4726
1 parent d24e6b2
commit c1d4726
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/assets/js/multilingual.js b/assets/js/multilingual.js
@@ -28,9 +28,21 @@
         this.$dropdown     = $('ul.ml-dropdown-menu', this.$el)
         this.$placeholder  = $(this.options.placeholderField)
 
-        this.$dropdown.on('click', '[data-switch-locale]', function(event){
+        /*
+         * Init locale
+         */
+        this.activeLocale = this.options.defaultLocale
+        this.$activeField = this.getLocaleElement(this.activeLocale)
+        this.$activeButton.text(this.activeLocale)
+
+        this.$dropdown.on('click', '[data-switch-locale]', this.$activeButton, function(event){
+            var currentLocale = event.data.text();
             var selectedLocale = $(this).data('switch-locale')
-            self.setLocale(selectedLocale)
+
+            // only call setLocale() if locale has changed
+            if (selectedLocale != currentLocale) {
+                self.setLocale(selectedLocale)
+            }
 
             /*
              * If Ctrl/Cmd key is pressed, find other instances and switch
@@ -45,13 +57,6 @@
             self.$activeField.val(this.value)
         })
 
-        /*
-         * Init locale
-         */
-        this.activeLocale = this.options.defaultLocale
-        this.$activeField = this.getLocaleElement(this.activeLocale)
-        this.$activeButton.text(this.activeLocale)
-
         /*
          * Handle oc.inputPreset.beforeUpdate event
          */