From 1946833135e8662921fdbb875a3fb8a55ba006bf Mon Sep 17 00:00:00 2001 From: Tasos Bekos Date: Thu, 30 Jan 2014 21:41:05 +0100 Subject: [PATCH] fix(tabs): remove `tabbable` class required for left/right tabs Closes #1708 --- src/tabs/test/tabs.spec.js | 39 ++++++++++++++++++-------------------- template/tabs/tabset.html | 2 +- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/tabs/test/tabs.spec.js b/src/tabs/test/tabs.spec.js index 0e94fb64cb..bf5e2c671c 100644 --- a/src/tabs/test/tabs.spec.js +++ b/src/tabs/test/tabs.spec.js @@ -37,26 +37,23 @@ describe('tabs', function() { scope.deselectFirst = jasmine.createSpy(); scope.deselectSecond = jasmine.createSpy(); elm = $compile([ - '
', - ' ', - ' ', - ' first content is {{first}}', - ' ', - ' ', - ' Second Tab {{second}}', - ' second content is {{second}}', - ' ', - ' ', - '
' + '', + ' ', + ' first content is {{first}}', + ' ', + ' ', + ' Second Tab {{second}}', + ' second content is {{second}}', + ' ', + '' ].join('\n'))(scope); scope.$apply(); return elm; })); it('should pass class and other attributes on to tab template', function() { - var tabbable = elm.find('.tabbable'); - expect(tabbable).toHaveClass('hello'); - expect(tabbable.attr('data-pizza')).toBe('pepperoni'); + expect(elm).toHaveClass('hello'); + expect(elm.attr('data-pizza')).toBe('pepperoni'); }); it('should create clickable titles', function() { @@ -680,15 +677,15 @@ describe('tabs', function() { var scope = $rootScope.$new(); elm = $compile([ '
', - ' ', + ' ', ' ', - ' ', + ' ', ' ', ' ', ' ', ' ', ' ', - ' ', + ' ', ' ', ' ', ' ', @@ -710,9 +707,9 @@ describe('tabs', function() { scope.tab2aaText = '456'; elm = $compile([ '
', - ' ', + ' ', ' ', - ' ', + ' ', ' ', ' {{ tab1aText }}', ' ', @@ -720,9 +717,9 @@ describe('tabs', function() { ' {{ tab1Text }}', ' ', ' ', - ' ', + ' ', ' ', - ' ', + ' ', ' ', ' {{ tab2aaText }}', ' ', diff --git a/template/tabs/tabset.html b/template/tabs/tabset.html index c050b57570..1a78b891bb 100644 --- a/template/tabs/tabset.html +++ b/template/tabs/tabset.html @@ -1,5 +1,5 @@ -
+