Changeset 8359

Timestamp:

May 8, 2009, 3:02:22 PM (14 years ago)

Author:

charles

Message:

part two of r8358. patch by kjg

File:

• trunk/web/javascript/transmission.remote.js (modified) (3 diffs)

trunk/web/javascript/transmission.remote.js

@@ -36 +36 @@
                 this._controller = controller;
                 this._error = '';
+                this._token = '';
         },
 
         /*
          * Display an error if an ajax request fails, and stop sending requests
+         * or on a 409, globally set the X-Transmission-Session-Id and resend
          */
-        ajaxError: function(request, error_string, exception) {
+        ajaxError: function(request, error_string, exception, ajaxObject) {
                 remote = this;
+
+                // set the Transmission-Session-Id on a 409
+                if(request.status == 409 && (token = request.getResponseHeader('X-Transmission-Session-Id'))){
+                        remote._token = token;
+                        $.ajax(ajaxObject);
+                        return;
+                }
+
                 remote._error = request.responseText
                                         ? request.responseText.trim().replace(/(<([^>]+)>)/ig,"")
@@ -57 +67 @@
                 remote._controller.togglePeriodicRefresh(false);
         },
-        
+
+        appendSessionId: function(XHR) {
+                XHR.setRequestHeader('X-Transmission-Session-Id', this._token);
+        },
+
         sendRequest: function( data, success ) {
                 remote = this;
@@ -67 +81 @@
                         cache: false,
                         data: $.toJSON(data),
-                        error: function(request, error_string, exception){ remote.ajaxError(request, error_string, exception) },
+                        beforeSend: function(XHR){ remote.appendSessionId(XHR) },
+                        error: function(request, error_string, exception){ remote.ajaxError(request, error_string, exception, this) },
                         success: success
                 } );