зеркало из https://github.com/mozilla/gecko-dev.git
Bug 862917. Remove the non-standard window.defaultStatus. r=smaug,gavin
This commit is contained in:
Родитель
8695fc9bb2
Коммит
04924966b8
|
@ -3648,10 +3648,6 @@ var XULBrowserWindow = {
|
|||
// unsupported
|
||||
},
|
||||
|
||||
setJSDefaultStatus: function () {
|
||||
// unsupported
|
||||
},
|
||||
|
||||
setDefaultStatus: function (status) {
|
||||
this.defaultStatus = status;
|
||||
this.updateStatusField();
|
||||
|
|
|
@ -2587,7 +2587,6 @@ void
|
|||
nsGlobalWindow::ClearStatus()
|
||||
{
|
||||
SetStatus(EmptyString());
|
||||
SetDefaultStatus(EmptyString());
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -3914,43 +3913,6 @@ nsGlobalWindow::SetStatus(const nsAString& aStatus)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsGlobalWindow::GetDefaultStatus(nsAString& aDefaultStatus)
|
||||
{
|
||||
FORWARD_TO_OUTER(GetDefaultStatus, (aDefaultStatus),
|
||||
NS_ERROR_NOT_INITIALIZED);
|
||||
|
||||
aDefaultStatus = mDefaultStatus;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsGlobalWindow::SetDefaultStatus(const nsAString& aDefaultStatus)
|
||||
{
|
||||
FORWARD_TO_OUTER(SetDefaultStatus, (aDefaultStatus),
|
||||
NS_ERROR_NOT_INITIALIZED);
|
||||
|
||||
/*
|
||||
* If caller is not chrome and dom.disable_window_status_change is true,
|
||||
* prevent setting window.defaultStatus by exiting early
|
||||
*/
|
||||
|
||||
if (!CanSetProperty("dom.disable_window_status_change")) {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
mDefaultStatus = aDefaultStatus;
|
||||
|
||||
nsCOMPtr<nsIWebBrowserChrome> browserChrome;
|
||||
GetWebBrowserChrome(getter_AddRefs(browserChrome));
|
||||
if (browserChrome) {
|
||||
browserChrome->SetStatus(nsIWebBrowserChrome::STATUS_SCRIPT_DEFAULT,
|
||||
PromiseFlatString(aDefaultStatus).get());
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsGlobalWindow::GetName(nsAString& aName)
|
||||
{
|
||||
|
|
|
@ -25,7 +25,7 @@ interface nsIVariant;
|
|||
* @see <http://www.whatwg.org/html/#window>
|
||||
*/
|
||||
|
||||
[scriptable, uuid(39cb59d4-fba9-48a9-b70b-570a7ec2ebfa)]
|
||||
[scriptable, uuid(67af2eda-4a0d-4a08-8a97-81b8fd46f1f4)]
|
||||
interface nsIDOMWindow : nsISupports
|
||||
{
|
||||
// the current browsing context
|
||||
|
@ -367,8 +367,6 @@ interface nsIDOMWindow : nsISupports
|
|||
/* [replaceable] controllers */
|
||||
readonly attribute nsIControllers controllers;
|
||||
|
||||
attribute DOMString defaultStatus;
|
||||
|
||||
readonly attribute float mozInnerScreenX;
|
||||
readonly attribute float mozInnerScreenY;
|
||||
readonly attribute float devicePixelRatio;
|
||||
|
|
|
@ -18,7 +18,6 @@ interface nsIDocShellTreeItem;
|
|||
interface nsIWebBrowserChrome : nsISupports
|
||||
{
|
||||
const unsigned long STATUS_SCRIPT = 0x00000001;
|
||||
const unsigned long STATUS_SCRIPT_DEFAULT = 0x00000002;
|
||||
const unsigned long STATUS_LINK = 0x00000003;
|
||||
|
||||
/**
|
||||
|
|
|
@ -525,7 +525,6 @@ nsHelpStatusHandler.prototype = {
|
|||
destroy : function() {},
|
||||
|
||||
setJSStatus : function(status) {},
|
||||
setJSDefaultStatus : function(status) {},
|
||||
setOverLink : function(link, context) {},
|
||||
onBeforeLinkTraversal: function(originalTarget, linkURI, linkNode, isAppTab) {}
|
||||
}
|
||||
|
|
|
@ -41,7 +41,6 @@
|
|||
},
|
||||
|
||||
setJSStatus: function() { },
|
||||
setJSDefaultStatus: function() { },
|
||||
|
||||
setOverLink: function(aStatusText, aLink) {
|
||||
gStatusText = aStatusText;
|
||||
|
|
|
@ -16,7 +16,7 @@ interface nsIDOMElement;
|
|||
* internals of the browser area to tell the containing xul window to update
|
||||
* its ui.
|
||||
*/
|
||||
[scriptable, uuid(67a601df-f091-4894-a2e2-2e6cfebb35ea)]
|
||||
[scriptable, uuid(7c91b4bd-f855-4872-b3fa-a2076d28eb03)]
|
||||
interface nsIXULBrowserWindow : nsISupports
|
||||
{
|
||||
/**
|
||||
|
@ -24,11 +24,6 @@ interface nsIXULBrowserWindow : nsISupports
|
|||
*/
|
||||
void setJSStatus(in AString status);
|
||||
|
||||
/**
|
||||
* Sets the default status according to JS' version of default status.
|
||||
*/
|
||||
void setJSDefaultStatus(in AString status);
|
||||
|
||||
/**
|
||||
* Tells the object implementing this function what link we are currently
|
||||
* over.
|
||||
|
|
|
@ -452,9 +452,6 @@ NS_IMETHODIMP nsContentTreeOwner::SetStatusWithContext(uint32_t aStatusType,
|
|||
case STATUS_SCRIPT:
|
||||
xulBrowserWindow->SetJSStatus(aStatusText);
|
||||
break;
|
||||
case STATUS_SCRIPT_DEFAULT:
|
||||
xulBrowserWindow->SetJSDefaultStatus(aStatusText);
|
||||
break;
|
||||
case STATUS_LINK:
|
||||
{
|
||||
nsCOMPtr<nsIDOMElement> element = do_QueryInterface(aStatusContext);
|
||||
|
|
Загрузка…
Ссылка в новой задаче