fix merge conflict in package-lock.json

Esri · Sep 27, 2017 · 284f9d2 · 284f9d2
2 parents 8c9fa55 + 5eb0066
commit 284f9d2
Show file tree

Hide file tree

Showing 5 changed files with 232 additions and 119 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,4 @@
 language: node_js
 node_js:
   - 'stable'
-sudo: false
-cache:
-  directories:
-    - node_modules
+sudo: false
diff --git a/docs/source/documentation/patterns/sample-code/_tabs.html b/docs/source/documentation/patterns/sample-code/_tabs.html
@@ -2,7 +2,7 @@
   <nav class="tab-nav">
     <a class="tab-title is-active js-tab">Tab 1</a>
     <a class="tab-title js-tab">Tab 2</a>
-    <a class="tab-title js-tab">Tab 3</a>
+    <a class="tab-title js-tab">Tab 3 <span> ☼ </span></a>
   </nav>
   <section class="tab-contents">
     <article class="tab-section js-tab-section is-active">

diff --git a/lib/js/patterns/tabs.js b/lib/js/patterns/tabs.js
@@ -84,6 +84,9 @@ function tabs () {
 
   function getOptions (e) {
     var tab = e.target;
+    if (!classy.has(tab, 'tab-title')) {
+      tab = e.currentTarget;
+    }
     var group = dom.closest('js-tab-group', tab);
     var id = groupId(group);
     return {