diff options
36 files changed, 204 insertions, 157 deletions
diff --git a/files/es/_redirects.txt b/files/es/_redirects.txt index 9fbaa853f2..a224a5b8a0 100644 --- a/files/es/_redirects.txt +++ b/files/es/_redirects.txt @@ -1566,6 +1566,7 @@ /es/docs/Web/API/Notifications_API/Usando_la_API_de_Notificaciones /es/docs/Web/API/Notifications_API/Using_the_Notifications_API /es/docs/Web/API/ParentNode/childElementCount /es/docs/Web/API/Element/childElementCount /es/docs/Web/API/Position /es/docs/Web/API/GeolocationPosition +/es/docs/Web/API/PositionOptions /es/docs/conflicting/Web/API/Geolocation/getCurrentPosition /es/docs/Web/API/RandomSource/Obtenervaloresaleatorios /es/docs/Web/API/Crypto/getRandomValues /es/docs/Web/API/SubtleCrypto/encrypt /es/docs/Web/HTTP/Headers/Digest /es/docs/Web/API/UIEvent/pageX /es/docs/Web/API/MouseEvent/pageX diff --git a/files/es/_wikihistory.json b/files/es/_wikihistory.json index 0e8a142a68..1c5f685def 100644 --- a/files/es/_wikihistory.json +++ b/files/es/_wikihistory.json @@ -7906,14 +7906,6 @@ "joredjs" ] }, - "Web/API/PositionOptions": { - "modified": "2019-03-23T23:16:28.831Z", - "contributors": [ - "fscholz", - "LeoHirsch", - "lupomontero" - ] - }, "Web/API/PushManager": { "modified": "2019-03-23T22:40:00.540Z", "contributors": [ @@ -21368,6 +21360,14 @@ "fscholz" ] }, + "conflicting/Web/API/Geolocation/getCurrentPosition": { + "modified": "2019-03-23T23:16:28.831Z", + "contributors": [ + "fscholz", + "LeoHirsch", + "lupomontero" + ] + }, "conflicting/Web/API/HTML_Drag_and_Drop_API": { "modified": "2019-03-23T23:18:26.504Z", "contributors": [ diff --git a/files/es/web/api/positionoptions/index.html b/files/es/conflicting/web/api/geolocation/getcurrentposition/index.html index 349aba4631..6deb3c52c9 100644 --- a/files/es/web/api/positionoptions/index.html +++ b/files/es/conflicting/web/api/geolocation/getcurrentposition/index.html @@ -1,11 +1,12 @@ --- title: PositionOptions -slug: Web/API/PositionOptions +slug: conflicting/Web/API/Geolocation/getCurrentPosition tags: - Geolocalización - Interfaz - Referencia translation_of: Web/API/PositionOptions +original_slug: Web/API/PositionOptions --- <p>{{APIRef("Geolocation API")}}</p> diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt index 67ce230c91..932b674e10 100644 --- a/files/fr/_redirects.txt +++ b/files/fr/_redirects.txt @@ -3710,6 +3710,10 @@ /fr/docs/Web/API/PasswordCredential/passwordName /fr/docs/conflicting/Web/API/PasswordCredential_bc57d5dfa87242b4fb83497887124f41 /fr/docs/Web/API/Performance.now() /fr/docs/Web/API/Performance/now /fr/docs/Web/API/Pointer_events/gestes_pincer_zoom /fr/docs/Web/API/Pointer_events/Pinch_zoom_gestures +/fr/docs/Web/API/PositionOptions /fr/docs/conflicting/Web/API/Geolocation/getCurrentPosition_5852407122355d2ab39863042583c266 +/fr/docs/Web/API/PositionOptions/enableHighAccuracy /fr/docs/conflicting/Web/API/Geolocation/getCurrentPosition +/fr/docs/Web/API/PositionOptions/maximumAge /fr/docs/conflicting/Web/API/Geolocation/getCurrentPosition_c2c285f72be001586cb95d7989ba1b54 +/fr/docs/Web/API/PositionOptions/timeout /fr/docs/conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6 /fr/docs/Web/API/RandomSource.getRandomValues /fr/docs/Web/API/Crypto/getRandomValues /fr/docs/Web/API/RandomSource/getRandomValues /fr/docs/Web/API/Crypto/getRandomValues /fr/docs/Web/API/Référence_du_DOM_Gecko /fr/docs/Web/API/Document_Object_Model @@ -3725,6 +3729,7 @@ /fr/docs/Web/API/Selection_API /fr/docs/conflicting/Web/API/Selection /fr/docs/Web/API/ServiceWorkerState /fr/docs/orphaned/Web/API/ServiceWorkerState /fr/docs/Web/API/Storage/LocalStorage /fr/docs/conflicting/Web/API/Window/localStorage +/fr/docs/Web/API/StorageEstimate /fr/docs/conflicting/Web/API/StorageManager/estimate /fr/docs/Web/API/ULongRange /fr/docs/conflicting/Web/API/MediaTrackConstraints /fr/docs/Web/API/URL.createObjectURL /fr/docs/Web/API/URL/createObjectURL /fr/docs/Web/API/URLUtilsReadOnly /fr/docs/orphaned/Web/API/URLUtilsReadOnly diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json index 9e05ffbc28..c76201163e 100644 --- a/files/fr/_wikihistory.json +++ b/files/fr/_wikihistory.json @@ -18923,33 +18923,6 @@ "insomniaqc" ] }, - "Web/API/PositionOptions": { - "modified": "2019-08-26T09:46:33.509Z", - "contributors": [ - "ReinWired", - "guizmo51", - "JeanLucB" - ] - }, - "Web/API/PositionOptions/enableHighAccuracy": { - "modified": "2019-03-18T21:37:11.224Z", - "contributors": [ - "JeanLucB" - ] - }, - "Web/API/PositionOptions/maximumAge": { - "modified": "2019-03-18T21:37:16.913Z", - "contributors": [ - "JeanLucB" - ] - }, - "Web/API/PositionOptions/timeout": { - "modified": "2020-10-15T22:03:34.783Z", - "contributors": [ - "Arzak656", - "JeanLucB" - ] - }, "Web/API/ProcessingInstruction": { "modified": "2019-03-18T21:40:23.342Z", "contributors": [ @@ -19473,12 +19446,6 @@ "rmNyro" ] }, - "Web/API/StorageEstimate": { - "modified": "2020-10-15T22:17:55.065Z", - "contributors": [ - "Watilin" - ] - }, "Web/API/StorageManager": { "modified": "2020-10-15T22:17:54.664Z" }, @@ -43156,6 +43123,33 @@ "jean-pierre.gay" ] }, + "conflicting/Web/API/Geolocation/getCurrentPosition": { + "modified": "2019-03-18T21:37:11.224Z", + "contributors": [ + "JeanLucB" + ] + }, + "conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6": { + "modified": "2020-10-15T22:03:34.783Z", + "contributors": [ + "Arzak656", + "JeanLucB" + ] + }, + "conflicting/Web/API/Geolocation/getCurrentPosition_5852407122355d2ab39863042583c266": { + "modified": "2019-08-26T09:46:33.509Z", + "contributors": [ + "ReinWired", + "guizmo51", + "JeanLucB" + ] + }, + "conflicting/Web/API/Geolocation/getCurrentPosition_c2c285f72be001586cb95d7989ba1b54": { + "modified": "2019-03-18T21:37:16.913Z", + "contributors": [ + "JeanLucB" + ] + }, "conflicting/Web/API/GlobalEventHandlers/onresize": { "modified": "2019-03-23T23:03:02.343Z", "contributors": [ @@ -43228,6 +43222,12 @@ "Watilin" ] }, + "conflicting/Web/API/StorageManager/estimate": { + "modified": "2020-10-15T22:17:55.065Z", + "contributors": [ + "Watilin" + ] + }, "conflicting/Web/API/URL": { "modified": "2019-03-23T22:29:28.869Z", "contributors": [ diff --git a/files/fr/web/api/positionoptions/enablehighaccuracy/index.md b/files/fr/conflicting/web/api/geolocation/getcurrentposition/index.md index 455635be35..7f8316535d 100644 --- a/files/fr/web/api/positionoptions/enablehighaccuracy/index.md +++ b/files/fr/conflicting/web/api/geolocation/getcurrentposition/index.md @@ -1,7 +1,8 @@ --- title: PositionOptions.enableHighAccuracy -slug: Web/API/PositionOptions/enableHighAccuracy +slug: conflicting/Web/API/Geolocation/getCurrentPosition translation_of: Web/API/PositionOptions/enableHighAccuracy +original_slug: Web/API/PositionOptions/enableHighAccuracy --- {{securecontext_header}}{{APIRef("Geolocation API")}} diff --git a/files/fr/web/api/positionoptions/timeout/index.md b/files/fr/conflicting/web/api/geolocation/getcurrentposition_058087067b28ad25fff974fd59827fb6/index.md index f524f862ee..84cfaa1dce 100644 --- a/files/fr/web/api/positionoptions/timeout/index.md +++ b/files/fr/conflicting/web/api/geolocation/getcurrentposition_058087067b28ad25fff974fd59827fb6/index.md @@ -1,7 +1,9 @@ --- title: PositionOptions.timeout -slug: Web/API/PositionOptions/timeout +slug: >- + conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6 translation_of: Web/API/PositionOptions/timeout +original_slug: Web/API/PositionOptions/timeout --- {{securecontext_header}}{{APIRef("Geolocation API")}} diff --git a/files/fr/web/api/positionoptions/index.md b/files/fr/conflicting/web/api/geolocation/getcurrentposition_5852407122355d2ab39863042583c266/index.md index 73fa6c7485..4cdc64aac6 100644 --- a/files/fr/web/api/positionoptions/index.md +++ b/files/fr/conflicting/web/api/geolocation/getcurrentposition_5852407122355d2ab39863042583c266/index.md @@ -1,7 +1,9 @@ --- title: PositionOptions -slug: Web/API/PositionOptions +slug: >- + conflicting/Web/API/Geolocation/getCurrentPosition_5852407122355d2ab39863042583c266 translation_of: Web/API/PositionOptions +original_slug: Web/API/PositionOptions --- {{securecontext_header}}{{APIRef("Geolocation API")}} diff --git a/files/fr/web/api/positionoptions/maximumage/index.md b/files/fr/conflicting/web/api/geolocation/getcurrentposition_c2c285f72be001586cb95d7989ba1b54/index.md index 11be32c85d..aa5dcac272 100644 --- a/files/fr/web/api/positionoptions/maximumage/index.md +++ b/files/fr/conflicting/web/api/geolocation/getcurrentposition_c2c285f72be001586cb95d7989ba1b54/index.md @@ -1,7 +1,9 @@ --- title: PositionOptions.maximumAge -slug: Web/API/PositionOptions/maximumAge +slug: >- + conflicting/Web/API/Geolocation/getCurrentPosition_c2c285f72be001586cb95d7989ba1b54 translation_of: Web/API/PositionOptions/maximumAge +original_slug: Web/API/PositionOptions/maximumAge --- {{securecontext_header}}{{APIRef("Geolocation API")}} diff --git a/files/fr/web/api/storageestimate/index.md b/files/fr/conflicting/web/api/storagemanager/estimate/index.md index 612975fb5f..e7a734c572 100644 --- a/files/fr/web/api/storageestimate/index.md +++ b/files/fr/conflicting/web/api/storagemanager/estimate/index.md @@ -1,7 +1,8 @@ --- title: StorageEstimate -slug: Web/API/StorageEstimate +slug: conflicting/Web/API/StorageManager/estimate translation_of: Web/API/StorageEstimate +original_slug: Web/API/StorageEstimate --- {{securecontext_header}}{{APIRef("Storage")}} diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt index d17aaa1c72..009dac7169 100644 --- a/files/ja/_redirects.txt +++ b/files/ja/_redirects.txt @@ -3219,6 +3219,7 @@ /ja/docs/Web/API/NonDocumentTypeChildNode /ja/docs/Web/API/Element /ja/docs/Web/API/Position /ja/docs/Web/API/GeolocationPosition /ja/docs/Web/API/PositionError /ja/docs/Web/API/GeolocationPositionError +/ja/docs/Web/API/PositionOptions /ja/docs/conflicting/Web/API/Geolocation/getCurrentPosition /ja/docs/Web/API/Push_API/Using_the_Push_API /ja/docs/Web/API/Push_API /ja/docs/Web/API/RTCIdentityErrorEvent /ja/docs/orphaned/Web/API/RTCIdentityErrorEvent /ja/docs/Web/API/RTCIdentityEvent /ja/docs/orphaned/Web/API/RTCIdentityEvent @@ -3244,6 +3245,9 @@ /ja/docs/Web/API/ServiceWorker_API/Using_Service_Workers /ja/docs/Web/API/Service_Worker_API/Using_Service_Workers /ja/docs/Web/API/Slotable /ja/docs/Web/API/Element /ja/docs/Web/API/SourceBufferList/SourceBuffer /ja/docs/orphaned/Web/API/SourceBufferList/SourceBuffer +/ja/docs/Web/API/StorageEstimate /ja/docs/conflicting/Web/API/StorageManager/estimate +/ja/docs/Web/API/StorageEstimate/quota /ja/docs/conflicting/Web/API/StorageManager/estimate_78aa4ffd4dfacc8f94d5c05d150d36ac +/ja/docs/Web/API/StorageEstimate/usage /ja/docs/conflicting/Web/API/StorageManager/estimate_9ffeea37c30a26922d3f1621912db8d8 /ja/docs/Web/API/TouchList.length /ja/docs/Web/API/TouchList/length /ja/docs/Web/API/UserProximityEvent.near /ja/docs/Web/API/UserProximityEvent /ja/docs/Web/API/UserProximityEvent/near /ja/docs/Web/API/UserProximityEvent diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json index 2c25b4aacb..32bd46d27f 100644 --- a/files/ja/_wikihistory.json +++ b/files/ja/_wikihistory.json @@ -20406,13 +20406,6 @@ "Wind1808" ] }, - "Web/API/PositionOptions": { - "modified": "2019-03-23T22:19:48.329Z", - "contributors": [ - "Uemmra3", - "unarist" - ] - }, "Web/API/ProgressEvent": { "modified": "2019-03-23T22:24:26.847Z", "contributors": [ @@ -22181,27 +22174,6 @@ "yyss" ] }, - "Web/API/StorageEstimate": { - "modified": "2020-10-15T22:20:05.823Z", - "contributors": [ - "Uemmra3", - "Wind1808" - ] - }, - "Web/API/StorageEstimate/quota": { - "modified": "2020-10-15T22:20:08.643Z", - "contributors": [ - "Uemmra3", - "Wind1808" - ] - }, - "Web/API/StorageEstimate/usage": { - "modified": "2020-10-15T22:20:08.494Z", - "contributors": [ - "Uemmra3", - "Wind1808" - ] - }, "Web/API/StorageEvent": { "modified": "2019-10-27T14:31:31.975Z", "contributors": [ @@ -48612,6 +48584,34 @@ "ethertank" ] }, + "conflicting/Web/API/Geolocation/getCurrentPosition": { + "modified": "2019-03-23T22:19:48.329Z", + "contributors": [ + "Uemmra3", + "unarist" + ] + }, + "conflicting/Web/API/StorageManager/estimate": { + "modified": "2020-10-15T22:20:05.823Z", + "contributors": [ + "Uemmra3", + "Wind1808" + ] + }, + "conflicting/Web/API/StorageManager/estimate_78aa4ffd4dfacc8f94d5c05d150d36ac": { + "modified": "2020-10-15T22:20:08.643Z", + "contributors": [ + "Uemmra3", + "Wind1808" + ] + }, + "conflicting/Web/API/StorageManager/estimate_9ffeea37c30a26922d3f1621912db8d8": { + "modified": "2020-10-15T22:20:08.494Z", + "contributors": [ + "Uemmra3", + "Wind1808" + ] + }, "conflicting/Web/API/Window/scroll": { "modified": "2020-10-15T22:32:16.096Z", "contributors": [ diff --git a/files/ja/web/api/positionoptions/index.html b/files/ja/conflicting/web/api/geolocation/getcurrentposition/index.html index b411a84640..d6fa430bb2 100644 --- a/files/ja/web/api/positionoptions/index.html +++ b/files/ja/conflicting/web/api/geolocation/getcurrentposition/index.html @@ -1,6 +1,6 @@ --- title: PositionOptions -slug: Web/API/PositionOptions +slug: conflicting/Web/API/Geolocation/getCurrentPosition tags: - API - Geolocation API @@ -9,6 +9,7 @@ tags: - Reference - Secure context translation_of: Web/API/PositionOptions +original_slug: Web/API/PositionOptions --- <div> <div>{{securecontext_header}}{{APIRef("Geolocation API")}}</div> diff --git a/files/ja/web/api/storageestimate/index.html b/files/ja/conflicting/web/api/storagemanager/estimate/index.html index a21d3e4b6c..aa0c8766b5 100644 --- a/files/ja/web/api/storageestimate/index.html +++ b/files/ja/conflicting/web/api/storagemanager/estimate/index.html @@ -1,6 +1,6 @@ --- title: StorageEstimate -slug: Web/API/StorageEstimate +slug: conflicting/Web/API/StorageManager/estimate tags: - API - Dictionary @@ -13,6 +13,7 @@ tags: - StorageEstimate - Usage translation_of: Web/API/StorageEstimate +original_slug: Web/API/StorageEstimate --- <div>{{securecontext_header}}{{APIRef("Storage")}}</div> diff --git a/files/ja/web/api/storageestimate/quota/index.html b/files/ja/conflicting/web/api/storagemanager/estimate_78aa4ffd4dfacc8f94d5c05d150d36ac/index.html index 8dff3c3883..ec31fd060d 100644 --- a/files/ja/web/api/storageestimate/quota/index.html +++ b/files/ja/conflicting/web/api/storagemanager/estimate_78aa4ffd4dfacc8f94d5c05d150d36ac/index.html @@ -1,6 +1,6 @@ --- title: StorageEstimate.quota -slug: Web/API/StorageEstimate/quota +slug: conflicting/Web/API/StorageManager/estimate_78aa4ffd4dfacc8f94d5c05d150d36ac tags: - API - Property @@ -10,6 +10,7 @@ tags: - Secure context - StorageEstimate translation_of: Web/API/StorageEstimate/quota +original_slug: Web/API/StorageEstimate/quota --- <div>{{securecontext_header}}{{APIRef("Storage")}}</div> diff --git a/files/ja/web/api/storageestimate/usage/index.html b/files/ja/conflicting/web/api/storagemanager/estimate_9ffeea37c30a26922d3f1621912db8d8/index.html index 820de4ba72..32949e391a 100644 --- a/files/ja/web/api/storageestimate/usage/index.html +++ b/files/ja/conflicting/web/api/storagemanager/estimate_9ffeea37c30a26922d3f1621912db8d8/index.html @@ -1,6 +1,6 @@ --- title: StorageEstimate.usage -slug: Web/API/StorageEstimate/usage +slug: conflicting/Web/API/StorageManager/estimate_9ffeea37c30a26922d3f1621912db8d8 tags: - API - Reference @@ -10,6 +10,7 @@ tags: - StorageEstimate - Usage translation_of: Web/API/StorageEstimate/usage +original_slug: Web/API/StorageEstimate/usage --- <div>{{securecontext_header}}{{APIRef("Storage")}}</div> diff --git a/files/ko/_redirects.txt b/files/ko/_redirects.txt index 4a61a4ea44..d6a4be6090 100644 --- a/files/ko/_redirects.txt +++ b/files/ko/_redirects.txt @@ -473,6 +473,7 @@ /ko/docs/Web/API/Notification.permission /ko/docs/Web/API/Notification/permission /ko/docs/Web/API/ParentNode/childElementCount /ko/docs/Web/API/Element/childElementCount /ko/docs/Web/API/Position /ko/docs/Web/API/GeolocationPosition +/ko/docs/Web/API/PositionOptions /ko/docs/conflicting/Web/API/Geolocation/getCurrentPosition /ko/docs/Web/API/RandomSource /ko/docs/Web/API/Crypto/getRandomValues /ko/docs/Web/API/RandomSource/getRandomValues /ko/docs/Web/API/Crypto/getRandomValues /ko/docs/Web/API/Screen.lockOrientation /ko/docs/Web/API/Screen/lockOrientation diff --git a/files/ko/_wikihistory.json b/files/ko/_wikihistory.json index bf71955309..c5aa83f753 100644 --- a/files/ko/_wikihistory.json +++ b/files/ko/_wikihistory.json @@ -6085,13 +6085,6 @@ "JinSeungHo" ] }, - "Web/API/PositionOptions": { - "modified": "2020-10-15T22:02:42.878Z", - "contributors": [ - "alattalatta", - "Saem" - ] - }, "Web/API/Proximity_Events": { "modified": "2019-03-23T23:26:46.443Z", "contributors": [ @@ -17544,6 +17537,13 @@ "Sheppy" ] }, + "conflicting/Web/API/Geolocation/getCurrentPosition": { + "modified": "2020-10-15T22:02:42.878Z", + "contributors": [ + "alattalatta", + "Saem" + ] + }, "conflicting/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL": { "modified": "2019-03-23T22:54:05.275Z", "contributors": [ diff --git a/files/ko/web/api/positionoptions/index.html b/files/ko/conflicting/web/api/geolocation/getcurrentposition/index.html index 6e53dde993..a8436716ad 100644 --- a/files/ko/web/api/positionoptions/index.html +++ b/files/ko/conflicting/web/api/geolocation/getcurrentposition/index.html @@ -1,6 +1,6 @@ --- title: PositionOptions -slug: Web/API/PositionOptions +slug: conflicting/Web/API/Geolocation/getCurrentPosition tags: - API - Geolocation API @@ -9,6 +9,7 @@ tags: - Reference - Secure context translation_of: Web/API/PositionOptions +original_slug: Web/API/PositionOptions --- <div>{{securecontext_header}}{{APIRef("Geolocation API")}}</div> diff --git a/files/pt-br/_redirects.txt b/files/pt-br/_redirects.txt index c9b2b0d8f6..2a5b9802a4 100644 --- a/files/pt-br/_redirects.txt +++ b/files/pt-br/_redirects.txt @@ -526,6 +526,7 @@ /pt-BR/docs/Web/API/Position /pt-BR/docs/Web/API/GeolocationPosition /pt-BR/docs/Web/API/Position/coords /pt-BR/docs/Web/API/GeolocationPosition/coords /pt-BR/docs/Web/API/PositionError /pt-BR/docs/Web/API/GeolocationPositionError +/pt-BR/docs/Web/API/PositionOptions /pt-BR/docs/conflicting/Web/API/Geolocation/getCurrentPosition /pt-BR/docs/Web/API/RandomSource/getRandomValues /pt-BR/docs/Web/API/Crypto/getRandomValues /pt-BR/docs/Web/API/SVGAElement/SVGAlement.target /pt-BR/docs/Web/API/SVGAElement/target /pt-BR/docs/Web/API/Seleção /pt-BR/docs/Web/API/Selection diff --git a/files/pt-br/_wikihistory.json b/files/pt-br/_wikihistory.json index e3285cd673..8e4eeea8d6 100644 --- a/files/pt-br/_wikihistory.json +++ b/files/pt-br/_wikihistory.json @@ -6050,12 +6050,6 @@ "rbertoche" ] }, - "Web/API/PositionOptions": { - "modified": "2019-03-23T22:47:40.708Z", - "contributors": [ - "victorkurauchi" - ] - }, "Web/API/ProcessingInstruction": { "modified": "2019-03-18T21:38:06.302Z", "contributors": [ @@ -16398,6 +16392,12 @@ "teoli" ] }, + "conflicting/Web/API/Geolocation/getCurrentPosition": { + "modified": "2019-03-23T22:47:40.708Z", + "contributors": [ + "victorkurauchi" + ] + }, "conflicting/Web/API/GlobalEventHandlers/onscroll": { "modified": "2019-03-23T23:31:45.467Z", "contributors": [ diff --git a/files/pt-br/web/api/positionoptions/index.html b/files/pt-br/conflicting/web/api/geolocation/getcurrentposition/index.html index 5e7012e976..690d6b8e7e 100644 --- a/files/pt-br/web/api/positionoptions/index.html +++ b/files/pt-br/conflicting/web/api/geolocation/getcurrentposition/index.html @@ -1,7 +1,8 @@ --- title: PositionOptions -slug: Web/API/PositionOptions +slug: conflicting/Web/API/Geolocation/getCurrentPosition translation_of: Web/API/PositionOptions +original_slug: Web/API/PositionOptions --- <div>{{APIRef("Geolocation API")}}</div> diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt index a7c155b7c0..4ad88d5364 100644 --- a/files/ru/_redirects.txt +++ b/files/ru/_redirects.txt @@ -360,6 +360,7 @@ /ru/docs/Web/API/NonDocumentTypeChildNode/previousElementSibling /ru/docs/Web/API/Element/previousElementSibling /ru/docs/Web/API/ParentNode/childElementCount /ru/docs/Web/API/Element/childElementCount /ru/docs/Web/API/PositionError /ru/docs/Web/API/GeolocationPositionError +/ru/docs/Web/API/PositionOptions /ru/docs/conflicting/Web/API/Geolocation/getCurrentPosition /ru/docs/Web/API/RandomSource/getRandomValues /ru/docs/Web/API/Crypto/getRandomValues /ru/docs/Web/API/WebGL_API/Adding_2D_content_to_a_WebGL_context /ru/docs/Web/API/WebGL_API/Tutorial/Adding_2D_content_to_a_WebGL_context /ru/docs/Web/API/WebGL_API/Animating_objects_with_WebGL /ru/docs/Web/API/WebGL_API/Tutorial/Animating_objects_with_WebGL diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json index 23cc021d40..b5f01c9af2 100644 --- a/files/ru/_wikihistory.json +++ b/files/ru/_wikihistory.json @@ -9935,13 +9935,6 @@ "hisbvdis" ] }, - "Web/API/PositionOptions": { - "modified": "2019-03-23T22:21:01.208Z", - "contributors": [ - "Casus", - "devkudasov" - ] - }, "Web/API/Presentation": { "modified": "2019-03-18T21:46:12.982Z", "contributors": [ @@ -24190,6 +24183,13 @@ "AlexAlex" ] }, + "conflicting/Web/API/Geolocation/getCurrentPosition": { + "modified": "2019-03-23T22:21:01.208Z", + "contributors": [ + "Casus", + "devkudasov" + ] + }, "conflicting/Web/API/HTMLMediaElement/abort_event": { "modified": "2019-04-30T14:17:57.211Z", "contributors": [ diff --git a/files/ru/web/api/positionoptions/index.html b/files/ru/conflicting/web/api/geolocation/getcurrentposition/index.html index 7c79b63aa2..17869efcf9 100644 --- a/files/ru/web/api/positionoptions/index.html +++ b/files/ru/conflicting/web/api/geolocation/getcurrentposition/index.html @@ -1,7 +1,8 @@ --- title: PositionOptions -slug: Web/API/PositionOptions +slug: conflicting/Web/API/Geolocation/getCurrentPosition translation_of: Web/API/PositionOptions +original_slug: Web/API/PositionOptions --- <div>{{APIRef("Geolocation API")}}</div> diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt index 77ee25324e..7e1d111a54 100644 --- a/files/zh-cn/_redirects.txt +++ b/files/zh-cn/_redirects.txt @@ -1447,6 +1447,8 @@ /zh-CN/docs/Web/API/Position /zh-CN/docs/Web/API/GeolocationPosition /zh-CN/docs/Web/API/Position/coords /zh-CN/docs/Web/API/GeolocationPosition/coords /zh-CN/docs/Web/API/PositionError /zh-CN/docs/Web/API/GeolocationPositionError +/zh-CN/docs/Web/API/PositionOptions /zh-CN/docs/conflicting/Web/API/Geolocation/getCurrentPosition +/zh-CN/docs/Web/API/PositionOptions/timeout /zh-CN/docs/conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6 /zh-CN/docs/Web/API/RandomSource/getRandomValues /zh-CN/docs/Web/API/Crypto/getRandomValues /zh-CN/docs/Web/API/Response/克隆 /zh-CN/docs/Web/API/Response/clone /zh-CN/docs/Web/API/SVGPathElement/getTotalLength /zh-CN/docs/Web/API/SVGGeometryElement/getTotalLength @@ -1467,6 +1469,7 @@ /zh-CN/docs/Web/API/Selection.isCollapsed /zh-CN/docs/Web/API/Selection/isCollapsed /zh-CN/docs/Web/API/Selection.removeRange /zh-CN/docs/Web/API/Selection/removeRange /zh-CN/docs/Web/API/Selection/从Document中删除 /zh-CN/docs/Web/API/Selection/deleteFromDocument +/zh-CN/docs/Web/API/StorageEstimate /zh-CN/docs/conflicting/Web/API/StorageManager/estimate /zh-CN/docs/Web/API/Streams_API/使用可读文件流 /zh-CN/docs/Web/API/Streams_API/Using_readable_streams /zh-CN/docs/Web/API/Streams_API/概念 /zh-CN/docs/Web/API/Streams_API/Concepts /zh-CN/docs/Web/API/Text.isElementContentWhitespace /zh-CN/docs/Web/API/Text/isElementContentWhitespace diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json index 6c130b2ef9..c6bbd17c16 100644 --- a/files/zh-cn/_wikihistory.json +++ b/files/zh-cn/_wikihistory.json @@ -18744,20 +18744,6 @@ "ldwformat" ] }, - "Web/API/PositionOptions": { - "modified": "2019-03-23T22:19:15.525Z", - "contributors": [ - "paigextl", - "hmzll", - "leolux" - ] - }, - "Web/API/PositionOptions/timeout": { - "modified": "2019-03-23T22:19:18.285Z", - "contributors": [ - "kameii" - ] - }, "Web/API/ProgressEvent": { "modified": "2020-10-15T21:52:17.661Z", "contributors": [ @@ -20225,12 +20211,6 @@ "AlexChao" ] }, - "Web/API/StorageEstimate": { - "modified": "2019-03-18T21:31:04.064Z", - "contributors": [ - "hhxxhg" - ] - }, "Web/API/StorageEvent": { "modified": "2019-05-20T00:34:34.333Z", "contributors": [ @@ -47121,6 +47101,20 @@ "teoli" ] }, + "conflicting/Web/API/Geolocation/getCurrentPosition": { + "modified": "2019-03-23T22:19:15.525Z", + "contributors": [ + "paigextl", + "hmzll", + "leolux" + ] + }, + "conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6": { + "modified": "2019-03-23T22:19:18.285Z", + "contributors": [ + "kameii" + ] + }, "conflicting/Web/API/GlobalEventHandlers/ongotpointercapture": { "modified": "2019-03-18T21:45:48.501Z", "contributors": [ @@ -47259,6 +47253,12 @@ "hibernake" ] }, + "conflicting/Web/API/StorageManager/estimate": { + "modified": "2019-03-18T21:31:04.064Z", + "contributors": [ + "hhxxhg" + ] + }, "conflicting/Web/API/UIEvent/which": { "modified": "2019-03-18T21:11:17.379Z", "contributors": [ diff --git a/files/zh-cn/web/api/positionoptions/index.html b/files/zh-cn/conflicting/web/api/geolocation/getcurrentposition/index.html index 43932e7322..c0b2ecbe3e 100644 --- a/files/zh-cn/web/api/positionoptions/index.html +++ b/files/zh-cn/conflicting/web/api/geolocation/getcurrentposition/index.html @@ -1,6 +1,6 @@ --- title: PositionOptions -slug: Web/API/PositionOptions +slug: conflicting/Web/API/Geolocation/getCurrentPosition tags: - API - Geolocation API @@ -9,6 +9,7 @@ tags: - Reference - TopicStub translation_of: Web/API/PositionOptions +original_slug: Web/API/PositionOptions --- <div>{{APIRef("Geolocation API")}}</div> diff --git a/files/zh-cn/web/api/positionoptions/timeout/index.html b/files/zh-cn/conflicting/web/api/geolocation/getcurrentposition_058087067b28ad25fff974fd59827fb6/index.html index 0362db0249..5711639408 100644 --- a/files/zh-cn/web/api/positionoptions/timeout/index.html +++ b/files/zh-cn/conflicting/web/api/geolocation/getcurrentposition_058087067b28ad25fff974fd59827fb6/index.html @@ -1,9 +1,11 @@ --- title: PositionOptions.timeout -slug: Web/API/PositionOptions/timeout +slug: >- + conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6 tags: - API translation_of: Web/API/PositionOptions/timeout +original_slug: Web/API/PositionOptions/timeout --- <div>{{APIRef("Geolocation API")}}</div> diff --git a/files/zh-cn/web/api/storageestimate/index.html b/files/zh-cn/conflicting/web/api/storagemanager/estimate/index.html index 74e0fa95cc..10a5a7eba5 100644 --- a/files/zh-cn/web/api/storageestimate/index.html +++ b/files/zh-cn/conflicting/web/api/storagemanager/estimate/index.html @@ -1,7 +1,8 @@ --- title: StorageEstimate -slug: Web/API/StorageEstimate +slug: conflicting/Web/API/StorageManager/estimate translation_of: Web/API/StorageEstimate +original_slug: Web/API/StorageEstimate --- <div>{{securecontext_header}}{{APIRef("Storage")}}</div> diff --git a/files/zh-tw/_redirects.txt b/files/zh-tw/_redirects.txt index 15d6d7d893..69b77abb4b 100644 --- a/files/zh-tw/_redirects.txt +++ b/files/zh-tw/_redirects.txt @@ -565,6 +565,10 @@ /zh-TW/docs/Web/API/PositionError /zh-TW/docs/Web/API/GeolocationPositionError /zh-TW/docs/Web/API/PositionError/code /zh-TW/docs/Web/API/GeolocationPositionError/code /zh-TW/docs/Web/API/PositionError/message /zh-TW/docs/Web/API/GeolocationPositionError/message +/zh-TW/docs/Web/API/PositionOptions /zh-TW/docs/conflicting/Web/API/Geolocation/getCurrentPosition_5852407122355d2ab39863042583c266 +/zh-TW/docs/Web/API/PositionOptions/enableHighAccuracy /zh-TW/docs/conflicting/Web/API/Geolocation/getCurrentPosition +/zh-TW/docs/Web/API/PositionOptions/maximumAge /zh-TW/docs/conflicting/Web/API/Geolocation/getCurrentPosition_c2c285f72be001586cb95d7989ba1b54 +/zh-TW/docs/Web/API/PositionOptions/timeout /zh-TW/docs/conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6 /zh-TW/docs/Web/API/WebGL_API/Tutorial/WebGL入門 /zh-TW/docs/Web/API/WebGL_API/Tutorial/Getting_started_with_WebGL /zh-TW/docs/Web/API/Web_Video_Text_Tracks_Format /zh-TW/docs/Web/API/WebVTT_API /zh-TW/docs/Web/API/Window.history /zh-TW/docs/Web/API/Window/history diff --git a/files/zh-tw/_wikihistory.json b/files/zh-tw/_wikihistory.json index 1185efe0ba..3b23303592 100644 --- a/files/zh-tw/_wikihistory.json +++ b/files/zh-tw/_wikihistory.json @@ -4325,34 +4325,6 @@ "MashKao" ] }, - "Web/API/PositionOptions": { - "modified": "2019-03-23T22:36:10.505Z", - "contributors": [ - "alphan_chen", - "yachiehwu" - ] - }, - "Web/API/PositionOptions/enableHighAccuracy": { - "modified": "2019-03-23T22:36:14.585Z", - "contributors": [ - "alphan_chen", - "yachiehwu" - ] - }, - "Web/API/PositionOptions/maximumAge": { - "modified": "2019-03-23T22:36:18.389Z", - "contributors": [ - "alphan_chen", - "yachiehwu" - ] - }, - "Web/API/PositionOptions/timeout": { - "modified": "2019-03-23T22:36:20.985Z", - "contributors": [ - "alphan_chen", - "yachiehwu" - ] - }, "Web/API/ProgressEvent": { "modified": "2019-03-23T22:23:49.095Z", "contributors": [ @@ -8041,6 +8013,34 @@ "jackblackevo" ] }, + "conflicting/Web/API/Geolocation/getCurrentPosition": { + "modified": "2019-03-23T22:36:14.585Z", + "contributors": [ + "alphan_chen", + "yachiehwu" + ] + }, + "conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6": { + "modified": "2019-03-23T22:36:20.985Z", + "contributors": [ + "alphan_chen", + "yachiehwu" + ] + }, + "conflicting/Web/API/Geolocation/getCurrentPosition_5852407122355d2ab39863042583c266": { + "modified": "2019-03-23T22:36:10.505Z", + "contributors": [ + "alphan_chen", + "yachiehwu" + ] + }, + "conflicting/Web/API/Geolocation/getCurrentPosition_c2c285f72be001586cb95d7989ba1b54": { + "modified": "2019-03-23T22:36:18.389Z", + "contributors": [ + "alphan_chen", + "yachiehwu" + ] + }, "conflicting/Web/API/HTML_Drag_and_Drop_API": { "modified": "2019-01-16T13:26:51.358Z", "contributors": [ diff --git a/files/zh-tw/web/api/positionoptions/enablehighaccuracy/index.html b/files/zh-tw/conflicting/web/api/geolocation/getcurrentposition/index.html index 8437f37fe6..41ac18ef05 100644 --- a/files/zh-tw/web/api/positionoptions/enablehighaccuracy/index.html +++ b/files/zh-tw/conflicting/web/api/geolocation/getcurrentposition/index.html @@ -1,7 +1,8 @@ --- title: PositionOptions.enableHighAccuracy -slug: Web/API/PositionOptions/enableHighAccuracy +slug: conflicting/Web/API/Geolocation/getCurrentPosition translation_of: Web/API/PositionOptions/enableHighAccuracy +original_slug: Web/API/PositionOptions/enableHighAccuracy --- <div>{{APIRef("Geolocation API")}}</div> diff --git a/files/zh-tw/web/api/positionoptions/timeout/index.html b/files/zh-tw/conflicting/web/api/geolocation/getcurrentposition_058087067b28ad25fff974fd59827fb6/index.html index f963a28764..59c5619cef 100644 --- a/files/zh-tw/web/api/positionoptions/timeout/index.html +++ b/files/zh-tw/conflicting/web/api/geolocation/getcurrentposition_058087067b28ad25fff974fd59827fb6/index.html @@ -1,7 +1,9 @@ --- title: PositionOptions.timeout -slug: Web/API/PositionOptions/timeout +slug: >- + conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6 translation_of: Web/API/PositionOptions/timeout +original_slug: Web/API/PositionOptions/timeout --- <div>{{APIRef("Geolocation API")}}</div> diff --git a/files/zh-tw/web/api/positionoptions/index.html b/files/zh-tw/conflicting/web/api/geolocation/getcurrentposition_5852407122355d2ab39863042583c266/index.html index fc27485e65..33f1d52aca 100644 --- a/files/zh-tw/web/api/positionoptions/index.html +++ b/files/zh-tw/conflicting/web/api/geolocation/getcurrentposition_5852407122355d2ab39863042583c266/index.html @@ -1,7 +1,9 @@ --- title: PositionOptions -slug: Web/API/PositionOptions +slug: >- + conflicting/Web/API/Geolocation/getCurrentPosition_5852407122355d2ab39863042583c266 translation_of: Web/API/PositionOptions +original_slug: Web/API/PositionOptions --- <div>{{APIRef("Geolocation API")}}</div> diff --git a/files/zh-tw/web/api/positionoptions/maximumage/index.html b/files/zh-tw/conflicting/web/api/geolocation/getcurrentposition_c2c285f72be001586cb95d7989ba1b54/index.html index 2f9d1cf48e..f0d16410bc 100644 --- a/files/zh-tw/web/api/positionoptions/maximumage/index.html +++ b/files/zh-tw/conflicting/web/api/geolocation/getcurrentposition_c2c285f72be001586cb95d7989ba1b54/index.html @@ -1,7 +1,9 @@ --- title: PositionOptions.maximumAge -slug: Web/API/PositionOptions/maximumAge +slug: >- + conflicting/Web/API/Geolocation/getCurrentPosition_c2c285f72be001586cb95d7989ba1b54 translation_of: Web/API/PositionOptions/maximumAge +original_slug: Web/API/PositionOptions/maximumAge --- <div>{{APIRef("Geolocation API")}}</div> |