Merge pull request #173 from pgelinas/fix-issue-169

Removed usage of falsy value in if and prefer equality testing with empty string.
jdewit · Oct 18, 2013 · cefe33e · cefe33e
2 parents e9778f7 + 8539bc8
commit cefe33e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/js/bootstrap-timepicker.js b/js/bootstrap-timepicker.js
@@ -319,7 +319,7 @@
     },
 
     getTime: function() {
-      if (!this.hour && !this.minute && !this.second) {
+      if (this.hour === '') {
         return '';
       }
 
@@ -883,7 +883,7 @@
       }
 
       // widget shouldn't be empty on open
-      if (!this.hour) {
+      if (this.hour === '') {
         if (this.defaultTime) {
           this.setDefaultTime(this.defaultTime);
         } else {

diff --git a/spec/js/TimepickerSpec.js b/spec/js/TimepickerSpec.js
@@ -217,6 +217,8 @@ describe('Timepicker feature', function() {
     tp3.setTime('2320');
     expect(tp3.getTime()).toBe('23:20:00', 'setTime with 2320 on tp3');
 
+    tp3.setTime('0:00');
+    expect(tp3.getTime()).toBe('0:00:00', 'setTime with 0:00 on tp3');
   });
 
   it('should update picker on blur', function() {