From d2998cd0e8c467b1e38404d11177ccd2381b8557 Mon Sep 17 00:00:00 2001 From: azu Date: Mon, 9 Jun 2014 12:41:55 +0900 Subject: [PATCH] =?UTF-8?q?fix(deferred-promise):=20=E7=94=BB=E5=83=8F?= =?UTF-8?q?=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=A6=E3=81=AA?= =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 　 fixes #92 --- Ch4_AdvancedPromises/deferred-promise.adoc | 2 +- ...eferred-promise.png => deferred-and-promise.png} | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename Ch4_AdvancedPromises/img/{Deferred-promise.png => deferred-and-promise.png} (100%) diff --git a/Ch4_AdvancedPromises/deferred-promise.adoc b/Ch4_AdvancedPromises/deferred-promise.adoc index 4f2299473..e7e1055bc 100644 --- a/Ch4_AdvancedPromises/deferred-promise.adoc +++ b/Ch4_AdvancedPromises/deferred-promise.adoc @@ -20,7 +20,7 @@ DeferredとPromiseの関係を簡単に書くと以下のようになります - Deferred は Promiseの状態を操作する特権的なメソッドを持っている .DeferredとPromise -image::img/deferred-promise.png[DeferredとPromise] +image::img/deferred-and-promise.png[DeferredとPromise] この関係を見れば分かると思いますが、DeferredとPromiseは比べるような関係ではなく、 DeferredがPromiseの上に成り立っていて、DeferredがPromiseを操作するメソッドを持っています。 diff --git a/Ch4_AdvancedPromises/img/Deferred-promise.png b/Ch4_AdvancedPromises/img/deferred-and-promise.png similarity index 100% rename from Ch4_AdvancedPromises/img/Deferred-promise.png rename to Ch4_AdvancedPromises/img/deferred-and-promise.png