Browse Source

Fix activator with settings.popup

pull/2034/head
jlukic 9 years ago
parent
commit
63561c514f
2 changed files with 4 additions and 2 deletions
  1. 2
      RELEASE-NOTES.md
  2. 4
      src/definitions/modules/popup.js

2
RELEASE-NOTES.md

@ -15,6 +15,7 @@
- **Grid** - `equal height` and `equal width` now work without `row` wrappers - **Grid** - `equal height` and `equal width` now work without `row` wrappers
- **Grid** - `equal height` rows can now be `stretched` as well as `middle aligned`, `bottom aligned` and `top aligned`! - **Grid** - `equal height` rows can now be `stretched` as well as `middle aligned`, `bottom aligned` and `top aligned`!
- **Headers** - Added new header type `sub header`, useful for displaying small headers alongside text content. See examples [in the header docs](http://www.semantic-ui.com/elements/header.html#sub-headers) - **Headers** - Added new header type `sub header`, useful for displaying small headers alongside text content. See examples [in the header docs](http://www.semantic-ui.com/elements/header.html#sub-headers)
- **Menu** - Added `stackable` menu variation for responsive menus
- **Menu** - Added many new variables to menu - **Menu** - Added many new variables to menu
- **Menu** - Horizontal menus now set a default image size for images / logos - **Menu** - Horizontal menus now set a default image size for images / logos
- **Menu** - Fixed several inheritance issues for `dropdown item` inside `menu` appearing as `menu item`. - **Menu** - Fixed several inheritance issues for `dropdown item` inside `menu` appearing as `menu item`.
@ -51,6 +52,7 @@
- **Grid** - `x column wide` inside `equal width/height` now cannot grow beyond column size - **Grid** - `x column wide` inside `equal width/height` now cannot grow beyond column size
- **Grid** - Fixes colored grid columns not appearing when not nested in rows - **Grid** - Fixes colored grid columns not appearing when not nested in rows
- **Label** - Labels inside `header` now vertical align better by accounting for line height offset - **Label** - Labels inside `header` now vertical align better by accounting for line height offset
- **Loader** - Fix position of `inline centered loader` to be centered correctly
- **Message** - Message now uses `@lineHeight` from `site.variables` - **Message** - Message now uses `@lineHeight` from `site.variables`
- **Modal** - `scrollable modal` now correctly adds padding below modal - **Modal** - `scrollable modal` now correctly adds padding below modal
- **Modal** - Modal with `detachable: false` inside `ui sidebar` `pusher` element will now show correctly - **Modal** - Modal with `detachable: false` inside `ui sidebar` `pusher` element will now show correctly

4
src/definitions/modules/popup.js

@ -228,14 +228,14 @@ $.fn.popup = function(parameters) {
else if($target.next(selector.popup).length !== 0) { else if($target.next(selector.popup).length !== 0) {
module.verbose('Pre-existing popup found'); module.verbose('Pre-existing popup found');
settings.inline = true; settings.inline = true;
settings.popup = $target.next(selector.popup).data(metadata.activator, $module);
settings.popups = $target.next(selector.popup).data(metadata.activator, $module);
module.refresh(); module.refresh();
if(settings.hoverable) { if(settings.hoverable) {
module.bind.popup(); module.bind.popup();
} }
} }
else if(settings.popup) { else if(settings.popup) {
settings.popup.data(metadata.activator, $module);
$(settings.popup).data(metadata.activator, $module);
module.verbose('Used popup specified in settings'); module.verbose('Used popup specified in settings');
module.refresh(); module.refresh();
if(settings.hoverable) { if(settings.hoverable) {

Loading…
Cancel
Save