X-Git-Url: http://git.tine20.org/?p=tine20;a=blobdiff_plain;f=tine20%2FTinebase%2Fjs%2FtineInit.js;h=6a8d4e912bd0da1420a435809f68b1cb257dbcbe;hp=4a60a5a2f87a0deca42ba1ca0ac5dbb2ed4530a5;hb=b4d46cb4f1964bfbf0a88b68a2f33e4ee9a33ccd;hpb=1a7b1e05578a9e820bf1f5c300bae276d4de2cc0 diff --git a/tine20/Tinebase/js/tineInit.js b/tine20/Tinebase/js/tineInit.js index 4a60a5a..6a8d4e9 100644 --- a/tine20/Tinebase/js/tineInit.js +++ b/tine20/Tinebase/js/tineInit.js @@ -84,6 +84,11 @@ Tine.Tinebase.tineInit = { stateful: true, /** + * @cfg {String} jsonKeyCookieId + */ + jsonKeyCookieId: 'TINE20JSONKEY', + + /** * @cfg {String} requestUrl */ requestUrl: 'index.php', @@ -356,9 +361,9 @@ Tine.Tinebase.tineInit = { Ext.Ajax.on('beforerequest', function (connection, options) { var jsonKey = Tine.Tinebase.registry && Tine.Tinebase.registry.get ? Tine.Tinebase.registry.get('jsonKey') : ''; - if (Tine.Tinebase.tineInit.jsonKeyCookieProvider.get('TINE20JSONKEY')) { - var cookieJsonKey = Tine.Tinebase.tineInit.jsonKeyCookieProvider.get('TINE20JSONKEY'); - Tine.Tinebase.tineInit.jsonKeyCookieProvider.clear('TINE20JSONKEY'); + if (Tine.Tinebase.tineInit.jsonKeyCookieProvider.get(this.jsonKeyCookieId)) { + var cookieJsonKey = Tine.Tinebase.tineInit.jsonKeyCookieProvider.get(this.jsonKeyCookieId); + Tine.Tinebase.tineInit.jsonKeyCookieProvider.clear(this.jsonKeyCookieId); // NOTE cookie reset is not always working in IE, so we need to check jsonKey again if (cookieJsonKey && cookieJsonKey != "null") { jsonKey = cookieJsonKey; @@ -417,6 +422,8 @@ Tine.Tinebase.tineInit = { json: options.jsonData }; }); + + /** * inspect completed responses => staus code == 200