From 1040db97cbeb9e97627f5bb7630145ef9d935c23 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Tue, 18 Apr 2017 13:30:25 -0400
Subject: [PATCH] implement bind:duration and bind:paused

---
 .../dom/visitors/Element/Binding.js           | 73 ++++++++++---------
 src/validate/html/validateElement.js          |  2 +-
 .../_config.js                                | 24 ++++++
 .../main.html                                 |  1 +
 .../binding-audio-currenttime/_config.js      | 16 ----
 .../binding-audio-currenttime/main.html       |  1 -
 6 files changed, 66 insertions(+), 51 deletions(-)
 create mode 100644 test/runtime/samples/binding-audio-currenttime-duration/_config.js
 create mode 100644 test/runtime/samples/binding-audio-currenttime-duration/main.html
 delete mode 100644 test/runtime/samples/binding-audio-currenttime/_config.js
 delete mode 100644 test/runtime/samples/binding-audio-currenttime/main.html

diff --git a/src/generators/dom/visitors/Element/Binding.js b/src/generators/dom/visitors/Element/Binding.js
index 2cc461bcd5..0850731907 100644
--- a/src/generators/dom/visitors/Element/Binding.js
+++ b/src/generators/dom/visitors/Element/Binding.js
@@ -13,16 +13,17 @@ export default function visitBinding ( generator, block, state, node, attribute
 		if ( !~state.allUsedContexts.indexOf( context ) ) state.allUsedContexts.push( context );
 	});
 
-	const handler = block.getUniqueName( `${state.parentNode}_change_handler` );
-
+	const eventName = getBindingEventName( node, attribute );
+	const handler = block.getUniqueName( `${state.parentNode}_${eventName}_handler` );
 	const isMultipleSelect = node.name === 'select' && node.attributes.find( attr => attr.name.toLowerCase() === 'multiple' ); // TODO use getStaticAttributeValue
 	const type = getStaticAttributeValue( node, 'type' );
 	const bindingGroup = attribute.name === 'group' ? getBindingGroup( generator, keypath ) : null;
 	const value = getBindingValue( generator, block, state, node, attribute, isMultipleSelect, bindingGroup, type );
-	const eventName = getBindingEventName( node, attribute );
 
 	let setter = getSetter({ block, name, keypath, context: '_svelte', attribute, dependencies, value });
-	let updateElement;
+	let updateElement = `${state.parentNode}.${attribute.name} = ${snippet};`;
+	const lock = block.getUniqueName( `${state.parentNode}_${attribute.name}_updating` );
+	let updateCondition = `!${lock}`;
 
 	// <select> special case
 	if ( node.name === 'select' ) {
@@ -77,33 +78,35 @@ export default function visitBinding ( generator, block, state, node, attribute
 		updateElement = `${state.parentNode}.checked = ${condition};`;
 	}
 
-	// <audio bind:currentTime> special case
-	else if ( attribute.name === 'currentTime' ) {
+	else if ( node.name === 'audio' || node.name === 'video' ) {
 		generator.hasComplexBindings = true;
 		block.builders.create.addBlock( `${block.component}._bindings.push( ${handler} );` );
 
-		setter = deindent`
-			if ( ${state.parentNode}.playing ) requestAnimationFrame( ${handler} );
-			${setter}
-		`;
+		if ( attribute.name === 'currentTime' ) {
+			setter = deindent`
+				if ( !${state.parentNode}.paused ) requestAnimationFrame( ${handler} );
+				${setter}
+			`;
 
-		updateElement = `${state.parentNode}.currentTime = ${snippet};`;
-	}
+			updateCondition += ` && !isNaN( ${snippet} )`;
+		}
 
-	// everything else
-	else {
-		updateElement = `${state.parentNode}.${attribute.name} = ${snippet};`;
-	}
+		else if ( attribute.name === 'duration' ) {
+			updateCondition = null;
+		}
 
-	const updating = block.getUniqueName( `${state.parentNode}_updating` );
+		else if ( attribute.name === 'paused' ) {
+			updateElement = `${state.parentNode}[ ${snippet} ? 'pause' : 'play' ]()`;
+		}
+	}
 
 	block.builders.create.addBlock( deindent`
-		var ${updating} = false;
+		var ${lock} = false;
 
 		function ${handler} () {
-			${updating} = true;
+			${lock} = true;
 			${setter}
-			${updating} = false;
+			${lock} = false;
 		}
 
 		${generator.helper( 'addEventListener' )}( ${state.parentNode}, '${eventName}', ${handler} );
@@ -111,15 +114,23 @@ export default function visitBinding ( generator, block, state, node, attribute
 
 	if ( node.name !== 'audio' && node.name !== 'video' ) node.initialUpdate = updateElement;
 
-	block.builders.update.addLine( deindent`
-		if ( !${updating} ) {
-			${updateElement}
-		}
-	` );
+	if ( updateCondition !== null ) {
+		// audio/video duration is read-only, it never updates
+		block.builders.update.addBlock( deindent`
+			if ( ${updateCondition} ) {
+				${updateElement}
+			}
+		` );
+	}
 
 	block.builders.destroy.addLine( deindent`
 		${generator.helper( 'removeEventListener' )}( ${state.parentNode}, '${eventName}', ${handler} );
 	` );
+
+	if ( attribute.name === 'paused' ) {
+		block.builders.create.addLine( `${generator.helper( 'addEventListener' )}( ${state.parentNode}, 'play', ${handler} );` );
+		block.builders.destroy.addLine( `${generator.helper( 'removeEventListener' )}( ${state.parentNode}, 'play', ${handler} );` );
+	}
 }
 
 function getBindingEventName ( node, attribute ) {
@@ -130,14 +141,10 @@ function getBindingEventName ( node, attribute ) {
 		return type === 'checkbox' || type === 'radio' ? 'change' : 'input';
 	}
 
-	if ( node.name === 'textarea' ) {
-		return 'input';
-	}
-
-	// <audio bind:currentTime>
-	if ( attribute.name === 'currentTime' ) {
-		return 'timeupdate';
-	}
+	if ( node.name === 'textarea' ) return 'input';
+	if ( attribute.name === 'currentTime' ) return 'timeupdate';
+	if ( attribute.name === 'duration' ) return 'durationchange';
+	if ( attribute.name === 'paused' ) return 'pause';
 
 	return 'change';
 }
diff --git a/src/validate/html/validateElement.js b/src/validate/html/validateElement.js
index b3a76181b0..c3405c75a2 100644
--- a/src/validate/html/validateElement.js
+++ b/src/validate/html/validateElement.js
@@ -35,7 +35,7 @@ export default function validateElement ( validator, node ) {
 				}
 			}
 
-			else if ( name === 'currentTime' || name === 'duration' ) {
+			else if ( name === 'currentTime' || name === 'duration' || name === 'paused' ) {
 				if ( node.name !== 'audio' && node.name !== 'video' ) {
 					validator.error( `'${name}' binding can only be used with <audio> or <video>` );
 				}
diff --git a/test/runtime/samples/binding-audio-currenttime-duration/_config.js b/test/runtime/samples/binding-audio-currenttime-duration/_config.js
new file mode 100644
index 0000000000..12b0a312ff
--- /dev/null
+++ b/test/runtime/samples/binding-audio-currenttime-duration/_config.js
@@ -0,0 +1,24 @@
+export default {
+	solo: true,
+
+	test ( assert, component, target, window ) {
+		assert.equal( component.get( 't' ), 0 );
+		assert.equal( component.get( 'd' ), 0 );
+		assert.equal( component.get( 'paused' ), true );
+
+		const audio = target.querySelector( 'audio' );
+		const timeupdate = new window.Event( 'timeupdate' );
+		const durationchange = new window.Event( 'durationchange' );
+
+		audio.currentTime = 10;
+		audio.duration = 20;
+		audio.dispatchEvent( timeupdate );
+		audio.dispatchEvent( durationchange );
+		audio.play();
+
+		assert.equal( component.get( 't' ), 10 );
+		assert.equal( component.get( 'd' ), 0 ); // not 20, because read-only. Not sure how to test this!
+		assert.equal( component.get( 'paused' ), true ); // ditto...
+		component.destroy();
+	}
+};
diff --git a/test/runtime/samples/binding-audio-currenttime-duration/main.html b/test/runtime/samples/binding-audio-currenttime-duration/main.html
new file mode 100644
index 0000000000..dc3aac8afe
--- /dev/null
+++ b/test/runtime/samples/binding-audio-currenttime-duration/main.html
@@ -0,0 +1 @@
+<audio bind:currentTime='t' bind:duration='d' bind:paused src='music.mp3'></audio>
diff --git a/test/runtime/samples/binding-audio-currenttime/_config.js b/test/runtime/samples/binding-audio-currenttime/_config.js
deleted file mode 100644
index 2fb0f6c97c..0000000000
--- a/test/runtime/samples/binding-audio-currenttime/_config.js
+++ /dev/null
@@ -1,16 +0,0 @@
-export default {
-	solo: true,
-
-	test ( assert, component, target, window ) {
-		assert.equal( component.get( 't' ), 0 );
-
-		const audio = target.querySelector( 'audio' );
-		const event = new window.Event( 'timeupdate' );
-
-		audio.currentTime = 10;
-		audio.dispatchEvent( event );
-
-		assert.equal( component.get( 't' ), 10 );
-		component.destroy();
-	}
-};
diff --git a/test/runtime/samples/binding-audio-currenttime/main.html b/test/runtime/samples/binding-audio-currenttime/main.html
deleted file mode 100644
index abf208c5e4..0000000000
--- a/test/runtime/samples/binding-audio-currenttime/main.html
+++ /dev/null
@@ -1 +0,0 @@
-<audio bind:currentTime='t' src='music.mp3'></audio>