Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
removed dependency on deprecated SC.MENUPANE.VERTICAL_OFFSET property
replaced with windowPadding
  • Loading branch information
kjudd-work committed Jun 20, 2016
1 parent 11711fc commit 344df0b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -14,6 +14,8 @@ Edge
### DEPRECATIONS & REMOVALS
### BUG FIXES

* Removed dependency on deprecated SC.MENUPANE.VERTICAL_OFFSET property that could cause a height NaN error in SC.PickerPane

1.11.1
-----------

Expand Down
2 changes: 1 addition & 1 deletion frameworks/desktop/panes/picker.js
Expand Up @@ -939,7 +939,7 @@ SC.PickerPane = SC.PalettePane.extend(

// If the height of the menu is bigger than the window height, resize it.
if (frame.height + frame.y + 35 >= windowFrame.height) {
frame.height = windowFrame.height - frame.y - (SC.MenuPane.VERTICAL_OFFSET * 2);
frame.height = windowFrame.height - frame.y - (this.get('windowPadding') * 2);
}

return frame;
Expand Down

0 comments on commit 344df0b

Please sign in to comment.