Cookie Management, Z-Index string for migrate warning

#16
GedMarc · Jun 18, 2020 · 8b43559 · 8b43559
1 parent 842b9bf
commit 8b43559
Show file tree

Hide file tree

Showing 8 changed files with 916 additions and 1,193 deletions.
diff --git a/demos/js/jquery-3.5.0.min.min.js b/demos/js/jquery-3.5.0.min.min.js
diff --git a/demos/js/jquery.layout.state.js b/demos/js/jquery.layout.state.js
diff --git a/demos/js/jquery.layout_and_plugins.js b/demos/js/jquery.layout_and_plugins.js
diff --git a/demos/js/jquery.layout_and_plugins.min.js b/demos/js/jquery.layout_and_plugins.min.js
diff --git a/demos/js/jquery.layout_and_plugins.min.min.js b/demos/js/jquery.layout_and_plugins.min.min.js
diff --git a/demos/saved_state.html b/demos/saved_state.html
@@ -4,7 +4,7 @@
 
 	<title>Save Layout State Demo</title>
 
-	<link type="text/css" rel="stylesheet" href="/lib/css/layout-default-latest.css" />
+	<link type="text/css" rel="stylesheet" href="../dist/layout-default.css" />
 
 	<style type="text/css">
 	p.button {
@@ -24,8 +24,7 @@
 	<script type="text/javascript" src="js/jquery-3.5.1.js"></script><script type="text/javascript" src="js/jquery-migrate.js"></script>
 	<script type="text/javascript" src="js/jquery-ui.js"></script>
 	<script type="text/javascript" src="js/debug.js"></script>
-	<script type="text/javascript" src="../source/stable/jquery.layout.js"></script>
-	<script type="text/javascript" src="../source/stable/plugins/jquery.layout.state.js"></script>
+	<script type="text/javascript" src="js/jquery.layout_and_plugins.min.js"></script>
 
 	<script type="text/javascript">
 
@@ -91,6 +90,11 @@
 		,	onload:						customLoadState // run custom state-code when Layout loads
 		,	onunload:					customSaveState // ditto when page unloads OR Layout is 'destroyed'
 		*/
+
+            ,stateManagement: {
+                enabled:	true
+                ,	cookie:{ secure:true}
+            }
 		});
 		//debugData( myLayout.options.stateManagement, 'options.stateManagement' );
 		//debugData( myLayout.options.west.fxSpeed, 'options.west.fxSpeed' );

diff --git a/dist/jquery.layout_and_plugins.js b/dist/jquery.layout_and_plugins.js
diff --git a/dist/plugins/jquery.layout.state.js b/dist/plugins/jquery.layout.state.js
@@ -93,10 +93,11 @@ $.ui.cookie = {
 				clear = true;
 			}
 		}
-		if (date)		params += ';expires='+ date.toUTCString();
-		if (o.path)		params += ';path='+ o.path;
-		if (o.domain)	params += ';domain='+ o.domain;
-		if (o.secure)	params += ';secure';
+		if (date)		params += '; expires='+ date.toUTCString();
+		if (o.path)		params += '; path='+ o.path;
+		if (o.domain)	params += '; domain='+ o.domain;
+		if (o.secure)	params += '; Secure; SameSite=' + o.sameSite;
+        if (o.httpOnly)	params += '; HttpOnly';
 		document.cookie = name +'='+ (clear ? "" : encodeURIComponent( val )) + params; // write or clear cookie
 	}
 
@@ -125,6 +126,9 @@ $.layout.defaults.stateManagement = {
 	,	path:	""	// blank = current page, '/' = entire website
 	,	expires: ""	// 'days' to keep cookie - leave blank for 'session cookie'
 	,	secure:	false
+    ,   sameSite: "Strict" //Default to strict but allow override to non
+	,   httpOnly: false //careful, JS - for now - does need to access the cookie
+	,   hostOnly: true
 	}
 };
 // Set stateManagement as a layout-option, NOT a pane-option
@@ -281,10 +285,10 @@ $.layout.state = {
 	 *	Convert stringified JSON back to a hash object
 	 *	@see		$.parseJSON(), adding in jQuery 1.4.1
 	 */
-,	decodeJSON: function (str) {
-		try { return $.parseJSON ? $.parseJSON(str) : window["eval"]("("+ str +")") || {}; }
-		catch (e) { return {}; }
-	}
+	 ,	decodeJSON: function (str) {
+        try { return JSON ? JSON.parse(str) : window["eval"]("("+ str +")") || {}; }
+        catch (e) { return {}; }
+    }
 
 
 ,	_create: function (inst) {