Allow Tooltip to work with data-title attribute, as title would…

… be invalid for elements like SVG.
thednp · Oct 5, 2017 · 5c5fb3d · 5c5fb3d
1 parent 0bc8a95
commit 5c5fb3d
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 19 deletions.
diff --git a/dist/bootstrap-native-v4.js b/dist/bootstrap-native-v4.js
@@ -55,6 +55,7 @@
     dataInterval      = 'data-interval',
     dataHeight        = 'data-height',
     dataPause         = 'data-pause',
+    dataTitle         = 'data-title',
     dataOriginalTitle = 'data-original-title',
     dataOriginalText  = 'data-original-text',
     dataDismissible   = 'data-dismissible',
@@ -1088,9 +1089,7 @@
         classString = 'class',
         div = 'div',
         fade = 'fade',
-        title = 'title',
         content = 'content',
-        dataTitle = 'data-title',
         dataContent = 'data-content',
         dismissible = 'dismissible',
         closeBtn = '<button type="button" class="close">×</button>',
@@ -1536,7 +1535,7 @@
 
     // bind, event targets, title and constants
     var self = this, timer = 0, placementSetting = this[placement], tooltip = null,
-      titleString = element[getAttribute](title) || element[getAttribute](dataOriginalTitle);
+      titleString = element[getAttribute](title) || element[getAttribute](dataTitle) || element[getAttribute](dataOriginalTitle);
 
     if ( !titleString || titleString == "" ) return; // invalidate
 
@@ -1546,7 +1545,7 @@
         tooltip = null; timer = null;
       },
       createToolTip = function() {
-        titleString = element[getAttribute](title) || element[getAttribute](dataOriginalTitle); // read the title again
+        titleString = element[getAttribute](title) || element[getAttribute](dataTitle) || element[getAttribute](dataOriginalTitle); // read the title again
         if ( !titleString || titleString == "" ) return false; // invalidate
         tooltip = document.createElement(div);
         tooltip[setAttribute]('role',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
@@ -57,6 +57,7 @@
     dataInterval      = 'data-interval',
     dataHeight        = 'data-height',
     dataPause         = 'data-pause',
+    dataTitle         = 'data-title',  
     dataOriginalTitle = 'data-original-title',
     dataOriginalText  = 'data-original-text',
     dataDismissible   = 'data-dismissible',
@@ -1239,9 +1240,7 @@
         classString = 'class',
         div = 'div',
         fade = 'fade',
-        title = 'title',
         content = 'content',
-        dataTitle = 'data-title',
         dataContent = 'data-content',
         dismissible = 'dismissible',
         closeBtn = '<button type="button" class="close">×</button>',
@@ -1681,7 +1680,7 @@
 
     // bind, event targets, title and constants
     var self = this, timer = 0, placementSetting = this[placement], tooltip = null,
-      titleString = element[getAttribute](title) || element[getAttribute](dataOriginalTitle);
+      titleString = element[getAttribute](title) || element[getAttribute](dataTitle) || element[getAttribute](dataOriginalTitle);
 
     if ( !titleString || titleString == "" ) return; // invalidate
 
@@ -1691,7 +1690,7 @@
         tooltip = null; timer = null;
       },
       createToolTip = function() {
-        titleString = element[getAttribute](title) || element[getAttribute](dataOriginalTitle); // read the title again
+        titleString = element[getAttribute](title) || element[getAttribute](dataTitle) || element[getAttribute](dataOriginalTitle); // read the title again
         if ( !titleString || titleString == "" ) return false; // invalidate
 
         tooltip = document.createElement(div);

diff --git a/dist/bootstrap-native.min.js b/dist/bootstrap-native.min.js
diff --git a/index.html b/index.html
@@ -1657,7 +1657,7 @@ <h4>Examples</h4>
                 <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="Tooltip on bottom <span class='label label-info'>COOL</span><br> Here we add more content for testing. Perhaps adding even more content would make the job more difficult? Nope, same as if this was a very very short tooltip. Efficiently unleash cross-media information without cross-media value. Quickly maximize timely deliverables for real-time schemas.">Bottom</button>
                 <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="right" title="Tooltip on right <span class='label label-primary'>RECOMMENDED</span><br> Here we add more content for testing. Perhaps adding even more content would make the job more difficult? Nope, same as if this was a very very short tooltip. Efficiently unleash cross-media information without cross-media value. Quickly maximize timely deliverables for real-time schemas.">Right</button>
                 <svg viewBox="0 0 80 34" width="80" height="34" xmlns="http://www.w3.org/2000/svg">
-                  <rect data-toggle="tooltip" data-placement="top" title="Demo Title for SVG" fill="#fff" stroke="#ccc" stroke-width="1" width="100%" height="100%" rx="5"></rect>
+                  <rect data-toggle="tooltip" data-placement="top" data-title="Demo Title for SVG" fill="#fff" stroke="#ccc" stroke-width="1" width="100%" height="100%" rx="5"></rect>
                   <text fill="#333" x="25" y="22" font-size="14">SVG</text>
                 </svg>
               </p>

diff --git a/lib/V3/popover-native.js b/lib/V3/popover-native.js
@@ -24,9 +24,7 @@ var Popover = function( element, options ) {
       classString = 'class',
       div = 'div',
       fade = 'fade',
-      title = 'title',
       content = 'content',
-      dataTitle = 'data-title',
       dataContent = 'data-content',
       dismissible = 'dismissible',
       closeBtn = '<button type="button" class="close">×</button>',

diff --git a/lib/V3/tooltip-native.js b/lib/V3/tooltip-native.js
@@ -42,7 +42,7 @@ var Tooltip = function( element,options ) {
 
   // bind, event targets, title and constants
   var self = this, timer = 0, placementSetting = this[placement], tooltip = null,
-    titleString = element[getAttribute](title) || element[getAttribute](dataOriginalTitle);
+    titleString = element[getAttribute](title) || element[getAttribute](dataTitle) || element[getAttribute](dataOriginalTitle);
 
   if ( !titleString || titleString == "" ) return; // invalidate
 
@@ -52,7 +52,7 @@ var Tooltip = function( element,options ) {
       tooltip = null; timer = null;
     },
     createToolTip = function() {
-      titleString = element[getAttribute](title) || element[getAttribute](dataOriginalTitle); // read the title again
+      titleString = element[getAttribute](title) || element[getAttribute](dataTitle) || element[getAttribute](dataOriginalTitle); // read the title again
       if ( !titleString || titleString == "" ) return false; // invalidate
 
       tooltip = document.createElement(div);

diff --git a/lib/V3/utils.js b/lib/V3/utils.js
@@ -33,6 +33,7 @@ var globalObject = typeof global !== 'undefined' ? global : this||window,
   dataInterval      = 'data-interval',
   dataHeight        = 'data-height',
   dataPause         = 'data-pause',
+  dataTitle         = 'data-title',  
   dataOriginalTitle = 'data-original-title',
   dataOriginalText  = 'data-original-text',
   dataDismissible   = 'data-dismissible',

diff --git a/lib/V4/popover-native.js b/lib/V4/popover-native.js
@@ -24,9 +24,7 @@ var Popover = function( element, options ) {
       classString = 'class',
       div = 'div',
       fade = 'fade',
-      title = 'title',
       content = 'content',
-      dataTitle = 'data-title',
       dataContent = 'data-content',
       dismissible = 'dismissible',
       closeBtn = '<button type="button" class="close">×</button>',

diff --git a/lib/V4/tooltip-native.js b/lib/V4/tooltip-native.js
@@ -42,7 +42,7 @@ var Tooltip = function( element,options ) {
 
   // bind, event targets, title and constants
   var self = this, timer = 0, placementSetting = this[placement], tooltip = null,
-    titleString = element[getAttribute](title) || element[getAttribute](dataOriginalTitle);
+    titleString = element[getAttribute](title) || element[getAttribute](dataTitle) || element[getAttribute](dataOriginalTitle);
 
   if ( !titleString || titleString == "" ) return; // invalidate
 
@@ -52,7 +52,7 @@ var Tooltip = function( element,options ) {
       tooltip = null; timer = null;
     },
     createToolTip = function() {
-      titleString = element[getAttribute](title) || element[getAttribute](dataOriginalTitle); // read the title again
+      titleString = element[getAttribute](title) || element[getAttribute](dataTitle) || element[getAttribute](dataOriginalTitle); // read the title again
       if ( !titleString || titleString == "" ) return false; // invalidate
       tooltip = document.createElement(div);
       tooltip[setAttribute]('role',component);

diff --git a/lib/V4/utils.js b/lib/V4/utils.js
@@ -32,6 +32,7 @@ var globalObject = typeof global !== 'undefined' ? global : this||window,
   dataInterval      = 'data-interval',
   dataHeight        = 'data-height',
   dataPause         = 'data-pause',
+  dataTitle         = 'data-title',
   dataOriginalTitle = 'data-original-title',
   dataOriginalText  = 'data-original-text',
   dataDismissible   = 'data-dismissible',