Don't show tooltips if the title is empty

thednp · Oct 4, 2017 · f3ff474 · f3ff474
1 parent fba4c9e
commit f3ff474
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/dist/bootstrap-native-v4.js b/dist/bootstrap-native-v4.js
@@ -1,4 +1,4 @@
-// Native Javascript for Bootstrap 4 v2.0.16 | © dnp_theme | MIT-License
+// Native Javascript for Bootstrap 4 v2.0.17 | © dnp_theme | MIT-License
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD support:
@@ -1529,7 +1529,7 @@
     var self = this, timer = 0, placementSetting = this[placement], tooltip = null,
       titleString = element[getAttribute](title) || element[getAttribute](dataOriginalTitle);
 
-    if ( !titleString ) return; // invalidate
+    if ( !titleString || titleString == "" ) return; // invalidate
 
     // private methods
     var removeToolTip = function() {
@@ -1538,6 +1538,7 @@
       },
       createToolTip = function() {
         titleString = element[getAttribute](title) || element[getAttribute](dataOriginalTitle); // read the title again
+        if ( !titleString || titleString == "" ) return false; // invalidate
         tooltip = document.createElement(div);
         tooltip[setAttribute]('role',component);
 
@@ -1579,7 +1580,7 @@
       timer = setTimeout( function() {
         if (tooltip === null) {
           placementSetting = self[placement]; // we reset placement in all cases
-          createToolTip();
+          if(createToolTip() == false) return;
           updateTooltip();
           showTooltip();
           bootstrapCustomEvent.call(element, showEvent, component);

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
@@ -1,4 +1,4 @@
-// Native Javascript for Bootstrap 3 v2.0.16 | © dnp_theme | MIT-License
+// Native Javascript for Bootstrap 3 v2.0.17 | © dnp_theme | MIT-License
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD support:
@@ -1673,7 +1673,7 @@
     var self = this, timer = 0, placementSetting = this[placement], tooltip = null,
       titleString = element[getAttribute](title) || element[getAttribute](dataOriginalTitle);
 
-    if ( !titleString ) return; // invalidate
+    if ( !titleString || titleString == "" ) return; // invalidate
 
     // private methods
     var removeToolTip = function() {
@@ -1682,6 +1682,8 @@
       },
       createToolTip = function() {
         titleString = element[getAttribute](title) || element[getAttribute](dataOriginalTitle); // read the title again
+        if ( !titleString || titleString == "" ) return false; // invalidate
+
         tooltip = document.createElement(div);
         tooltip[setAttribute]('role',component);
 
@@ -1720,7 +1722,7 @@
       timer = setTimeout( function() {
         if (tooltip === null) {
           placementSetting = self[placement]; // we reset placement in all cases
-          createToolTip();
+          if(createToolTip() == false) return;
           updateTooltip();
           showTooltip();
           bootstrapCustomEvent.call(element, showEvent, component);