suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify popup check

Browse Source
This commit is contained in:
Konstantin Haase 2012-12-05 15:10:28 +01:00
parent 811aa47098
commit 497eebab94
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/travis/api/app/endpoint/authorization.rb
View File

@ -319,7 +319,7 @@ function popup(time) {
return function(yes, no) { return function(yes, no) {
if(popupWindow) { if(popupWindow) {
timeout(time, yes, function() { timeout(time, yes, function() {
if(popupWindow.closed || popupHidden) { if(popupWindow.closed || popupWindow.innerHeight < 1) {
no() no()
} else { } else {
try { try {
@ -345,17 +345,7 @@ function redirect() {
} }
function createPopup() { function createPopup() {
if(!popupWindow) { if(!popupWindow) popupWindow = window.open(url, 'Signing in...', 'height=50,width=50');
popupWindow = window.open(url, 'Signing in...', 'height=50,width=50');
popupWindow.onload = function() {
try {
popupHidden = popupWindow.innerHeight > 0;
maybe(function() { popupWindow.focus() });
} catch(err) {
popupHidden = false;
}
}
}
} }
// === THE PLUMBING === // === THE PLUMBING ===
@ -391,7 +381,7 @@ var timeoutes = [];
var callbacks = []; var callbacks = [];
var seconds = 1000; var seconds = 1000;
var succeeded = false; var succeeded = false;
var popupWindow, popupHidden; var popupWindow;
window.addEventListener("message", function(event) { window.addEventListener("message", function(event) {
if(event.data === "done") { if(event.data === "done") {