Fixes critical defect #279

I changed a test to use differently-ordered bootstrap classes. Tests failed before the fix, and everything passes with the fix. Good.
jdewit · Aug 6, 2015 · 33d9d2c · 33d9d2c
1 parent 5370807
commit 33d9d2c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/js/bootstrap-timepicker.js b/js/bootstrap-timepicker.js
@@ -52,7 +52,7 @@
  _init: function() {
  var self = this;
 
- if (this.showWidgetOnAddonClick && (this.$element.parent().hasClass('input-group bootstrap-timepicker'))) {
+ if (this.showWidgetOnAddonClick && (this.$element.parent().hasClass('input-group') && this.$element.parent().hasClass('bootstrap-timepicker'))) {
  this.$element.parent('.input-group.bootstrap-timepicker').find('.input-group-addon').on({
  'click.timepicker': $.proxy(this.showWidget, this)
  });

diff --git a/spec/js/fixtures/timepicker.html b/spec/js/fixtures/timepicker.html
@@ -1,4 +1,4 @@
-<div class="input-group bootstrap-timepicker">
+<div class="bootstrap-timepicker input-group">
  <input id="timepicker1" type="text" class="form-control input-small">
  <span class="input-group-addon"><i class="glyphicon glyphicon-time"></i></span>
 </div>