Fixing Dropdown clickHandler #114

thednp · Feb 13, 2017 · 86fae38 · 86fae38
1 parent cf981a6
commit 86fae38
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -5,7 +5,7 @@
   "authors": [
     "dnp_theme"
   ],
-  "description": "Native Javascript for Bootstrap 3, the sweetest Javascript library without jQuery.",
+  "description": "Native Javascript for Bootstrap, the sweetest Javascript library without jQuery.",
   "main": "dist/bootstrap-native.js",
   "moduleType": [
     "globals",

diff --git a/dist/bootstrap-native-v4.js b/dist/bootstrap-native-v4.js
@@ -759,8 +759,7 @@
       },
       clickHandler = function(e) {
         var eventTarget = e[target], hasData;
-        if (!eventTarget || !eventTarget[parentNode]) return; // invalidate
-        hasData = eventTarget[getAttribute](dataToggle) || eventTarget[parentNode][getAttribute](dataToggle);
+        hasData = ( eventTarget.nodeType !== 1 && (eventTarget[getAttribute](dataToggle) || eventTarget[parentNode][getAttribute](dataToggle)) );
         if ( eventTarget === element || eventTarget === parent || eventTarget[parentNode] === element ) {
           e.preventDefault(); // comment this line to stop preventing navigation when click target is a link 
           relatedTarget = element;

diff --git a/dist/bootstrap-native-v4.min.js b/dist/bootstrap-native-v4.min.js
diff --git a/dist/bootstrap-native.js b/dist/bootstrap-native.js
@@ -918,8 +918,7 @@
       },
       clickHandler = function(e) {
         var eventTarget = e[target], hasData;
-        if (!eventTarget || !eventTarget[parentNode]) return; // invalidate
-        hasData = eventTarget[getAttribute](dataToggle) || eventTarget[parentNode][getAttribute](dataToggle);
+        hasData = ( eventTarget.nodeType !== 1 && (eventTarget[getAttribute](dataToggle) || eventTarget[parentNode][getAttribute](dataToggle)) );
         if ( eventTarget === element || eventTarget === parent || eventTarget[parentNode] === element ) {
           e.preventDefault(); // comment this line to stop preventing navigation when click target is a link 
           relatedTarget = element;

diff --git a/dist/bootstrap-native.min.js b/dist/bootstrap-native.min.js
diff --git a/lib/V3/dropdown-native.js b/lib/V3/dropdown-native.js
@@ -26,8 +26,7 @@ var Dropdown = function( element, option ) {
     },
     clickHandler = function(e) {
       var eventTarget = e[target], hasData;
-      if (!eventTarget || !eventTarget[parentNode]) return; // invalidate
-      hasData = eventTarget[getAttribute](dataToggle) || eventTarget[parentNode][getAttribute](dataToggle);
+      hasData = ( eventTarget.nodeType !== 1 && (eventTarget[getAttribute](dataToggle) || eventTarget[parentNode][getAttribute](dataToggle)) );
       if ( eventTarget === element || eventTarget === parent || eventTarget[parentNode] === element ) {
         e.preventDefault(); // comment this line to stop preventing navigation when click target is a link 
         relatedTarget = element;

diff --git a/lib/V4/dropdown-native.js b/lib/V4/dropdown-native.js
@@ -26,8 +26,7 @@ var Dropdown = function( element, option ) {
     },
     clickHandler = function(e) {
       var eventTarget = e[target], hasData;
-      if (!eventTarget || !eventTarget[parentNode]) return; // invalidate
-      hasData = eventTarget[getAttribute](dataToggle) || eventTarget[parentNode][getAttribute](dataToggle);
+      hasData = ( eventTarget.nodeType !== 1 && (eventTarget[getAttribute](dataToggle) || eventTarget[parentNode][getAttribute](dataToggle)) );
       if ( eventTarget === element || eventTarget === parent || eventTarget[parentNode] === element ) {
         e.preventDefault(); // comment this line to stop preventing navigation when click target is a link 
         relatedTarget = element;

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bootstrap.native",
   "version": "2.0.4",
-  "description": "Native Javascript for Bootstrap 3, the sweetest Javascript library without jQuery.",
+  "description": "Native Javascript for Bootstrap, the sweetest Javascript library without jQuery.",
   "main": "dist/bootstrap-native.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",