From 9613b61bdd1419bcd5f71940ca3a06e87dbb61d7 Mon Sep 17 00:00:00 2001 From: "Pedro A. Melendez" Date: Sun, 24 Nov 2013 20:10:15 -0400 Subject: [PATCH] fix(timepicker): fix look with bootstrap3 Closes #1285 --- src/timepicker/docs/demo.html | 6 +-- src/timepicker/test/timepicker.spec.js | 23 +++------ template/timepicker/timepicker.html | 64 +++++++++++--------------- 3 files changed, 34 insertions(+), 59 deletions(-) diff --git a/src/timepicker/docs/demo.html b/src/timepicker/docs/demo.html index 990f08d5c1..be54da58a3 100644 --- a/src/timepicker/docs/demo.html +++ b/src/timepicker/docs/demo.html @@ -1,11 +1,7 @@
-
-
-
+
-
-
diff --git a/src/timepicker/test/timepicker.spec.js b/src/timepicker/test/timepicker.spec.js index 703f3d2d5e..9ac300e66f 100644 --- a/src/timepicker/test/timepicker.spec.js +++ b/src/timepicker/test/timepicker.spec.js @@ -1,5 +1,3 @@ - - describe('timepicker directive', function () { var $rootScope, element; @@ -39,7 +37,7 @@ describe('timepicker directive', function () { } function getArrow(isUp, tdIndex) { - return element.children('div').eq( (isUp) ? 0 : 2 ).find('div').eq( tdIndex ).find('a').eq(0); + return element.find('tr').eq( (isUp) ? 0 : 2 ).find('td').eq( tdIndex ).find('a').eq(0); } function getHoursButton(isUp) { @@ -47,7 +45,7 @@ describe('timepicker directive', function () { } function getMinutesButton(isUp) { - return getArrow(isUp, 1); + return getArrow(isUp, 2); } function getMeridianButton() { @@ -73,7 +71,8 @@ describe('timepicker directive', function () { return e; } - it('contains three input elements and one button', function() { + it('contains three row & three input elements', function() { + expect(element.find('tr').length).toBe(3); expect(element.find('input').length).toBe(2); expect(element.find('button').length).toBe(1); }); @@ -322,9 +321,7 @@ describe('timepicker directive', function () { it('responds properly on "wheel" events', function() { var inputs = element.find('input'); - var hoursEl = inputs.eq(0), - minutesEl = inputs.eq(1); - + var hoursEl = inputs.eq(0), minutesEl = inputs.eq(1); var upMouseWheelEvent = wheelThatOtherMouse(-1); var downMouseWheelEvent = wheelThatOtherMouse(1); @@ -553,7 +550,7 @@ describe('timepicker directive', function () { it('initially displays correct time when `show-meridian` is false', function() { expect(getTimeState(true)).toEqual(['14', '10']); expect(getModelState()).toEqual([14, 10]); - expect(getMeridianButton().css('display')).toBe('none'); + expect(getMeridianTd().css('display')).toBe('none'); }); it('toggles correctly between different modes', function() { @@ -569,7 +566,7 @@ describe('timepicker directive', function () { $rootScope.$digest(); expect(getTimeState(true)).toEqual(['14', '10']); expect(getModelState()).toEqual([14, 10]); - expect(getMeridianButton().css('display')).toBe('none'); + expect(getMeridianTd().css('display')).toBe('none'); }); it('handles correctly initially empty model on parent element', function() { @@ -727,7 +724,6 @@ describe('timepicker directive', function () { changeInputValueTo(el, 'pizza'); expect($rootScope.time).toBe(null); - expect(el.parent().hasClass('has-error')).toBe(true); expect(element.hasClass('ng-invalid-time')).toBe(true); @@ -736,7 +732,6 @@ describe('timepicker directive', function () { $rootScope.$digest(); expect(getTimeState()).toEqual(['08', '40', 'PM']); expect(getModelState()).toEqual([20, 40]); - expect(el.parent().hasClass('has-error')).toBe(false); expect(element.hasClass('ng-invalid-time')).toBe(false); }); @@ -746,14 +741,12 @@ describe('timepicker directive', function () { changeInputValueTo(el, 'pizza'); expect($rootScope.time).toBe(null); - expect(el.parent().hasClass('has-error')).toBe(true); expect(element.hasClass('ng-invalid-time')).toBe(true); changeInputValueTo(el, 22); expect(getTimeState()).toEqual(['02', '22', 'PM']); expect(getModelState()).toEqual([14, 22]); - expect(el.parent().hasClass('has-error')).toBe(false); expect(element.hasClass('ng-invalid-time')).toBe(false); }); @@ -767,7 +760,6 @@ describe('timepicker directive', function () { changeInputValueTo(el, '16'); expect($rootScope.time).toBe(null); - expect(el.parent().hasClass('has-error')).toBe(true); expect(element.hasClass('ng-invalid-time')).toBe(true); @@ -879,4 +871,3 @@ describe('timepicker directive', function () { }); - diff --git a/template/timepicker/timepicker.html b/template/timepicker/timepicker.html index 240fc50941..60614b286d 100644 --- a/template/timepicker/timepicker.html +++ b/template/timepicker/timepicker.html @@ -1,38 +1,26 @@ - -
-
- -
-
- -
-
-
- -
-
-
- -
-
-
-
- : - -
-
-
- -
-
- -
-
- -
-
- -
-
-
- \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + +
 
+ + : + +