From 733bc08fd33c283c573f4f2b92f8f310e66481c8 Mon Sep 17 00:00:00 2001 From: LycheeEng Date: Sat, 20 Jul 2019 16:52:06 +0800 Subject: [PATCH 1/3] Rename folder --- .../1-do-we-need-origin/solution.md | 0 .../1-do-we-need-origin/task.md | 0 .../article.md | 0 .../cors-gmail-messages.png | Bin .../cors-gmail-messages@2x.png | Bin .../demo.view/index.html | 0 .../demo.view/server.js | 0 .../xhr-another-domain.png | Bin .../xhr-another-domain@2x.png | Bin .../xhr-preflight.png | Bin .../xhr-preflight@2x.png | Bin 11 files changed, 0 insertions(+), 0 deletions(-) rename 5-network/{04-fetch-crossorigin => 05-fetch-crossorigin}/1-do-we-need-origin/solution.md (100%) rename 5-network/{04-fetch-crossorigin => 05-fetch-crossorigin}/1-do-we-need-origin/task.md (100%) rename 5-network/{04-fetch-crossorigin => 05-fetch-crossorigin}/article.md (100%) rename 5-network/{04-fetch-crossorigin => 05-fetch-crossorigin}/cors-gmail-messages.png (100%) rename 5-network/{04-fetch-crossorigin => 05-fetch-crossorigin}/cors-gmail-messages@2x.png (100%) rename 5-network/{04-fetch-crossorigin => 05-fetch-crossorigin}/demo.view/index.html (100%) rename 5-network/{04-fetch-crossorigin => 05-fetch-crossorigin}/demo.view/server.js (100%) rename 5-network/{04-fetch-crossorigin => 05-fetch-crossorigin}/xhr-another-domain.png (100%) rename 5-network/{04-fetch-crossorigin => 05-fetch-crossorigin}/xhr-another-domain@2x.png (100%) rename 5-network/{04-fetch-crossorigin => 05-fetch-crossorigin}/xhr-preflight.png (100%) rename 5-network/{04-fetch-crossorigin => 05-fetch-crossorigin}/xhr-preflight@2x.png (100%) diff --git a/5-network/04-fetch-crossorigin/1-do-we-need-origin/solution.md b/5-network/05-fetch-crossorigin/1-do-we-need-origin/solution.md similarity index 100% rename from 5-network/04-fetch-crossorigin/1-do-we-need-origin/solution.md rename to 5-network/05-fetch-crossorigin/1-do-we-need-origin/solution.md diff --git a/5-network/04-fetch-crossorigin/1-do-we-need-origin/task.md b/5-network/05-fetch-crossorigin/1-do-we-need-origin/task.md similarity index 100% rename from 5-network/04-fetch-crossorigin/1-do-we-need-origin/task.md rename to 5-network/05-fetch-crossorigin/1-do-we-need-origin/task.md diff --git a/5-network/04-fetch-crossorigin/article.md b/5-network/05-fetch-crossorigin/article.md similarity index 100% rename from 5-network/04-fetch-crossorigin/article.md rename to 5-network/05-fetch-crossorigin/article.md diff --git a/5-network/04-fetch-crossorigin/cors-gmail-messages.png b/5-network/05-fetch-crossorigin/cors-gmail-messages.png similarity index 100% rename from 5-network/04-fetch-crossorigin/cors-gmail-messages.png rename to 5-network/05-fetch-crossorigin/cors-gmail-messages.png diff --git a/5-network/04-fetch-crossorigin/cors-gmail-messages@2x.png b/5-network/05-fetch-crossorigin/cors-gmail-messages@2x.png similarity index 100% rename from 5-network/04-fetch-crossorigin/cors-gmail-messages@2x.png rename to 5-network/05-fetch-crossorigin/cors-gmail-messages@2x.png diff --git a/5-network/04-fetch-crossorigin/demo.view/index.html b/5-network/05-fetch-crossorigin/demo.view/index.html similarity index 100% rename from 5-network/04-fetch-crossorigin/demo.view/index.html rename to 5-network/05-fetch-crossorigin/demo.view/index.html diff --git a/5-network/04-fetch-crossorigin/demo.view/server.js b/5-network/05-fetch-crossorigin/demo.view/server.js similarity index 100% rename from 5-network/04-fetch-crossorigin/demo.view/server.js rename to 5-network/05-fetch-crossorigin/demo.view/server.js diff --git a/5-network/04-fetch-crossorigin/xhr-another-domain.png b/5-network/05-fetch-crossorigin/xhr-another-domain.png similarity index 100% rename from 5-network/04-fetch-crossorigin/xhr-another-domain.png rename to 5-network/05-fetch-crossorigin/xhr-another-domain.png diff --git a/5-network/04-fetch-crossorigin/xhr-another-domain@2x.png b/5-network/05-fetch-crossorigin/xhr-another-domain@2x.png similarity index 100% rename from 5-network/04-fetch-crossorigin/xhr-another-domain@2x.png rename to 5-network/05-fetch-crossorigin/xhr-another-domain@2x.png diff --git a/5-network/04-fetch-crossorigin/xhr-preflight.png b/5-network/05-fetch-crossorigin/xhr-preflight.png similarity index 100% rename from 5-network/04-fetch-crossorigin/xhr-preflight.png rename to 5-network/05-fetch-crossorigin/xhr-preflight.png diff --git a/5-network/04-fetch-crossorigin/xhr-preflight@2x.png b/5-network/05-fetch-crossorigin/xhr-preflight@2x.png similarity index 100% rename from 5-network/04-fetch-crossorigin/xhr-preflight@2x.png rename to 5-network/05-fetch-crossorigin/xhr-preflight@2x.png From 2c2194f34d98679aba75cc60693389d1b21814db Mon Sep 17 00:00:00 2001 From: LycheeEng Date: Sat, 20 Jul 2019 17:47:48 +0800 Subject: [PATCH 2/3] Fix changes --- 5-network/05-fetch-crossorigin/article.md | 8 ++++---- .../cors-gmail-messages.png | Bin 38668 -> 38654 bytes .../cors-gmail-messages@2x.png | Bin 90854 -> 90861 bytes 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/5-network/05-fetch-crossorigin/article.md b/5-network/05-fetch-crossorigin/article.md index 506de3f811..33ff2f9407 100644 --- a/5-network/05-fetch-crossorigin/article.md +++ b/5-network/05-fetch-crossorigin/article.md @@ -24,13 +24,13 @@ try { 说真的，在这说点儿题外话，讲讲它的历史。 -**来自一个网站的脚本无法访问其他网站的内容** +**很多年前来自一个网站的脚本无法访问其他网站的内容** 这个简单有力的规则是互联网安全的基础。例如，来自 `hacker.com` 页面的脚本无法访问 `gmail.com` 上的用户邮箱。基于这样的规则，人们感到很安全。 在那时候，JavaScript 只是一种装饰网页的玩具语言而已，它并没有任何特殊的执行网络请求的方法。 -但是网络开发人员需要更多的控制权。人们发明了各种各样的技巧去解决它。 +但是网络开发人员需要更多的控制权。人们发明了各种各样的技巧去突破它的限制。 ### 使用 forms @@ -52,7 +52,7 @@ try { 因此，即使没有网络方法，它也可以向其他网站发起一个 GET/POST 请求。但是由于禁止从其他网页读取 `