зеркало из https://github.com/mozilla/gecko-dev.git
fix bug 65938 Starting mozilla from profile manager gives javascript error in console
patch by maolson@earthlink.net r=timeless a=alecf
This commit is contained in:
Родитель
aeab2912d9
Коммит
a34deec8ad
|
@ -27,7 +27,7 @@ function doOKButton()
|
||||||
if ( doOKFunction )
|
if ( doOKFunction )
|
||||||
close = doOKFunction();
|
close = doOKFunction();
|
||||||
|
|
||||||
if ( close )
|
if (close && top)
|
||||||
top.window.close();
|
top.window.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ function doCancelButton()
|
||||||
if ( doCancelFunction )
|
if ( doCancelFunction )
|
||||||
close = doCancelFunction();
|
close = doCancelFunction();
|
||||||
|
|
||||||
if ( close )
|
if (close && top)
|
||||||
top.window.close();
|
top.window.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ function doButton2()
|
||||||
if ( doButton2Function )
|
if ( doButton2Function )
|
||||||
close = doButton2Function();
|
close = doButton2Function();
|
||||||
|
|
||||||
if ( close )
|
if (close && top)
|
||||||
top.window.close();
|
top.window.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@ function doButton3()
|
||||||
if ( doButton3Function )
|
if ( doButton3Function )
|
||||||
close = doButton3Function();
|
close = doButton3Function();
|
||||||
|
|
||||||
if ( close )
|
if (close && top)
|
||||||
top.window.close();
|
top.window.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -76,8 +76,6 @@ function moveToAlertPosition()
|
||||||
yOffset = screen.availHeight - window.outerHeight - opener.screenY;
|
yOffset = screen.availHeight - window.outerHeight - opener.screenY;
|
||||||
xOffset = ( xOffset > 0 ) ? xOffset : 0;
|
xOffset = ( xOffset > 0 ) ? xOffset : 0;
|
||||||
yOffset = ( yOffset > 0 ) ? yOffset : 0;
|
yOffset = ( yOffset > 0 ) ? yOffset : 0;
|
||||||
dump( "Move window by " + xOffset + ","+yOffset+"\n");
|
|
||||||
dump( "screen x "+ opener.screenX +"screen y "+ opener.screenY +"\n");
|
|
||||||
window.moveTo( opener.screenX + xOffset, opener.screenY + yOffset );
|
window.moveTo( opener.screenX + xOffset, opener.screenY + yOffset );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -89,6 +87,5 @@ function centerWindowOnScreen()
|
||||||
|
|
||||||
xOffset = ( xOffset > 0 ) ? xOffset : 0;
|
xOffset = ( xOffset > 0 ) ? xOffset : 0;
|
||||||
yOffset = ( yOffset > 0 ) ? yOffset : 0;
|
yOffset = ( yOffset > 0 ) ? yOffset : 0;
|
||||||
dump( "Move window by " + xOffset + ","+yOffset+"\n");
|
|
||||||
window.moveTo( xOffset, yOffset);
|
window.moveTo( xOffset, yOffset);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче