Browse Source

Fixes #338 regression, offstage position was calculated before content position was available.

pull/341/head
jlukic 11 years ago
parent
commit
b4c9810853
2 changed files with 6 additions and 1 deletions
  1. 4
      src/modules/popup.js
  2. 3
      src/modules/popup.less

4
src/modules/popup.js

@ -492,6 +492,7 @@ $.fn.popup = function(parameters) {
.css(positioning) .css(positioning)
.removeClass(className.position) .removeClass(className.position)
.addClass(position) .addClass(position)
.addClass(className.loading)
; ;
// check if is offstage // check if is offstage
offstagePosition = module.get.offstagePosition(); offstagePosition = module.get.offstagePosition();
@ -508,6 +509,7 @@ $.fn.popup = function(parameters) {
else { else {
module.error(error.recursion); module.error(error.recursion);
searchDepth = 0; searchDepth = 0;
module.reset();
return false; return false;
} }
} }
@ -516,6 +518,8 @@ $.fn.popup = function(parameters) {
searchDepth = 0; searchDepth = 0;
return true; return true;
} }
$module.removeClass(className.loading);
} }
}, },

3
src/modules/popup.less

@ -207,7 +207,8 @@
display: block; display: block;
visibility: hidden; visibility: hidden;
} }
.ui.active.popup {
.ui.visible.popup {
display: block; display: block;
} }

Loading…
Cancel
Save