servo: Merge #10009 - implements NavigatorLanguage (from creativcoder:impl-navigator-language); r=Ms2ger

Fixes #9992

Source-Repo: https://github.com/servo/servo
Source-Revision: 20eb81c00ab62b582372c1dbdffc2b21e01d5d2d
This commit is contained in:
Rahul Sharma
2016-03-18 14:59:46 +05:00
parent 9a150fa31e
commit aa5c559137
5 changed files with 23 additions and 2 deletions

View File

@@ -73,4 +73,9 @@ impl NavigatorMethods for Navigator {
fn Bluetooth(&self) -> Root<Bluetooth> {
self.bluetooth.or_init(|| Bluetooth::new(self.global().r()))
}
// https://html.spec.whatwg.org/multipage/#navigatorlanguage
fn Language(&self) -> DOMString {
navigatorinfo::Language()
}
}

View File

@@ -43,3 +43,7 @@ pub fn UserAgent() -> DOMString {
pub fn AppVersion() -> DOMString {
DOMString::from("4.0")
}
pub fn Language() -> DOMString {
DOMString::from("en-US")
}

View File

@@ -9,7 +9,7 @@ interface Navigator {
};
Navigator implements NavigatorID;
Navigator implements NavigatorBluetooth;
//Navigator implements NavigatorLanguage;
Navigator implements NavigatorLanguage;
//Navigator implements NavigatorOnLine;
//Navigator implements NavigatorContentUtils;
//Navigator implements NavigatorStorageUtils;
@@ -31,3 +31,10 @@ interface NavigatorID {
interface NavigatorBluetooth {
readonly attribute Bluetooth bluetooth;
};
// https://html.spec.whatwg.org/multipage/#navigatorlanguage
[NoInterfaceObject/*, Exposed=Window,Worker*/]
interface NavigatorLanguage {
readonly attribute DOMString language;
//readonly attribute DOMString[] languages;
};

View File

@@ -7,5 +7,5 @@
//[Exposed=Worker]
interface WorkerNavigator {};
WorkerNavigator implements NavigatorID;
//WorkerNavigator implements NavigatorLanguage;
WorkerNavigator implements NavigatorLanguage;
//WorkerNavigator implements NavigatorOnLine;

View File

@@ -66,4 +66,9 @@ impl WorkerNavigatorMethods for WorkerNavigator {
fn AppVersion(&self) -> DOMString {
navigatorinfo::AppVersion()
}
// https://html.spec.whatwg.org/multipage/#navigatorlanguage
fn Language(&self) -> DOMString {
navigatorinfo::Language()
}
}