fix for 51053, where we'd throw too early when trying to close popups. added try/catch around each individual QI. r=ben/sr=scc.
git-svn-id: svn://10.0.0.236/trunk@86317 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -473,6 +473,8 @@
|
||||
<![CDATA[
|
||||
try {
|
||||
var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
|
||||
} catch(e) {}
|
||||
try {
|
||||
var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
|
||||
} catch(e) {}
|
||||
if (popupSetBox)
|
||||
@@ -487,6 +489,8 @@
|
||||
<![CDATA[
|
||||
try {
|
||||
var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
|
||||
} catch(e) {}
|
||||
try {
|
||||
var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
|
||||
} catch(e) {}
|
||||
if (popupSetBox)
|
||||
@@ -501,6 +505,8 @@
|
||||
<![CDATA[
|
||||
try {
|
||||
var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
|
||||
} catch(e) {}
|
||||
try {
|
||||
var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
|
||||
} catch(e) {}
|
||||
if (popupSetBox)
|
||||
@@ -514,6 +520,8 @@
|
||||
<![CDATA[
|
||||
try {
|
||||
var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
|
||||
} catch(e) {}
|
||||
try {
|
||||
var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
|
||||
} catch(e) {}
|
||||
if (popupSetBox)
|
||||
|
||||
Reference in New Issue
Block a user