From 116f45f0bbe5bbedfc3d4e9ebab36793701fc3fc Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 26 Jan 2017 15:30:10 +0000
Subject: [PATCH] updated css and gcube context's override of the
 XMLHttpRequest's send method to support EDISON case

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/liferay62-plugins/generic-configurable-theme@141821 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 src/main/webapp/js/gcube-context.js | 45 ++++++++++++++---------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/main/webapp/js/gcube-context.js b/src/main/webapp/js/gcube-context.js
index d512e7e..7472746 100644
--- a/src/main/webapp/js/gcube-context.js
+++ b/src/main/webapp/js/gcube-context.js
@@ -17,34 +17,31 @@ function injectClientContext() {
 			groupId = Liferay.ThemeDisplay.getScopeGroupId();
 			//console.log('Not logged in, injecting groupId only');
 		}
-
-		var  send = window.XMLHttpRequest.prototype.send;
-        function sendReplacement(data) {
-                  this.setRequestHeader("gcube-userId", userId);
-                  this.setRequestHeader("gcube-vreid", groupId);
-                  this.setRequestHeader("gcube-request-url", location.href);
-                  if(this.onreadystatechange) {
-                    this._onreadystatechange = this.onreadystatechange;
-                  }
-                  return send.apply(this, arguments);
-        }
-        window.XMLHttpRequest.prototype.send = sendReplacement;
+		//attach the 3 header params in all the XHR sends
+		(function(send) {
+			XMLHttpRequest.prototype.send = function(data) {
+				this.setRequestHeader("gcube-userId", userId);
+				this.setRequestHeader("gcube-vreid", groupId);
+				this.setRequestHeader("gcube-request-url", location.href);
+				send.call(this, data);
+			};
+		})(XMLHttpRequest.prototype.send);
 	}
 }
 /*
  * Override the expire function of the Liferay.Session javascript object. It makes the default behaviour and then open a modal
  * */
 $(function () {    
-	   AUI().use('liferay-session', function(A) {
-	      if(Liferay.Session) {
-	    	 console.log('Liferay session default overridden');
-	         Liferay.Session.expire = function() {
-	             var instance = this;
-	                instance.set('sessionState', 'expired', {});
-	            $("#expirationModal").css("display", "block");
-	            $("#expirationModal").modal({backdrop: 'static', keyboard: false},'show');
-	            $("body div.alert.alert-block.popup-alert-warning.alert-error").html("Due to inactivity your session has expired, please <a class='refresh' href=''>Refresh</a>");
-	         };
-	      }
-	   });
+	AUI().use('liferay-session', function(A) {
+		if(Liferay.Session) {
+			console.log('Liferay session default overridden');
+			Liferay.Session.expire = function() {
+				var instance = this;
+				instance.set('sessionState', 'expired', {});
+				$("#expirationModal").css("display", "block");
+				$("#expirationModal").modal({backdrop: 'static', keyboard: false},'show');
+				$("body div.alert.alert-block.popup-alert-warning.alert-error").html("Due to inactivity your session has expired, please <a class='refresh' href=''>Refresh</a>");
+			};
+		}
 	});
+});