Merge branch 'refs/heads/develop' into redesign

couchpotato/static/scripts/couchpotato.js

@@ -54,7 +54,7 @@
 	},
 
 	pushState: function(e){
-		if((!e.meta && Browser.Platform.mac) || (!e.control && !Browser.Platform.mac)){
+		if((!e.meta && Browser.platform.mac) || (!e.control && !Browser.platform.mac)){
 			(e).preventDefault();
 			var url = e.target.get('href');
 			if(History.getPath() != url)
@@ -63,7 +63,7 @@
 	},
 
 	isMac: function(){
-		return Browser.Platform.mac
+		return Browser.platform.mac
 	},
 
 	createLayout: function(){
@@ -272,11 +272,18 @@
 
 		(function(){
 
-			Api.request('app.available', {
-				'onFailure': function(){
-					self.checkAvailable.delay(1000, self, [delay, onAvailable]);
-					self.fireEvent('unload');
+			var onFailure = function(){
+				self.checkAvailable.delay(1000, self, [delay, onAvailable]);
+				self.fireEvent('unload');
+			}
+
+			var request = Api.request('app.available', {
+				'timeout': 2000,
+				'onTimeout': function(){
+					request.cancel();
+					onFailure();
 				},
+				'onFailure': onFailure,
 				'onSuccess': function(){
 					if(onAvailable)
 						onAvailable();
@@ -322,7 +329,7 @@
 
 		var url = 'http://www.dereferer.org/?' + el.get('href');
 
-		if(el.get('target') == '_blank' || (e.meta && Browser.Platform.mac) || (e.control && !Browser.Platform.mac))
+		if(el.get('target') == '_blank' || (e.meta && Browser.platform.mac) || (e.control && !Browser.platform.mac))
 			window.open(url);
 		else
 			window.location = url;