update components

snazy2000 · Feb 16, 2015 · a7327fa · a7327fa
1 parent 35af46f
commit a7327fa
Show file tree

Hide file tree

Showing 13 changed files with 138 additions and 2,250 deletions.
diff --git a/app/common/scripts/apiclient/ajax.js b/app/common/scripts/apiclient/ajax.js
@@ -8,30 +8,9 @@
 
         ajax: function(request) {
 
-			var deferred = jQuery.Deferred();
-
-			var req = {
-			 method: request.type,
-			 url: request.url,
-			 headers: request.headers,
-			 dataType: request.dataType,
-			 timeout: request.timeout
-			};
-
-			var $http = globalScope.$http;
-
-			$http(req).success(function(data, status, headers, config) {
-
-				deferred.resolveWith(null, [data]);
-
-			}).error(function(data, status, headers, config) {
-
-				deferred.rejectWith(null, []);
-			});
-
-			return deferred.promise();
+            return jQuery.ajax(request);
         }
 
     };
 
-})(this);
+})(window);
diff --git a/app/common/scripts/apiclient/connectionmanager.js b/app/common/scripts/apiclient/connectionmanager.js
@@ -691,21 +691,12 @@
             return (str1 || '').toLowerCase() == (str2 || '').toLowerCase();
         }
 
-        function onFailedConnection(deferred) {
-
-            var result = {
-                State: MediaBrowser.ConnectionState.Unavailable,
-                ConnectUser: connectUser
-            };
-
-            deferred.resolveWith(null, [result]);
-        }
-
         function testNextConnectionMode(tests, index, isLocalNetworkAvailable, server, wakeOnLanSendTime, options, deferred) {
 
             if (index >= tests.length) {
 
-                onFailedConnection(deferred);
+                logger.log('Tested all connection modes. Failing server connection.');
+                resolveWithFailure(deferred);
                 return;
             }
 
@@ -741,11 +732,14 @@
 
             tryConnect(address, timeout).done(function (result) {
 
+				logger.log('calling onSuccessfulConnection with connection mode ' + mode + ' with server ' + server.Name);
                 onSuccessfulConnection(server, result, mode, options, deferred);
 
             }).fail(function () {
 
-                if (enableRetry) {
+                logger.log('test failed for connection mode ' + mode + ' with server ' + server.Name);
+
+				if (enableRetry) {
 
                     var sleepTime = 10000 - (new Date().getTime() - wakeOnLanSendTime);
 
@@ -754,9 +748,9 @@
                     testNextConnectionMode(tests, index + 1, isLocalNetworkAvailable, server, wakeOnLanSendTime, options, deferred);
 
                 } else {
+                    testNextConnectionMode(tests, index + 1, isLocalNetworkAvailable, server, wakeOnLanSendTime, options, deferred);
 
                 }
-                testNextConnectionMode(tests, index + 1, isLocalNetworkAvailable, server, wakeOnLanSendTime, options, deferred);
             });
         }
 
@@ -861,9 +855,6 @@
 
                     deferred.resolveWith(null, [result]);
 
-                }).fail(function () {
-
-                    resolveWithFailure(deferred);
                 });
 
             }).fail(function () {

diff --git a/app/common/scripts/apiclient/deferred.js b/app/common/scripts/apiclient/deferred.js
@@ -0,0 +1,16 @@
+(function (globalScope) {
+
+    globalScope.DeferredBuilder = {
+
+        Deferred: function () {
+            return jQuery.Deferred();
+        },
+
+        when: function (promises) {
+
+            return jQuery.when(promises);
+        }
+
+    };
+
+})(window);