Skip to content

Commit

Permalink
Auto merge of #10009 - creativcoder:impl-navigator-language, r=jdm
Browse files Browse the repository at this point in the history
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 -->
  • Loading branch information
bors-servo committed Mar 16, 2016
2 parents 909ff44 + 0c3454b commit 1bd2479
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 8 deletions.
5 changes: 5 additions & 0 deletions components/script/dom/navigator.rs
Expand Up @@ -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 GetLanguage(&self) -> Option<DOMString> {
Some(navigatorinfo::Language())
}
}
4 changes: 4 additions & 0 deletions components/script/dom/navigatorinfo.rs
Expand Up @@ -43,3 +43,7 @@ pub fn UserAgent() -> DOMString {
pub fn AppVersion() -> DOMString {
DOMString::from("4.0")
}

pub fn Language() -> DOMString {
DOMString::from("en-US")
}
9 changes: 8 additions & 1 deletion components/script/dom/webidls/Navigator.webidl
Expand Up @@ -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;
Expand All @@ -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;
};
2 changes: 1 addition & 1 deletion components/script/dom/webidls/WorkerNavigator.webidl
Expand Up @@ -7,5 +7,5 @@
//[Exposed=Worker]
interface WorkerNavigator {};
WorkerNavigator implements NavigatorID;
//WorkerNavigator implements NavigatorLanguage;
WorkerNavigator implements NavigatorLanguage;
//WorkerNavigator implements NavigatorOnLine;
5 changes: 5 additions & 0 deletions components/script/dom/workernavigator.rs
Expand Up @@ -66,4 +66,9 @@ impl WorkerNavigatorMethods for WorkerNavigator {
fn AppVersion(&self) -> DOMString {
navigatorinfo::AppVersion()
}

// https://html.spec.whatwg.org/multipage/#navigatorlanguage
fn GetLanguage(&self) -> Option<DOMString> {
Some(navigatorinfo::Language())
}
}
6 changes: 0 additions & 6 deletions tests/wpt/metadata/html/dom/interfaces.html.ini
Expand Up @@ -7131,9 +7131,6 @@
[EventTarget interface: calling dispatchEvent(Event) on window.applicationCache with too few arguments must throw TypeError]
expected: FAIL

[Navigator interface: attribute language]
expected: FAIL

[Navigator interface: attribute languages]
expected: FAIL

Expand Down Expand Up @@ -7173,9 +7170,6 @@
[Navigator interface: attribute javaEnabled]
expected: FAIL

[Navigator interface: window.navigator must inherit property "language" with the proper type (7)]
expected: FAIL

[Navigator interface: window.navigator must inherit property "languages" with the proper type (8)]
expected: FAIL

Expand Down

0 comments on commit 1bd2479

Please sign in to comment.