Merge pull request #164 from frahugo/gh-pages

New option: showWidgetOnAddonClick

Author: jdewit

js/bootstrap-timepicker.js

@@ -27,6 +27,7 @@
     this.showSeconds = options.showSeconds;
     this.template = options.template;
     this.appendWidgetTo = options.appendWidgetTo;
+    this.showWidgetOnAddonClick = options.showWidgetOnAddonClick;
 
     this._init();
   };
@@ -37,7 +38,7 @@
     _init: function() {
       var self = this;
 
-      if (this.$element.parent().hasClass('input-append') || this.$element.parent().hasClass('input-prepend')) {
+      if (this.showWidgetOnAddonClick && (this.$element.parent().hasClass('input-append') || this.$element.parent().hasClass('input-prepend'))) {
         this.$element.parent('.input-append, .input-prepend').find('.add-on').on({
           'click.timepicker': $.proxy(this.showWidget, this)
         });
@@ -1021,7 +1022,8 @@
     showInputs: true,
     showMeridian: true,
     template: 'dropdown',
-    appendWidgetTo: '.bootstrap-timepicker'
+    appendWidgetTo: '.bootstrap-timepicker',
+    showWidgetOnAddonClick: true
   };
 
   $.fn.timepicker.Constructor = Timepicker;

js/bootstrap-timepicker.min.js

@@ -5,14 +5,17 @@ describe('Mouse events feature', function() {
     $input2,
     $input3,
     $input4,
+    $input5,
     $timepicker1,
     $timepicker2,
     $timepicker3,
     $timepicker4,
+    $timepicker5,
     tp1,
     tp2,
     tp3,
-    tp4;
+    tp4,
+    tp5;
 
   beforeEach(function () {
     loadFixtures('timepicker.html');
@@ -21,6 +24,10 @@ describe('Mouse events feature', function() {
     $timepicker1 = $input1.timepicker();
     tp1 = $timepicker1.data('timepicker');
 
+    $input5 = $('#timepicker5');
+    $timepicker5 = $input1.timepicker({showWidgetOnAddonClick: false});
+    tp5 = $timepicker5.data('timepicker');
+
     $input2 = $('#timepicker2');
     $timepicker2 = $input2.timepicker({
       template: 'modal',
@@ -98,7 +105,13 @@ describe('Mouse events feature', function() {
 
   });
 
-  it('should increment hour on button click and fire 1 changeTime event', function() {
+  it('should not show widget when clicking add-on icon if showWidgetOnAddonClick is false', function() {
+    expect(tp5.isOpen).toBe(false);
+    $input5.parents('div').find('.add-on').trigger('click');
+    expect(tp5.isOpen).toBe(false);
+  });
+
+  it('should increment hour on button click', function() {
     tp1.setTime('11:30 AM');
     tp1.update();
 

spec/js/MouseEventsSpec.js

@@ -72,6 +72,7 @@ describe('Timepicker feature', function() {
     expect(tp1.modalBackdrop).toBe(false);
     expect(tp1.modalBackdrop).toBe(false);
     expect(tp1.isOpen).toBe(false);
+    expect(tp1.showWidgetOnAddonClick).toBe(true);
   });
 
   it('should allow user to configure defaults', function() {