author | Dietrich Ayala <dietrich@mozilla.com> |
Sat, 11 Dec 2010 02:44:45 -0800 | |
changeset 59116 | 7527bd2dff2a07cc4685512792ab38a33999d990 |
parent 59115 | caeca9c6dea623a7ecc129068f65205352b2f20f |
child 59117 | dc366807e083e1c8532d9df4c262c7362870a8c4 |
push id | 17538 |
push user | dietrich@mozilla.com |
push date | Sat, 11 Dec 2010 10:46:52 +0000 |
treeherder | mozilla-central@7527bd2dff2a [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | gavin, blocker |
bugs | 604093 |
milestone | 2.0b8pre |
first release with | nightly win64
7527bd2dff2a
/
4.0b8pre
/
20101211044913
/
files
nightly linux32
nightly linux64
nightly mac
nightly win32
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
releases | nightly win64
4.0b8pre
/
20101211044913
/
pushlog to previous
|
browser/base/content/browser.js | file | annotate | diff | comparison | revisions | |
browser/locales/en-US/chrome/browser/browser.properties | file | annotate | diff | comparison | revisions |
--- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -2854,44 +2854,39 @@ function FillInHTMLTooltip(tipElement) }); return retVal; } var browserDragAndDrop = { canDropLink: function (aEvent) Services.droppedLinkHandler.canDropLink(aEvent, true), - dragOver: function (aEvent, statusString) + dragOver: function (aEvent) { if (this.canDropLink(aEvent)) { aEvent.preventDefault(); - - if (statusString) { - XULBrowserWindow.setStatusText(gNavigatorBundle.getString(statusString)); - } } }, drop: function (aEvent, aName) Services.droppedLinkHandler.dropLink(aEvent, aName) }; var homeButtonObserver = { onDrop: function (aEvent) { setTimeout(openHomeDialog, 0, browserDragAndDrop.drop(aEvent, { })); }, onDragOver: function (aEvent) { - browserDragAndDrop.dragOver(aEvent, "droponhomebutton"); + browserDragAndDrop.dragOver(aEvent); aEvent.dropEffect = "link"; }, onDragExit: function (aEvent) { - XULWindowBrowser.setStatusText(""); } } function openHomeDialog(aURL) { var promptTitle = gNavigatorBundle.getString("droponhometitle"); var promptMsg = gNavigatorBundle.getString("droponhomemsg"); var pressedVal = Services.prompt.confirmEx(window, promptTitle, promptMsg, @@ -2918,35 +2913,33 @@ var bookmarksButtonObserver = { let url = browserDragAndDrop.drop(aEvent, name); try { PlacesUIUtils.showMinimalAddBookmarkUI(makeURI(url), name); } catch(ex) { } }, onDragOver: function (aEvent) { - browserDragAndDrop.dragOver(aEvent, "droponbookmarksbutton"); + browserDragAndDrop.dragOver(aEvent); aEvent.dropEffect = "link"; }, onDragExit: function (aEvent) { - XULWindowBrowser.setStatusText(""); } } var newTabButtonObserver = { onDragOver: function (aEvent) { - browserDragAndDrop.dragOver(aEvent, "droponnewtabbutton"); + browserDragAndDrop.dragOver(aEvent); }, onDragExit: function (aEvent) { - XULWindowBrowser.setStatusText(""); }, onDrop: function (aEvent) { let url = browserDragAndDrop.drop(aEvent, { }); var postData = {}; url = getShortcutOrURI(url, postData); if (url) { @@ -2954,48 +2947,45 @@ var newTabButtonObserver = { openNewTabWith(url, null, postData.value, aEvent, true); } } } var newWindowButtonObserver = { onDragOver: function (aEvent) { - browserDragAndDrop.dragOver(aEvent, "droponnewwindowbutton"); + browserDragAndDrop.dragOver(aEvent); }, onDragExit: function (aEvent) { - XULWindowBrowser.setStatusText(""); }, onDrop: function (aEvent) { let url = browserDragAndDrop.drop(aEvent, { }); var postData = {}; url = getShortcutOrURI(url, postData); if (url) { // allow third-party services to fixup this URL openNewWindowWith(url, null, postData.value, true); } } } var DownloadsButtonDNDObserver = { onDragOver: function (aEvent) { - XULWindowBrowser.setStatusText(gNavigatorBundle.getString("dropondownloadsbutton")); var types = aEvent.dataTransfer.types; if (types.contains("text/x-moz-url") || types.contains("text/uri-list") || types.contains("text/plain")) aEvent.preventDefault(); }, onDragExit: function (aEvent) { - XULWindowBrowser.setStatusText(""); }, onDrop: function (aEvent) { let name = { }; let url = browserDragAndDrop.drop(aEvent, name); if (url) saveURL(url, name, null, true, true);
--- a/browser/locales/en-US/chrome/browser/browser.properties +++ b/browser/locales/en-US/chrome/browser/browser.properties @@ -1,18 +1,13 @@ nv_done=Done nv_timeout=Timed Out nv_stopped=Stopped openFile=Open File -droponbookmarksbutton=Drop a link to bookmark it -dropondownloadsbutton=Drop a link or file to download it -droponnewtabbutton=Drop a link or file to open it in a new tab -droponnewwindowbutton=Drop a link or file to open it in a new window -droponhomebutton=Drop a link or file to make it your home page droponhometitle=Set Home Page droponhomemsg=Do you want this document to be your new home page? # context menu strings # LOCALIZATION NOTE (contextMenuSearchText): %1$S is the search engine, # %2$S is the selection string. contextMenuSearchText=Search %1$S for "%2$S"