diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-18 15:29:46 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-18 15:29:46 +0530 |
commit | 20eb81c00ab62b582372c1dbdffc2b21e01d5d2d (patch) | |
tree | 67bb2b415f61f763132c317491a87d9f969f3513 /components/script/dom | |
parent | ce2da28a00036e614cee211f4b279dc8e7eac9c1 (diff) | |
parent | facf59177cf9e29f07310901cfef3fb2aa063f14 (diff) | |
download | servo-20eb81c00ab62b582372c1dbdffc2b21e01d5d2d.tar.gz servo-20eb81c00ab62b582372c1dbdffc2b21e01d5d2d.zip |
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 -->
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/navigator.rs | 5 | ||||
-rw-r--r-- | components/script/dom/navigatorinfo.rs | 4 | ||||
-rw-r--r-- | components/script/dom/webidls/Navigator.webidl | 9 | ||||
-rw-r--r-- | components/script/dom/webidls/WorkerNavigator.webidl | 2 | ||||
-rw-r--r-- | components/script/dom/workernavigator.rs | 5 |
5 files changed, 23 insertions, 2 deletions
diff --git a/components/script/dom/navigator.rs b/components/script/dom/navigator.rs index 9803b6562b6..fe01105b787 100644 --- a/components/script/dom/navigator.rs +++ b/components/script/dom/navigator.rs @@ -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() + } } diff --git a/components/script/dom/navigatorinfo.rs b/components/script/dom/navigatorinfo.rs index 1d86deb45ad..f27e46ed91b 100644 --- a/components/script/dom/navigatorinfo.rs +++ b/components/script/dom/navigatorinfo.rs @@ -43,3 +43,7 @@ pub fn UserAgent() -> DOMString { pub fn AppVersion() -> DOMString { DOMString::from("4.0") } + +pub fn Language() -> DOMString { + DOMString::from("en-US") +} diff --git a/components/script/dom/webidls/Navigator.webidl b/components/script/dom/webidls/Navigator.webidl index 8a7a9ef914e..c23415aa094 100644 --- a/components/script/dom/webidls/Navigator.webidl +++ b/components/script/dom/webidls/Navigator.webidl @@ -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; +}; diff --git a/components/script/dom/webidls/WorkerNavigator.webidl b/components/script/dom/webidls/WorkerNavigator.webidl index ec62d556c4b..c44edbfe58a 100644 --- a/components/script/dom/webidls/WorkerNavigator.webidl +++ b/components/script/dom/webidls/WorkerNavigator.webidl @@ -7,5 +7,5 @@ //[Exposed=Worker] interface WorkerNavigator {}; WorkerNavigator implements NavigatorID; -//WorkerNavigator implements NavigatorLanguage; +WorkerNavigator implements NavigatorLanguage; //WorkerNavigator implements NavigatorOnLine; diff --git a/components/script/dom/workernavigator.rs b/components/script/dom/workernavigator.rs index 146c098d7d1..07bf443d33c 100644 --- a/components/script/dom/workernavigator.rs +++ b/components/script/dom/workernavigator.rs @@ -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() + } } |