Browse Source

#3932 Fixes compatibility issues with jq 3.0

pull/4164/head
Jack Lukic 8 years ago
parent
commit
2afb4d95d2
3 changed files with 6 additions and 4 deletions
  1. 4
      src/definitions/modules/dropdown.js
  2. 4
      src/definitions/modules/popup.js
  3. 2
      src/definitions/modules/rating.js

4
src/definitions/modules/dropdown.js

@ -875,7 +875,7 @@ $.fn.dropdown = function(parameters) {
$selectedItem = ($currentlySelected.length > 0) $selectedItem = ($currentlySelected.length > 0)
? $currentlySelected ? $currentlySelected
: $activeItem, : $activeItem,
hasSelected = ($selectedItem.size() > 0)
hasSelected = ($selectedItem.length > 0)
; ;
if(hasSelected) { if(hasSelected) {
module.debug('Forcing partial selection to selected item', $selectedItem); module.debug('Forcing partial selection to selected item', $selectedItem);
@ -1288,7 +1288,7 @@ $.fn.dropdown = function(parameters) {
? $currentlySelected ? $currentlySelected
: $activeItem, : $activeItem,
$visibleItems = ($selectedItem.length > 0) $visibleItems = ($selectedItem.length > 0)
? $selectedItem.siblings(':not(.' + className.filtered +')').andSelf()
? $selectedItem.siblings(':not(.' + className.filtered +')').addBack()
: $menu.children(':not(.' + className.filtered +')'), : $menu.children(':not(.' + className.filtered +')'),
$subMenu = $selectedItem.children(selector.menu), $subMenu = $selectedItem.children(selector.menu),
$parentMenu = $selectedItem.closest(selector.menu), $parentMenu = $selectedItem.closest(selector.menu),

4
src/definitions/modules/popup.js

@ -506,7 +506,9 @@ $.fn.popup = function(parameters) {
targetPosition = (settings.inline || (settings.popup && settings.movePopup)) targetPosition = (settings.inline || (settings.popup && settings.movePopup))
? $target.position() ? $target.position()
: $target.offset(), : $target.offset(),
screenPosition = $boundary.offset() || { top: 0, left: 0 },
screenPosition = (isWindow)
? { top: 0, left: 0 }
: $boundary.offset(),
calculations = {}, calculations = {},
scroll = (isWindow) scroll = (isWindow)
? { top: $window.scrollTop(), left: $window.scrollLeft() } ? { top: $window.scrollTop(), left: $window.scrollLeft() }

2
src/definitions/modules/rating.js

@ -251,7 +251,7 @@ $.fn.rating = function(parameters) {
module.verbose('Setting current rating to', rating); module.verbose('Setting current rating to', rating);
$activeIcon $activeIcon
.prevAll() .prevAll()
.andSelf()
.addBack()
.addClass(className.active) .addClass(className.active)
; ;
} }

Loading…
Cancel
Save