Handled empty playProps

CreateJS · Jun 8, 2017 · 4b6bc17 · 4b6bc17
1 parent ae744ad
commit 4b6bc17
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/soundjs/Sound.js b/src/soundjs/Sound.js
@@ -1370,7 +1370,7 @@ this.createjs = this.createjs || {};
 		var defaultPlayProps = s._defaultPlayPropsHash[instance.src] || {};
 		if (playProps.interrupt == null) {playProps.interrupt = defaultPlayProps.interrupt || s.defaultInterruptBehavior};
 		if (playProps.delay == null) {playProps.delay = defaultPlayProps.delay || 0;}
-		if (playProps.offset == null) {playProps.offset = instance.getPosition();}
+		if (playProps.offset == null) {playProps.offset = instance.position;}
 		if (playProps.loop == null) {playProps.loop = instance.loop;}
 		if (playProps.volume == null) {playProps.volume = instance.volume;}
 		if (playProps.pan == null) {playProps.pan = instance.pan;}
@@ -1698,8 +1698,8 @@ this.createjs = this.createjs || {};
 			}
 
 			// Audio is a better candidate than the current target, according to playhead
-			if ((interrupt == Sound.INTERRUPT_EARLY && target.getPosition() < replacement.getPosition()) ||
-				(interrupt == Sound.INTERRUPT_LATE && target.getPosition() > replacement.getPosition())) {
+			if ((interrupt == Sound.INTERRUPT_EARLY && target.position < replacement.position) ||
+				(interrupt == Sound.INTERRUPT_LATE && target.position > replacement.position)) {
 					replacement = target;
 			}
 		}

diff --git a/src/soundjs/data/PlayPropsConfig.js b/src/soundjs/data/PlayPropsConfig.js
@@ -153,12 +153,12 @@ this.createjs = this.createjs || {};
 	 * @static
 	 */
 	s.create = function (value) {
-		if (value instanceof s || value instanceof Object) {
+		if (value == null || value instanceof s || value instanceof Object) {
 			var ppc = new createjs.PlayPropsConfig();
 			ppc.set(value);
 			return ppc;
-		} else {
-			throw new Error("Type not recognized.");
+		} else if (value == null) {
+			throw new Error("PlayProps configuration not recognized.");
 		}
 	};
 
@@ -175,7 +175,9 @@ this.createjs = this.createjs || {};
 	 * @return {PlayPropsConfig} Returns the instance the method is called on (useful for chaining calls.)
 	*/
 	p.set = function(props) {
-		for (var n in props) { this[n] = props[n]; }
+		if (props != null) {
+			for (var n in props) { this[n] = props[n]; }
+		}
 		return this;
 	};