gCubeSystem
/
d4science-responsive-theme
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated 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/d4science-responsive-theme@141824 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2017-01-26 15:45:55 +00:00
parent 3436bff364
commit 83ff8b44fd
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -11,7 +11,7 @@
<artifactId>d4science-responsive-theme</artifactId>
<packaging>war</packaging>
<name>d4science-responsive-theme Theme</name>
<version>6.3.1-SNAPSHOT</version>
<version>6.3.2-SNAPSHOT</version>
<build>
<plugins>
<plugin>

2
src/main/webapp/WEB-INF/liferay-plugin-package.properties
View File

@ -1,6 +1,6 @@
name=d4science-responsive-theme
module-group-id=liferay
module-incremental-version=5
module-incremental-version=6
tags=
short-description=
change-log=

42
src/main/webapp/js/gcube-context.js
View File

@ -17,31 +17,31 @@ function injectClientContext() {
groupId = Liferay.ThemeDisplay.getScopeGroupId();
//console.log('Not logged in, injecting groupId only');
}
XMLHttpRequest.prototype.realSend = XMLHttpRequest.prototype.send;
var newSend = function(vData) {
this.setRequestHeader("gcube-userId", userId);
this.setRequestHeader("gcube-vreid", groupId);
this.setRequestHeader("gcube-request-url", location.href);
this.realSend(vData);
};
XMLHttpRequest.prototype.send = newSend;
//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>");
};
}
});
});