From 81d73e881dd6a8fb2012dd4c8b0499a8aa4e5fe1 Mon Sep 17 00:00:00 2001
From: Michael Townsend <michael@doublespeakgames.com>
Date: Wed, 20 Aug 2014 22:28:34 -0400
Subject: [PATCH] webkit fixes

---
 build.xml                       | 18 +++++++++++++++++-
 www/css/main.css                |  4 ++--
 www/js/app/audio/audio.js       | 21 +++++++++++++--------
 www/js/app/graphics/graphics.js | 13 +++++++++++++
 4 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index 3150b9d..5cd1b08 100644
--- a/build.xml
+++ b/build.xml
@@ -49,9 +49,25 @@
 		/>
 	</target>
 
-	<target name="publish">
+	<target name="publish-all">
 		<scp keyfile="${publish.key}" todir="${publish.user}@${publish.server}:${publish.path}" trust="true">
 			<fileset dir="${deploy.path}" />
 		</scp>
 	</target>
+
+	<target name="publish-script">
+	<scp keyfile="${publish.key}" todir="${publish.user}@${publish.server}:${publish.path}" trust="true">
+		<fileset dir="${deploy.path}" >
+			<include name="**/*.js" />
+		</fileset>
+	</scp>
+	</target>
+
+	<target name="publish-style">
+	<scp keyfile="${publish.key}" todir="${publish.user}@${publish.server}:${publish.path}" trust="true">
+		<fileset dir="${deploy.path}" >
+			<include name="**/*.css" />
+		</fileset>
+	</scp>
+	</target>
 </project>
diff --git a/www/css/main.css b/www/css/main.css
index 8d08e94..73cc8a9 100644
--- a/www/css/main.css
+++ b/www/css/main.css
@@ -343,7 +343,7 @@ body.night {
 	-ms-transition: background-color 1400ms linear, border-color 1400ms linear, opacity 200ms linear, -ms-transform 200ms linear !important;
 	-o-transition: background-color 1400ms linear, border-color 1400ms linear, opacity 200ms linear, -o-transform 200ms linear !important;
 	transform: translateY(400px);
-	-wwebkit-transform: translateY(400px);
+	-webkit-transform: translateY(400px);
 	-moz-transform: translateY(400px);
 	-ms-transform: translateY(400px);
 	-o-transform: translateY(400px);
@@ -406,7 +406,7 @@ body.night {
 	z-index: 102;
 	border-top: 2px solid;
 	transform: translateY(0px);
-	-wwebkit-transform: translateY(0px);
+	-webkit-transform: translateY(0px);
 	-moz-transform: translateY(0px);
 	-ms-transform: translateY(0px);
 	-o-transform: translateY(0px);
diff --git a/www/js/app/audio/audio.js b/www/js/app/audio/audio.js
index 0f5c3bc..c27d357 100644
--- a/www/js/app/audio/audio.js
+++ b/www/js/app/audio/audio.js
@@ -213,16 +213,21 @@ define(['app/eventmanager', 'app/audio/webaudioprovider', 'app/audio/htmlaudiopr
 		init: function(options) {
 			options = options || {};
 			if(!provider) { 
-				provider = getProvider();
-				format = chooseFormat();
-				if(provider != null && format != null) {
-					toLoad = 0;
-					for(s in sounds) {
-						if(!options.nomusic || !sounds[s].music) {
-							loadSound(sounds[s]);
+				try {
+					provider = getProvider();
+					format = chooseFormat();
+					if(provider != null && format != null) {
+						toLoad = 0;
+						for(s in sounds) {
+							if(!options.nomusic || !sounds[s].music) {
+								loadSound(sounds[s]);
+							}
 						}
+						E.bind('dayBreak', startMusic);
 					}
-					E.bind('dayBreak', startMusic);
+				} catch(e) {
+					console.error('Failed to init audio. Your browser sucks.');
+					return;
 				}
 			} else {
 				crossFade(playingBossMusic ? 'BossMusic' : 'NightMusic', 'DayMusic', 700);
diff --git a/www/js/app/graphics/graphics.js b/www/js/app/graphics/graphics.js
index fabf9cf..aacfff7 100644
--- a/www/js/app/graphics/graphics.js
+++ b/www/js/app/graphics/graphics.js
@@ -15,6 +15,18 @@ define(['jquery', 'app/eventmanager', 'app/textStore', 'app/gameoptions',
 	var currentScale = null;
 	var heartInfo = { total: 0, big: 0 };
 	var imageLoaded = false;
+
+	// I hate that I have to do this.
+	var requestAnimationFrame = (function() {
+		return window.requestAnimationFrame ||
+			window.webkitRequestAnimationFrame ||
+			window.mozRequestAnimationFrame ||
+			window.onRequestAnimationFrame ||
+			window.msRequestAnimationFrame ||
+			function(callback, element) {
+				window.setTimeout(callback, 1000 / 60);
+			};
+		})();
 	
 	var lastTime = null;
 	var animations = {};
@@ -28,6 +40,7 @@ define(['jquery', 'app/eventmanager', 'app/textStore', 'app/gameoptions',
 	 */
 	function doEntityAnimation(timestamp) {
 		requestAnimationFrame(doEntityAnimation);
+		timestamp = timestamp || Date.now();
 		if(!lastTime) {
 			lastTime = timestamp;
 			return;