summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package.json2
-rw-r--r--public/js/history.js79
2 files changed, 21 insertions, 60 deletions
diff --git a/package.json b/package.json
index 445f2a0f..0d229ac9 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
"socket.io-client": "~2.0.4",
"spin.js": "^2.3.2",
"sqlite3": "^4.0.1",
- "store": "^1.3.20",
+ "store": "^2.0.12",
"string": "^3.3.3",
"tedious": "^1.14.0",
"to-markdown": "^3.0.3",
diff --git a/public/js/history.js b/public/js/history.js
index 71322818..b4c26b42 100644
--- a/public/js/history.js
+++ b/public/js/history.js
@@ -1,5 +1,5 @@
/* eslint-env browser, jquery */
-/* global serverurl, Cookies, moment */
+/* global serverurl, moment */
import store from 'store'
import S from 'string'
@@ -64,13 +64,7 @@ export function saveHistory (notehistory) {
}
function saveHistoryToStorage (notehistory) {
- if (store.enabled) { store.set('notehistory', JSON.stringify(notehistory)) } else { saveHistoryToCookie(notehistory) }
-}
-
-function saveHistoryToCookie (notehistory) {
- Cookies.set('notehistory', notehistory, {
- expires: 365
- })
+ store.set('notehistory', JSON.stringify(notehistory))
}
function saveHistoryToServer (notehistory) {
@@ -150,35 +144,17 @@ export function writeHistory (title, tags) {
)
}
-function writeHistoryToCookie (title, tags) {
- var notehistory
- try {
- notehistory = Cookies.getJSON('notehistory')
- } catch (err) {
- notehistory = []
- }
- if (!notehistory) { notehistory = [] }
- const newnotehistory = generateHistory(title, tags, notehistory)
- saveHistoryToCookie(newnotehistory)
-}
-
function writeHistoryToStorage (title, tags) {
- if (store.enabled) {
- let data = store.get('notehistory')
- var notehistory
- if (data) {
- if (typeof data === 'string') { data = JSON.parse(data) }
- notehistory = data
- } else {
- notehistory = []
- }
- if (!notehistory) { notehistory = [] }
-
- const newnotehistory = generateHistory(title, tags, notehistory)
- saveHistoryToStorage(newnotehistory)
+ let data = store.get('notehistory')
+ let notehistory
+ if (data && typeof data === 'string') {
+ notehistory = JSON.parse(data)
} else {
- writeHistoryToCookie(title, tags)
+ notehistory = []
}
+
+ const newnotehistory = generateHistory(title, tags, notehistory)
+ saveHistoryToStorage(newnotehistory)
}
if (!Array.isArray) {
@@ -236,20 +212,13 @@ function getServerHistory (callback) {
})
}
-function getCookieHistory (callback) {
- callback(Cookies.getJSON('notehistory'))
-}
-
export function getStorageHistory (callback) {
- if (store.enabled) {
- let data = store.get('notehistory')
- if (data) {
- if (typeof data === 'string') { data = JSON.parse(data) }
- callback(data)
- } else { getCookieHistory(callback) }
- } else {
- getCookieHistory(callback)
+ let data = store.get('notehistory')
+ if (data) {
+ if (typeof data === 'string') { data = JSON.parse(data) }
+ callback(data)
}
+ callback([])
}
export function parseHistory (list, callback) {
@@ -275,21 +244,13 @@ export function parseServerToHistory (list, callback) {
})
}
-function parseCookieToHistory (list, callback) {
- const notehistory = Cookies.getJSON('notehistory')
- parseToHistory(list, notehistory, callback)
-}
-
export function parseStorageToHistory (list, callback) {
- if (store.enabled) {
- let data = store.get('notehistory')
- if (data) {
- if (typeof data === 'string') { data = JSON.parse(data) }
- parseToHistory(list, data, callback)
- } else { parseCookieToHistory(list, callback) }
- } else {
- parseCookieToHistory(list, callback)
+ let data = store.get('notehistory')
+ if (data) {
+ if (typeof data === 'string') { data = JSON.parse(data) }
+ parseToHistory(list, data, callback)
}
+ parseToHistory(list, [], callback)
}
function parseToHistory (list, notehistory, callback) {