Bug 220215 use the XPCNativeWrapper for Components.lookupMethod r=caillon sr=bz

This commit is contained in:
neil%parkwaycc.co.uk 2006-09-14 06:09:12 +00:00
Родитель 674b0be0e8
Коммит 43c1b8e638
2 изменённых файлов: 17 добавлений и 17 удалений

Просмотреть файл

@ -103,10 +103,14 @@
}
}
function sendLink(pageUrl, pageTitle)
function sendLink(aDocument)
{
if (!aDocument)
aDocument = window.content.document;
try {
openComposeWindow(pageUrl, pageTitle, 0, null);
aDocument = new XPCNativeWrapper(aDocument, "URL", "title");
openComposeWindow(aDocument.URL, aDocument.title, 0, null);
} catch(ex) { dump("Cannot Send Link: " + ex + "\n"); }
}
@ -123,12 +127,10 @@
if (!aDocument)
aDocument = window._content.document;
var charset = getCharsetforSave(aDocument);
var pageUrl = aDocument.URL;
var pageTitle = Components.lookupMethod(aDocument, 'title').call(aDocument);
try {
openComposeWindow(pageUrl, pageTitle, 1, charset);
var charset = getCharsetforSave(aDocument);
aDocument = new XPCNativeWrapper(aDocument, "URL", "title");
openComposeWindow(aDocument.URL, aDocument.title, 1, charset);
} catch(ex) { dump("Cannot Send Page: " + ex + "\n"); }
}
@ -175,9 +177,7 @@
<command id="cmd_newMessage" oncommand="goOpenNewMessage();"/>
<command id="cmd_newCard" oncommand="openNewCardDialog()"/>
<command id="cmd_sendPage" oncommand="sendPage();"/>
<command id="Browser:SendLink"
oncommand="sendLink(Components.lookupMethod(window._content, 'location').call(window._content).href,
Components.lookupMethod(window._content.document, 'title').call(window._content.document));"/>
<command id="Browser:SendLink" oncommand="sendLink();"/>
</commandset>
<keyset id="tasksKeys">
<key id="key_newMessage" key="&newMessageCmd.key;" command="cmd_newMessage" modifiers="accel"/>
@ -227,7 +227,7 @@
<menuitem insertafter="saveframeas"
label="&contextSendFrame.label;"
accesskey="&contextSendFrame.accesskey;"
oncommand="sendPage(gContextMenu.target.ownerDocument);"/>
oncommand="sendPage(new XPCNativeWrapper(gContextMenu.target, 'ownerDocument').ownerDocument);"/>
</menupopup>
</menu>
</popup>

Просмотреть файл

@ -275,9 +275,9 @@ function getContentAreaFrameCount()
// When a content area frame is focused, update the focused frame URL
function contentAreaFrameFocus()
{
var focusedWindow = document.commandDispatcher.focusedWindow;
if (isContentFrame(focusedWindow)) {
gFocusedURL = Components.lookupMethod(focusedWindow, 'location').call(focusedWindow).href;
var focusedWindow = new XPCNativeWrapper(document.commandDispatcher.focusedWindow, "top", "document", "location");
if (focusedWindow.top == window.content) {
gFocusedURL = focusedWindow.location.href;
gFocusedDocument = focusedWindow.document;
}
}
@ -2271,9 +2271,9 @@ function maybeInitPopupContext()
// return our opener's URI
const IOS = Components.classes["@mozilla.org/network/io-service;1"]
.getService(CI.nsIIOService);
var spec = Components.lookupMethod(window.content.opener, "location")
.call();
return IOS.newURI(spec, null, null);
var opener = new XPCNativeWrapper(window.content, "opener").opener;
var location = new XPCNativeWrapper(opener, "location").location;
return IOS.newURI(location.href, null, null);
}
} catch(e) {
}