Commit55f11ae

zhourenjian

committed

Fix bug of SimpleStore on IE: use Cookie directly for IE visitors, other browser users will use XSS Cookie

1 parenta961ea5 commit55f11aeCopy full SHA for 55f11ae

File tree

-6

lines changed

sources/net.sf.j2s.ajax/store/net/sf/j2s/store
- SimpleStore.java
- XSSCookieStore.java

-6

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,9 @@ private SimpleStore() {`
`16`	`16`	`* @j2sNative`
`17`	`17`	`* var ua = navigator.userAgent.toLowerCase ();`
`18`	`18`	`* var isIE = (ua.indexOf ("msie") != -1);`
`19`		`- * var isIE6OrEarlier = isIE && ((ua.indexOf ("msie 6.0") != -1)`
`20`		`- * \|\| (ua.indexOf ("msie 5.5") != -1) \|\| (ua.indexOf ("msie 5.0") != -1));`
`21`	`19`	`* var cookieURL = window["j2s.xss.cookie.url"];`
`22`	`20`	`* var isLocal = window.location.protocol == "file:";`
`23`		`- * if (!isLocal && cookieURL != null && !isIE6OrEarlier) {`
	`21`	`+ * if (!isLocal && cookieURL != null && !isIE) {`
`24`	`22`	`* this.store = new net.sf.j2s.store.XSSCookieStore(cookieURL);`
`25`	`23`	`* } else {`
`26`	`24`	`* this.store = new net.sf.j2s.store.CookieStore();`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,9 @@`
`9`	`9`	`* @j2sSuffix`
`10`	`10`	`* var ua = navigator.userAgent.toLowerCase ();`
`11`	`11`	`* var isIE = (ua.indexOf ("msie") != -1);`
`12`		`- * var isIE6OrEarlier = isIE && ((ua.indexOf ("msie 6.0") != -1)`
`13`		`- * \|\| (ua.indexOf ("msie 5.5") != -1) \|\| (ua.indexOf ("msie 5.0") != -1));`
`14`	`12`	`* var xssCookieURL = window["j2s.xss.cookie.url"];`
`15`	`13`	`* var isLocal = window.location.protocol == "file:";`
`16`		`- * if (!isLocal && xssCookieURL != null && !isIE6OrEarlier) {`
	`14`	`+ * if (!isLocal && xssCookieURL != null && !isIE) {`
`17`	`15`	`* net.sf.j2s.store.XSSCookieStore.initialize(xssCookieURL);`
`18`	`16`	`* }`
`19`	`17`	`*/`

Comments

(0)