Fix 60606: remove (evil!) mail dependency on navigator.js. also fixes... (9d01f3f6) · Commits · The Tor Project / Applications / Mullvad Browser

mailnews/base/resources/content/mail3PaneWindowVertLayout.xul

+2 −8

Original line number	Original line	Diff line number	Diff line
	@@ -33,12 +33,7 @@ Rights Reserved.
	<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>		<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
	<?xul-overlay href="chrome://communicator/content/securityOverlay.xul"?>		<?xul-overlay href="chrome://communicator/content/securityOverlay.xul"?>

	<!DOCTYPE window [		<!DOCTYPE window SYSTEM "chrome://messenger/locale/messenger.dtd" >
	<!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
	%messengerDTD;
	<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
	%navigatorDTD;
	]>

	<window id="messengerWindow"		<window id="messengerWindow"
	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
	@@ -67,7 +62,6 @@ Rights Reserved.
	<script type="text/javascript" src="chrome://messenger/content/mailContextMenus.js"/>		<script type="text/javascript" src="chrome://messenger/content/mailContextMenus.js"/>
	<script type="text/javascript" src="chrome://messenger/content/messengerdnd.js"/>		<script type="text/javascript" src="chrome://messenger/content/messengerdnd.js"/>
	<script type="text/javascript" src="chrome://messenger/content/accountUtils.js"/>		<script type="text/javascript" src="chrome://messenger/content/accountUtils.js"/>
	<script type="text/javascript" src="chrome://navigator/content/navigator.js"/>
	<script type="text/javascript" src="chrome://communicator/content/contentAreaClick.js"/>		<script type="text/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
	<script type="text/javascript" src="chrome://communicator/content/contentAreaDD.js"/>		<script type="text/javascript" src="chrome://communicator/content/contentAreaDD.js"/>
	<script type="text/javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>		<script type="text/javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>

mailnews/base/resources/content/mailWindowOverlay.xul

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -587,8 +587,8 @@ Rights Reserved.
	<menuitem id="context-bookmarklink"		<menuitem id="context-bookmarklink"
	value="&bookmarkLinkCmd.label;"		value="&bookmarkLinkCmd.label;"
	accesskey="&bookmarkLinkCmd.accesskey;"		accesskey="&bookmarkLinkCmd.accesskey;"
	oncommand="BrowserAddBookmark( contextMenu.linkURL(),		oncommand="addBookmark(contextMenu.linkURL(),
	contextMenu.linkText() )"/>		contextMenu.linkText());"/>

	</popup>		</popup>

mailnews/base/resources/content/messageWindow.xul

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,6 @@ Rights Reserved.
	<script type="text/javascript" src="chrome://messenger/content/mailWindow.js"/>		<script type="text/javascript" src="chrome://messenger/content/mailWindow.js"/>
	<script type="text/javascript" src="chrome://messenger/content/messageWindow.js"/>		<script type="text/javascript" src="chrome://messenger/content/messageWindow.js"/>
	<script type="text/javascript" src="chrome://messenger/content/accountUtils.js"/>		<script type="text/javascript" src="chrome://messenger/content/accountUtils.js"/>
	<script type="text/javascript" src="chrome://navigator/content/navigator.js"/>
	<script type="text/javascript" src="chrome://communicator/content/nsContextMenu.js"/>		<script type="text/javascript" src="chrome://communicator/content/nsContextMenu.js"/>
	<script type="text/javascript" src="chrome://messenger/content/mailContextMenus.js"/>		<script type="text/javascript" src="chrome://messenger/content/mailContextMenus.js"/>
	<script type="text/javascript" src="chrome://communicator/content/contentAreaClick.js"/>		<script type="text/javascript" src="chrome://communicator/content/contentAreaClick.js"/>

mailnews/base/resources/content/messenger.xul

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -33,12 +33,7 @@ Rights Reserved.
	<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>		<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
	<?xul-overlay href="chrome://communicator/content/securityOverlay.xul"?>		<?xul-overlay href="chrome://communicator/content/securityOverlay.xul"?>

	<!DOCTYPE window [		<!DOCTYPE window SYSTEM "chrome://messenger/locale/messenger.dtd">
	<!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
	%messengerDTD;
	<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
	%navigatorDTD;
	]>

	<window id="messengerWindow"		<window id="messengerWindow"
	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
	@@ -67,7 +62,6 @@ Rights Reserved.
	<script type="text/javascript" src="chrome://messenger/content/mailContextMenus.js"/>		<script type="text/javascript" src="chrome://messenger/content/mailContextMenus.js"/>
	<script type="text/javascript" src="chrome://messenger/content/messengerdnd.js"/>		<script type="text/javascript" src="chrome://messenger/content/messengerdnd.js"/>
	<script type="text/javascript" src="chrome://messenger/content/accountUtils.js"/>		<script type="text/javascript" src="chrome://messenger/content/accountUtils.js"/>
	<script type="text/javascript" src="chrome://navigator/content/navigator.js"/>
	<script type="text/javascript" src="chrome://communicator/content/contentAreaClick.js"/>		<script type="text/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
	<script type="text/javascript" src="chrome://communicator/content/contentAreaDD.js"/>		<script type="text/javascript" src="chrome://communicator/content/contentAreaDD.js"/>
	<script type="text/javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>		<script type="text/javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>

xpfe/browser/resources/content/navigator.js

+0 −26

Original line number	Original line	Diff line number	Diff line
	@@ -772,24 +772,6 @@ function BrowserOpenFileWindow()
	}		}
	}		}

	function BrowserAddBookmark(url, title)
	{
	if (!title)
	title = url;

	var focusedWindow = document.commandDispatcher.focusedWindow;
	if (focusedWindow == window)
	focusedWindow = _content;

	var docCharset = focusedWindow.document.characterSet;

	var bmks = Components.classes["@mozilla.org/browser/bookmarks-service;1"]
	.getService(Components.interfaces.nsIBookmarksService);

	bmks.AddBookmark(url, title, bmks.BOOKMARK_DEFAULT_TYPE, docCharset);
	debug("BrowserAddBookmark: " + docCharset + "\n");
	}

	// Set up a lame hack to avoid opening two bookmarks.		// Set up a lame hack to avoid opening two bookmarks.
	// Could otherwise happen with two Ctrl-B's in a row.		// Could otherwise happen with two Ctrl-B's in a row.
	var gDisableBookmarks = false;		var gDisableBookmarks = false;
	@@ -1296,14 +1278,6 @@ function OpenAddressbook()
	open("chrome://messenger/content/addressbook/addressbook.xul", "_blank", "chrome,menubar,toolbar,resizable");		open("chrome://messenger/content/addressbook/addressbook.xul", "_blank", "chrome,menubar,toolbar,resizable");
	}		}

	function BrowserSendPage(pageUrl, pageTitle)
	{
	openDialog("chrome://messenger/content/messengercompose/messengercompose.xul",
	"_blank",
	"chrome,all,dialog=no",
	"attachment='" + pageUrl + "',body='" + pageUrl + "',subject='" + pageTitle + "',bodyislink=true");
	}

	function BrowserViewSource()		function BrowserViewSource()
	{		{
	var focusedWindow = document.commandDispatcher.focusedWindow;		var focusedWindow = document.commandDispatcher.focusedWindow;