Fix iOS issue in Maze activity

samswag · Jan 10, 2015 · 20c6b82 · 20c6b82
1 parent a4c7249
commit 20c6b82
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 5 deletions.
diff --git a/activities/MazeWeb.activity/js/activity.js b/activities/MazeWeb.activity/js/activity.js
@@ -9,6 +9,7 @@ define(function (require) {
     require(['domReady!'], function (doc) {
         activity.setup();
 
+		var soundType = /(iPad|iPhone|iPod)/g.test(navigator.userAgent) ? '.mp3' : '.ogg';
         var canvasWidth;
         var canvasHeight;
 
@@ -296,7 +297,7 @@ define(function (require) {
             winner = player;
             levelStatus = 'transition';
 
-            var audio = new Audio('sounds/win.ogg');
+            var audio = new Audio('sounds/win'+soundType);
             audio.play();
 
             for (control in players) {
@@ -431,7 +432,7 @@ define(function (require) {
 
             this.blockTween.start();
 
-            var audio = new Audio('sounds/tick.ogg');
+            var audio = new Audio('sounds/tick'+soundType);
             audio.play();
         }
 

diff --git a/activities/MazeWeb.activity/lib/tween.js b/activities/MazeWeb.activity/lib/tween.js
@@ -12,6 +12,23 @@
  * @author Ben Delarre / http://delarre.net
  */
 
+// HACK: window.performance not supported on iOS
+if (typeof window.performance === 'undefined') {
+	window.performance = {};
+}
+
+if (!window.performance.now){
+	var nowOffset = Date.now();
+
+	if (performance.timing && performance.timing.navigationStart){
+		nowOffset = performance.timing.navigationStart
+	}
+
+	window.performance.now = function now(){
+		return Date.now() - nowOffset;
+	} 
+}
+
 // Date.now shim for (ahem) Internet Explo(d|r)er
 if ( Date.now === undefined ) {
 

diff --git a/activities/MazeWeb.activity/sounds/tick.mp3 b/activities/MazeWeb.activity/sounds/tick.mp3
diff --git a/activities/MazeWeb.activity/sounds/win.mp3 b/activities/MazeWeb.activity/sounds/win.mp3
diff --git a/css/styles.css b/css/styles.css
@@ -652,6 +652,10 @@ input {
 	text-align: center;
 	width: 100%;
 	color: #808080;
+	-webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+	user-select: none;		
 }
 
 .first-owner-icon {

diff --git a/js/firstscreen.js b/js/firstscreen.js
@@ -16,7 +16,7 @@ enyo.kind({
 		{name: "previous", kind: "Sugar.IconButton", icon: {directory: "icons", icon: "go-left.svg"}, classes: "first-leftbutton", ontap: "previous", showing: false},		
 		{name: "next", kind: "Sugar.IconButton", icon: {directory: "icons", icon: "go-right.svg"}, classes: "first-rightbutton", ontap: "next"},		
 		{name: "colortext", content: "xxx", classes: "first-colortext", showing: false},		
-		{name: "owner", kind: "Sugar.Icon", size: constant.sizeOwner, colorized: true, classes: "first-owner-icon", showing: false, onresize: "resize", onclick: "nextcolor"},
+		{name: "owner", kind: "Sugar.Icon", size: constant.sizeOwner, colorized: true, classes: "first-owner-icon", showing: false, onresize: "resize", ontap: "nextcolor"},
 	],
 
 	// Constructor

diff --git a/lib/util.js b/lib/util.js
@@ -219,8 +219,12 @@ define(["webL10n"], function (l10n) {
 		window.close(); 
 		window.open('', '_self', ''); // HACK: Not allowed on all browsers
 		window.close();
-		if (navigator && navigator.app)
-			navigator.app.exitApp();
+		if (navigator) {
+			if (navigator.app)
+				navigator.app.exitApp();
+			else if (navigator.device)
+				navigator.device.exitApp();
+		}
 	 }
 
 	 return util;