From f90628bc14488dd97ee3d115d1a6312be990417c Mon Sep 17 00:00:00 2001 From: Jack Flintermann Date: Thu, 27 Mar 2014 17:23:41 -0400 Subject: [PATCH 1/3] Update .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 8ceb804..7271f25 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "bootstrap-datetimepicker"] path = bootstrap-datetimepicker - url = git://github.com/tarruda/bootstrap-datetimepicker.git + url = git://github.com/eonasdan/bootstrap-datetimepicker.git From 10c2bcc286ff30578158685c32025f3073d3f2d4 Mon Sep 17 00:00:00 2001 From: jflinter Date: Thu, 27 Mar 2014 17:25:07 -0400 Subject: [PATCH 2/3] update bootstrap-datetimepicker --- bootstrap-datetimepicker | 1 - 1 file changed, 1 deletion(-) delete mode 160000 bootstrap-datetimepicker diff --git a/bootstrap-datetimepicker b/bootstrap-datetimepicker deleted file mode 160000 index 8a1821c..0000000 --- a/bootstrap-datetimepicker +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8a1821c2598e698d3fa7deba4e629f8cf7634c62 From 18d6f29dad06fa042e865fdf5ced2a687b9da0f1 Mon Sep 17 00:00:00 2001 From: Jack Flintermann Date: Thu, 27 Mar 2014 17:53:42 -0400 Subject: [PATCH 3/3] Update core.js --- .../assets/javascripts/bootstrap-datetimepicker/core.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/vendor/assets/javascripts/bootstrap-datetimepicker/core.js b/vendor/assets/javascripts/bootstrap-datetimepicker/core.js index 5a82fe6..711e8f1 100644 --- a/vendor/assets/javascripts/bootstrap-datetimepicker/core.js +++ b/vendor/assets/javascripts/bootstrap-datetimepicker/core.js @@ -133,7 +133,8 @@ show: function(e) { this.widget.show(); - this.height = this.component ? this.component.outerHeight() : this.$element.outerHeight(); + var hasComponent = (this.component && this.component.length > 0); + this.height = hasComponent ? this.component.outerHeight() : this.$element.outerHeight(); this.place(); this.$element.trigger({ type: 'show', @@ -271,8 +272,9 @@ place: function(){ var position = 'absolute'; - var offset = this.component ? this.component.offset() : this.$element.offset(); - this.width = this.component ? this.component.outerWidth() : this.$element.outerWidth(); + var hasComponent = (this.component && this.component.length > 0); + var offset = hasComponent ? this.component.offset() : this.$element.offset(); + this.width = hasComponent ? this.component.outerWidth() : this.$element.outerWidth(); offset.top = offset.top + this.height; var $window = $(window);