fix JS bug@2: click target data bug

qor · Sep 19, 2017 · 164f205 · 164f205
1 parent 0c20aa3
commit 164f205
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/views/themes/i18n/assets/javascripts/i18n.js b/views/themes/i18n/assets/javascripts/i18n.js
diff --git a/views/themes/i18n/assets/javascripts/i18n/i18n.js b/views/themes/i18n/assets/javascripts/i18n/i18n.js
@@ -69,14 +69,12 @@
 
         bind: function() {
             this.$element.on(EVENT_CLICK, $.proxy(this.click, this)).on(EVENT_CHANGE, $.proxy(this.change, this));
-
             this.$languages.on(EVENT_CHANGE, $.proxy(this.reload, this));
         },
 
         unbind: function() {
-            this.$element.off(EVENT_CLICK, this.click).off(EVENT_CHANGE, this.change);
-
-            this.$languages.off(EVENT_CHANGE, this.reload);
+            this.$element.off(EVENT_CLICK).off(EVENT_CHANGE);
+            this.$languages.off(EVENT_CHANGE);
         },
 
         click: function(e) {
@@ -99,11 +97,7 @@
                 }
             }
 
-            if ($target.data().url) {
-                return;
-            }
-
-            if (!$target.length) {
+            if (($target.data() && $target.data().url) || !$target.length) {
                 return;
             }