From e34be16237b19087dfd7afcc94af0d3c80c44e4b Mon Sep 17 00:00:00 2001 From: Dennis Wilson Date: Tue, 21 Jul 2015 23:41:10 +0200 Subject: [PATCH] style(core): add simple flow, hoisting, stacktrace infos --- gui/scripts/syncthing/app.js | 38 +++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/gui/scripts/syncthing/app.js b/gui/scripts/syncthing/app.js index bcb12288f..b689000d3 100644 --- a/gui/scripts/syncthing/app.js +++ b/gui/scripts/syncthing/app.js @@ -19,26 +19,32 @@ var guiVersion = null; var deviceId = null; syncthing.config(function ($httpProvider, $translateProvider, LocaleServiceProvider) { - $httpProvider.interceptors.push(function () { + $httpProvider.interceptors.push(function xHeadersResponseInterceptor() { return { - response: function (response) { + response: function onResponse(response) { var headers = response.headers(); + var responseVersion; + var deviceIdShort; // angular template cache sends no headers - if(Object.keys(headers).length > 0) { - var responseVersion = headers['x-syncthing-version']; - if (!guiVersion) { - guiVersion = responseVersion; - } else if (guiVersion != responseVersion) { - document.location.reload(true); - } - if (!deviceId) { - deviceId = headers['x-syncthing-id']; - if (deviceId) { - var deviceIdShort = deviceId.substring(0, 5); - $httpProvider.defaults.xsrfHeaderName = 'X-CSRF-Token-' + deviceIdShort; - $httpProvider.defaults.xsrfCookieName = 'CSRF-Token-' + deviceIdShort; - } + if(Object.keys(headers).length === 0) { + return response; + } + + responseVersion = headers['x-syncthing-version']; + + if (!guiVersion) { + guiVersion = responseVersion; + } else if (guiVersion != responseVersion) { + document.location.reload(true); + } + + if (!deviceId) { + deviceId = headers['x-syncthing-id']; + if (deviceId) { + deviceIdShort = deviceId.substring(0, 5); + $httpProvider.defaults.xsrfHeaderName = 'X-CSRF-Token-' + deviceIdShort; + $httpProvider.defaults.xsrfCookieName = 'CSRF-Token-' + deviceIdShort; } }