Auto merge of #10009 - creativcoder:impl-navigator-language, r=Ms2ger

implements NavigatorLanguage

Fixes #9992

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10009)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-03-18 15:29:46 +05:30
commit 20eb81c00a
7 changed files with 23 additions and 17 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()
}
}