fix for window.location.protocol checks (moved err to iframe page)

trilogy-group · Oct 26, 2016 · db81273 · db81273
1 parent 959a6e9
commit db81273
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/dev/xdomain_cookie.dev.js b/dev/xdomain_cookie.dev.js
@@ -19,10 +19,6 @@
 			_secure_only = !!secure_only,							//should cookies be written as HTTPS-only cookies
 			_debug = !!debug;
 
-		if(_secure_only && window.window.location.protocol !== 'https:'){
-			return console.error("xDomainCookie - ERROR, secure_only flag set but page is not loaded over HTTPS:");
-		}	
-
 		function _log(){
 			if(!_debug) return;
 			arguments[0] = ":XDC_PAGE: "+arguments[0];

diff --git a/dev/xdomain_cookie.html b/dev/xdomain_cookie.html
@@ -58,6 +58,10 @@
 	        	if(!('msg_type' in data) || data.msg_type !== 'xdsc_write') return; //data is not a xdomainc-cookie payload
 	        	if(!('namespace' in data) || data.namespace !== _namespace) return; //wrong namespace for msg
 
+	        	if(data.secure_only && window.location.protocol !== 'https:'){
+	        		console.error("xDomainCookie - ERROR, secure_only flag set but page is not loaded over HTTPS:");
+	        	}
+
 	        	var expires_days = parseInt(data.expires_days,10);
 		        _set_local_cookie( data.cookie_name, data.cookie_val, expires_days, data.secure_only );
 		        //ping down to page again to update values of xdomain cookie data

diff --git a/src/xdomain_cookie.html b/src/xdomain_cookie.html
@@ -58,6 +58,10 @@
 	        	if(!('msg_type' in data) || data.msg_type !== 'xdsc_write') return; //data is not a xdomainc-cookie payload
 	        	if(!('namespace' in data) || data.namespace !== _namespace) return; //wrong namespace for msg
 
+	        	if(data.secure_only && window.location.protocol !== 'https:'){
+	        		console.error("xDomainCookie - ERROR, secure_only flag set but page is not loaded over HTTPS:");
+	        	}
+
 	        	var expires_days = parseInt(data.expires_days,10);
 		        _set_local_cookie( data.cookie_name, data.cookie_val, expires_days, data.secure_only );
 		        //ping down to page again to update values of xdomain cookie data

diff --git a/src/xdomain_cookie.js b/src/xdomain_cookie.js
@@ -21,10 +21,6 @@
 			_secure_only = !!secure_only,							//should cookies be written as HTTPS-only cookies
 			_debug = !!debug;
 
-		if(_secure_only && window.window.location.protocol !== 'https:'){
-			return console.error("xDomainCookie - ERROR, secure_only flag set but page is not loaded over HTTPS:");
-		}	
-
 		function _log(){
 			if(!_debug) return;
 			arguments[0] = ":XDC_PAGE: "+arguments[0];

diff --git a/src/xdomain_cookie.min.js b/src/xdomain_cookie.min.js