Browse Source

[ts][player] Closes #1238, disable pause/play when controls are hidden via options.

badlogic 6 years ago
parent
commit
1cf8a72e30

+ 2 - 0
spine-ts/build/spine-all.js

@@ -10820,6 +10820,8 @@ var spine;
 						target = null;
 					}
 					else {
+						if (!_this.config.showControls)
+							return;
 						if (_this.paused)
 							_this.play();
 						else

File diff suppressed because it is too large
+ 0 - 0
spine-ts/build/spine-all.js.map


+ 2 - 0
spine-ts/build/spine-player.js

@@ -10157,6 +10157,8 @@ var spine;
 						target = null;
 					}
 					else {
+						if (!_this.config.showControls)
+							return;
 						if (_this.paused)
 							_this.play();
 						else

File diff suppressed because it is too large
+ 0 - 0
spine-ts/build/spine-player.js.map


+ 2 - 1
spine-ts/player/example/index.html

@@ -29,7 +29,8 @@ body {
 		backgroundColor: "#cccccc",
 		viewport: {
 			debugRender: true,
-		}
+		},
+		showControls: false,
 	});
 
 	/*// Creates a new spine player with a transparent background,

+ 17 - 16
spine-ts/player/src/Player.ts

@@ -989,6 +989,7 @@
 					if (target) {
 						target = null;
 					} else {
+						if (!this.config.showControls) return;
 						if (this.paused)
 							this.play()
 						else
@@ -1048,22 +1049,22 @@
 			let handleHover = (mouseX: number, mouseY: number) => {
 				if (!this.config.showControls) return;
 
-					let popup = findWithClass(this.dom, "spine-player-popup");
-					mouseOverControls = overlap(mouseX, mouseY, this.playerControls.getBoundingClientRect());
-					mouseOverCanvas = overlap(mouseX, mouseY, this.canvas.getBoundingClientRect());
-					clearTimeout(this.cancelId);
-					let hide = popup.length == 0 && !mouseOverControls && !mouseOverCanvas && !this.paused;
-					if (hide) {
-						this.playerControls.classList.add("spine-player-controls-hidden");
-					} else {
-						this.playerControls.classList.remove("spine-player-controls-hidden");
-					}
-					if (!mouseOverControls && popup.length == 0 && !this.paused) {
-						let remove = () => {
-							if (!this.paused) this.playerControls.classList.add("spine-player-controls-hidden");
-						};
-						this.cancelId = setTimeout(remove, 1000);
-					}
+				let popup = findWithClass(this.dom, "spine-player-popup");
+				mouseOverControls = overlap(mouseX, mouseY, this.playerControls.getBoundingClientRect());
+				mouseOverCanvas = overlap(mouseX, mouseY, this.canvas.getBoundingClientRect());
+				clearTimeout(this.cancelId);
+				let hide = popup.length == 0 && !mouseOverControls && !mouseOverCanvas && !this.paused;
+				if (hide) {
+					this.playerControls.classList.add("spine-player-controls-hidden");
+				} else {
+					this.playerControls.classList.remove("spine-player-controls-hidden");
+				}
+				if (!mouseOverControls && popup.length == 0 && !this.paused) {
+					let remove = () => {
+						if (!this.paused) this.playerControls.classList.add("spine-player-controls-hidden");
+					};
+					this.cancelId = setTimeout(remove, 1000);
+				}
 			}
 
 			let overlap = (mouseX: number, mouseY: number, rect: DOMRect | ClientRect): boolean => {

Some files were not shown because too many files changed in this diff