Bug 525190 - Refactor the way pageInfo.js handles arguments. r=db48x
--- a/browser/base/content/pageinfo/pageInfo.js
+++ b/browser/base/content/pageinfo/pageInfo.js
@@ -274,46 +274,44 @@ function onLoadPageInfo()
gStrings.notSet = gBundle.getString("notset");
gStrings.mediaImg = gBundle.getString("mediaImg");
gStrings.mediaBGImg = gBundle.getString("mediaBGImg");
gStrings.mediaObject = gBundle.getString("mediaObject");
gStrings.mediaEmbed = gBundle.getString("mediaEmbed");
gStrings.mediaLink = gBundle.getString("mediaLink");
gStrings.mediaInput = gBundle.getString("mediaInput");
- if ("arguments" in window && window.arguments.length >= 1 &&
- window.arguments[0] && window.arguments[0].doc) {
- gDocument = window.arguments[0].doc;
+ var args = "arguments" in window &&
+ window.arguments.length >= 1 &&
+ window.arguments[0];
+
+ if (args && args.doc) {
+ gDocument = args.doc;
gWindow = gDocument.defaultView;
}
else {
if ("gBrowser" in window.opener)
gWindow = window.opener.gBrowser.contentWindow;
else
gWindow = window.opener.frames[0];
gDocument = gWindow.document;
}
// init media view
var imageTree = document.getElementById("imagetree");
imageTree.view = gImageView;
// set gImageElement if present
- if ("arguments" in window && window.arguments.length >= 1 &&
- window.arguments[0].imageElement)
- gImageElement = window.arguments[0].imageElement;
+ gImageElement = args && args.imageElement;
// build the content
loadPageInfo();
/* Select the requested tab, if the name is specified */
- var initialTab = "generalTab";
- if ("arguments" in window && window.arguments.length >= 1 &&
- window.arguments[0] && window.arguments[0].initialTab)
- initialTab = window.arguments[0].initialTab;
+ var initialTab = (args && args.initialTab) || "generalTab";
var radioGroup = document.getElementById("viewGroup");
initialTab = document.getElementById(initialTab) || document.getElementById("generalTab");
radioGroup.selectedItem = initialTab;
radioGroup.selectedItem.doCommand();
radioGroup.focus();
Components.classes["@mozilla.org/observer-service;1"]
.getService(Components.interfaces.nsIObserverService)
.notifyObservers(window, "page-info-dialog-loaded", null);