From 1203b9e2e8087bb12664c1d980cbc25eaef101ac Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 21 Apr 2020 02:54:53 +0200
Subject: [PATCH] Revert "cancel outro before update"

This reverts commit 486a9baea540563da4aca902cc10e20d16e15be7.
---
 .../compile/render_dom/wrappers/IfBlock.ts    |  2 +-
 .../Component.svelte                          |  1 -
 .../_config.js                                | 10 ------
 .../main.svelte                               | 36 -------------------
 4 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 test/runtime/samples/transition-js-if-else-in-if-outro-cancelled/Component.svelte
 delete mode 100644 test/runtime/samples/transition-js-if-else-in-if-outro-cancelled/_config.js
 delete mode 100644 test/runtime/samples/transition-js-if-else-in-if-outro-cancelled/main.svelte

diff --git a/src/compiler/compile/render_dom/wrappers/IfBlock.ts b/src/compiler/compile/render_dom/wrappers/IfBlock.ts
index d536744bbf..9b3e56635d 100644
--- a/src/compiler/compile/render_dom/wrappers/IfBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/IfBlock.ts
@@ -522,13 +522,13 @@ export default class IfBlockWrapper extends Wrapper {
 
 			const enter = b`
 				if (${name}) {
+					${dynamic && b`${name}.p(#ctx, #dirty);`}
 					${
 						has_transitions &&
 						b`if (${block.renderer.dirty(branch.dependencies)}) {
 							@transition_in(${name}, 1);
 						}`
 					}
-					${dynamic && b`${name}.p(#ctx, #dirty);`}
 				} else {
 					${name} = ${branch.block.name}(#ctx);
 					${name}.c();
diff --git a/test/runtime/samples/transition-js-if-else-in-if-outro-cancelled/Component.svelte b/test/runtime/samples/transition-js-if-else-in-if-outro-cancelled/Component.svelte
deleted file mode 100644
index 8c7e5a667f..0000000000
--- a/test/runtime/samples/transition-js-if-else-in-if-outro-cancelled/Component.svelte
+++ /dev/null
@@ -1 +0,0 @@
-A
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-else-in-if-outro-cancelled/_config.js b/test/runtime/samples/transition-js-if-else-in-if-outro-cancelled/_config.js
deleted file mode 100644
index 78aec696b6..0000000000
--- a/test/runtime/samples/transition-js-if-else-in-if-outro-cancelled/_config.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export default {
-	async test({ assert, target, window, raf }) {
-		const button = target.querySelector("button");
-		const event = new window.MouseEvent("click");
-		assert.htmlEqual(target.innerHTML, "A");
-		await button.dispatchEvent(event);
-		raf.tick(500);
-		assert.htmlEqual(target.innerHTML, "A");
-	},
-};
diff --git a/test/runtime/samples/transition-js-if-else-in-if-outro-cancelled/main.svelte b/test/runtime/samples/transition-js-if-else-in-if-outro-cancelled/main.svelte
deleted file mode 100644
index 982593dd5c..0000000000
--- a/test/runtime/samples/transition-js-if-else-in-if-outro-cancelled/main.svelte
+++ /dev/null
@@ -1,36 +0,0 @@
-<script>
-  import Component from "./Component.svelte";
-  function foo(node, params) {
-    return {
-      duration: 100,
-      tick: t => {
-        node.foo = t;
-      }
-    };
-  }
-  let isFirst = true;
-  let animationActive = false;
-
-  const toggle = () => {
-    if (animationActive) {
-      return;
-    }
-
-    animationActive = true;
-    Promise.resolve().then(() => {
-      isFirst = !isFirst;
-      animationActive = false;
-    });
-  };
-</script>
-
-<button on:click={toggle}>TOGGLE</button>
-{#if !animationActive}
-  <div out:foo>
-    {#if isFirst}
-      <Component {isFirst} />
-    {:else}
-      <Component {isFirst} />
-    {/if}
-  </div>
-{/if}