summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorDavid Mehren2020-09-25 22:39:30 +0200
committerGitHub2020-09-25 22:39:30 +0200
commit3461993ee05d09106e276e606b143d472908b166 (patch)
treec17c788b6f39f3ae91e249f48cc653b3d13b6c0b /public
parentf862b7a1e44c1101a921f19bca4d8d8063eb25ce (diff)
parent4ece86f0efa1f8f3e4dab0abf810800a045ce632 (diff)
Merge pull request #486 from codimd/feature/cookie-policy
Diffstat (limited to '')
-rw-r--r--public/js/index.js2
-rw-r--r--public/js/lib/common/constant.ejs2
-rw-r--r--public/js/lib/common/login.js4
-rw-r--r--public/js/lib/editor/index.js16
-rw-r--r--public/js/locale.js2
5 files changed, 14 insertions, 12 deletions
diff --git a/public/js/index.js b/public/js/index.js
index 3eaba0ee..9946e6fd 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -1599,7 +1599,7 @@ function toggleNightMode () {
} else {
Cookies.set('nightMode', !isActive, {
expires: 365,
- sameSite: 'strict'
+ sameSite: window.cookiePolicy
})
}
}
diff --git a/public/js/lib/common/constant.ejs b/public/js/lib/common/constant.ejs
index 114a9077..2a32c333 100644
--- a/public/js/lib/common/constant.ejs
+++ b/public/js/lib/common/constant.ejs
@@ -8,3 +8,5 @@ window.allowedUploadMimeTypes = <%- JSON.stringify(allowedUploadMimeTypes) %>
window.linkifyHeaderStyle = '<%- linkifyHeaderStyle %>'
window.DROPBOX_APP_KEY = '<%- DROPBOX_APP_KEY %>'
+
+window.cookiePolicy = '<%- cookiePolicy %>'
diff --git a/public/js/lib/common/login.js b/public/js/lib/common/login.js
index 931c115f..3f7a3e4d 100644
--- a/public/js/lib/common/login.js
+++ b/public/js/lib/common/login.js
@@ -20,12 +20,12 @@ export function resetCheckAuth () {
export function setLoginState (bool, id) {
Cookies.set('loginstate', bool, {
expires: 365,
- sameSite: 'strict'
+ sameSite: window.cookiePolicy
})
if (id) {
Cookies.set('userid', id, {
expires: 365,
- sameSite: 'strict'
+ sameSite: window.cookiePolicy
})
} else {
Cookies.remove('userid')
diff --git a/public/js/lib/editor/index.js b/public/js/lib/editor/index.js
index 07ef58a1..d86ebf3c 100644
--- a/public/js/lib/editor/index.js
+++ b/public/js/lib/editor/index.js
@@ -304,13 +304,13 @@ export default class Editor {
if (this.editor.getOption('indentWithTabs')) {
Cookies.set('indent_type', 'tab', {
expires: 365,
- sameSite: 'strict'
+ sameSite: window.cookiePolicy
})
type.text('Tab Size:')
} else {
Cookies.set('indent_type', 'space', {
expires: 365,
- sameSite: 'strict'
+ sameSite: window.cookiePolicy
})
type.text('Spaces:')
}
@@ -322,12 +322,12 @@ export default class Editor {
if (this.editor.getOption('indentWithTabs')) {
Cookies.set('tab_size', unit, {
expires: 365,
- sameSite: 'strict'
+ sameSite: window.cookiePolicy
})
} else {
Cookies.set('space_units', unit, {
expires: 365,
- sameSite: 'strict'
+ sameSite: window.cookiePolicy
})
}
widthLabel.text(unit)
@@ -396,7 +396,7 @@ export default class Editor {
var keymap = this.editor.getOption('keyMap')
Cookies.set('keymap', keymap, {
expires: 365,
- sameSite: 'strict'
+ sameSite: window.cookiePolicy
})
label.text(keymap)
this.restoreOverrideEditorKeymap()
@@ -445,7 +445,7 @@ export default class Editor {
this.editor.setOption('theme', theme)
Cookies.set('theme', theme, {
expires: 365,
- sameSite: 'strict'
+ sameSite: window.cookiePolicy
})
checkTheme()
@@ -491,7 +491,7 @@ export default class Editor {
}
Cookies.set('spellcheck', mode === 'spell-checker', {
expires: 365,
- sameSite: 'strict'
+ sameSite: window.cookiePolicy
})
checkSpellcheck()
@@ -537,7 +537,7 @@ export default class Editor {
if (overrideBrowserKeymap.is(':checked')) {
Cookies.set('preferences-override-browser-keymap', true, {
expires: 365,
- sameSite: 'strict'
+ sameSite: window.cookiePolicy
})
this.restoreOverrideEditorKeymap()
} else {
diff --git a/public/js/locale.js b/public/js/locale.js
index aca35b98..8baa77fc 100644
--- a/public/js/locale.js
+++ b/public/js/locale.js
@@ -31,7 +31,7 @@ if (localeSelector.length > 0) {
localeSelector.change(function () {
Cookies.set('locale', $(this).val(), {
expires: 365,
- sameSite: 'strict'
+ sameSite: window.cookiePolicy
})
window.location.reload()
})