Attempting to provide a better fix for #142 (comment)

thednp · Jul 6, 2017 · 46d5a50 · 46d5a50
1 parent 351ae64
commit 46d5a50
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 4 deletions.
diff --git a/dist/bootstrap-native-v4.js b/dist/bootstrap-native-v4.js
@@ -1461,6 +1461,7 @@
 
     // public method
     this.show = function() { // the tab we clicked is now the next tab
+      next = next || element;
       nextContent = queryElement(next[getAttribute]('href')); //this is the actual object, the next tab content to activate
       activeTab = getActiveTab(); 
       activeContent = getActiveContent();

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
@@ -1616,6 +1616,7 @@
 
     // public method
     this.show = function() { // the tab we clicked is now the next tab
+      next = next || element;
       nextContent = queryElement(next[getAttribute]('href')); //this is the actual object, the next tab content to activate
       activeTab = getActiveTab(); 
       activeContent = getActiveContent();

diff --git a/dist/bootstrap-native.min.js b/dist/bootstrap-native.min.js
diff --git a/index.html b/index.html
@@ -1586,8 +1586,8 @@ <h4>Options</h4>
                     </tr>
                   </tbody>
                 </table>
-                <p>If a tooltip is a child element of a modal, a <code>&lt;nav class="navbar-fixed-top"&gt;</code> or a <code>&lt;nav class="navbar-fixed-bottom"&gt;</code>, the <code>container</code> option is set automatically to target that specific parent starting with version 2.0.6.</p>
               </div>
+              <p>If a tooltip is a child element of a modal, a <code>&lt;nav class="navbar-fixed-top"&gt;</code> or a <code>&lt;nav class="navbar-fixed-bottom"&gt;</code>, the <code>container</code> option is set automatically to target that specific parent starting with version 2.0.6.</p>
             </section>
 
             <section id="tooltipMethods">
@@ -1814,8 +1814,8 @@ <h4>Options</h4>
                     </tr>
                   </tbody>
                 </table>
-                <p>If a popover is a child element of a modal, a <code>&lt;nav class="navbar-fixed-top"&gt;</code> or a <code>&lt;nav class="navbar-fixed-bottom"&gt;</code> element, the <code>container</code> option is set automatically to target that specific parent starting with version 2.0.6.</p>
               </div>
+              <p>If a popover is a child element of a modal, a <code>&lt;nav class="navbar-fixed-top"&gt;</code> or a <code>&lt;nav class="navbar-fixed-bottom"&gt;</code> element, the <code>container</code> option is set automatically to target that specific parent starting with version 2.0.6.</p>
             <p>If a proper template is not specified via JavaScript or the content option is not set in any way, the <b>Popover</b> will not be initialized.</p>
             </section>
 

diff --git a/lib/V3/tab-native.js b/lib/V3/tab-native.js
@@ -85,6 +85,7 @@ var Tab = function( element, options ) {
 
   // public method
   this.show = function() { // the tab we clicked is now the next tab
+    next = next || element;
     nextContent = queryElement(next[getAttribute]('href')); //this is the actual object, the next tab content to activate
     activeTab = getActiveTab(); 
     activeContent = getActiveContent();

diff --git a/lib/V4/tab-native.js b/lib/V4/tab-native.js
@@ -85,6 +85,7 @@ var Tab = function( element, options ) {
 
   // public method
   this.show = function() { // the tab we clicked is now the next tab
+    next = next || element;
     nextContent = queryElement(next[getAttribute]('href')); //this is the actual object, the next tab content to activate
     activeTab = getActiveTab(); 
     activeContent = getActiveContent();