Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2448

o2web/source/x_component_Common/Main.js

@@ -268,9 +268,12 @@ MWF.xApplication.Common.Main = new Class({
 		window.addEventListener("beforeunload", function (e) {
 			this.fireAppEvent("queryClose");
 		}.bind(this));
-		// window.addEventListener("pagehide", function (e) {
-		// 	this.fireAppEvent("queryClose");
-		// }.bind(this));
+
+		if(layout.mobile){
+			window.addEventListener("pagehide", function (e) {
+				this.fireAppEvent("queryClose");
+			}.bind(this));
+		}
 
 		// window.onbeforeunload = function(e){
 		//     this.fireAppEvent("queryClose");

o2web/source/x_desktop/smapsso.html

@@ -25,6 +25,10 @@
                     }
                     var redirect = uri.getData("redirect");
                     redirect = redirect + "&uniqueId=" + uniqueId + "&flushPortalUrl="+flushPortalUrl;
+
+                    var nav = uri.getData("nav");
+                    if(nav)redirect = redirect + "&nav=" + nav;
+
                     if (xtoken){
                         var res = new Request.JSON({
                             url: o2.filterUrl(address+"?SMAP_SESSION_DATA="+encodeURIComponent(xtoken)+"&appID="+appID+"&date="+(new Date()).getTime()),