Skip to content

Commit 26e0203

Browse files
Morgan Watsonnathany
authored andcommitted
Fix hidden dialog when called from Bootstrap modal.
closes #47
1 parent 4937555 commit 26e0203

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ spec/dummy/.sass-cache
1414
.DS_Store
1515
*.sublime-workspace
1616

17+
.idea

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# unreleased
22

3-
* Fixed recurring dialog in IE [#46](https://github.com/GetJobber/recurring_select/pull/46) (thanks @ttp)
3+
* Show currently selected rule first when selected [#65](https://github.com/GetJobber/recurring_select/pull/65) (thanks @ericmwalsh)
4+
* [FIX] Fix hidden dialog when called from Bootstrap modal. [#47](https://github.com/GetJobber/recurring_select/pull/47) (thanks @rgrwatson85)
5+
* [FIX] Fix dialog in IE. [#46](https://github.com/GetJobber/recurring_select/pull/46) (thanks @ttp)
46
* Travis CI: Testing against latest point releases of Rails.
57

68
# 1.2.1 / 2014-02-12
@@ -23,7 +25,6 @@ constant (thanks @fourseven)
2325

2426
* [FIX] For blank select fields.
2527
* Testing multiple Rails versions in Travis CI.
26-
* Show currently selected rule first when selected [#65](https://github.com/GetJobber/recurring_select/pull/65) (thanks @ericmwalsh)
2728

2829
# 1.2.0 / 2013-07-03
2930

app/assets/javascripts/recurring_select_dialog.js.coffee.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ window.RecurringSelectDialog =
1313

1414
open_in = $("body")
1515
open_in = $(".ui-page-active") if $(".ui-page-active").length
16+
open_in = $(".modal") if $(".modal:visible").length
1617
open_in.append @template()
1718
@outer_holder = $(".rs_dialog_holder")
1819
@inner_holder = @outer_holder.find ".rs_dialog"

0 commit comments

Comments
 (0)