diff options
| -rw-r--r-- | public/css/cover.css | 2 | ||||
| -rw-r--r-- | public/index.ejs | 1 | ||||
| -rw-r--r-- | public/js/cover.js | 9 | ||||
| -rw-r--r-- | public/js/history.js | 23 |
4 files changed, 22 insertions, 13 deletions
diff --git a/public/css/cover.css b/public/css/cover.css index b5d82e01..26cc8d5f 100644 --- a/public/css/cover.css +++ b/public/css/cover.css @@ -207,7 +207,7 @@ input { padding: 0 10px; } .list li * { - word-break: break-all; + word-break: break-word; word-wrap: break-word; } .list li a { diff --git a/public/index.ejs b/public/index.ejs index 5fbc36cf..2a80d882 100644 --- a/public/index.ejs +++ b/public/index.ejs @@ -232,6 +232,7 @@ <script src="/vendor/list.min.js" defer></script> <script src="/vendor/FileSaver.min.js" defer></script> <script src="/vendor/store.min.js" defer></script> + <script src="/vendor/lz-string.min.js" defer></script> <script src="/js/common.js" defer></script> <script src="/js/history.js" defer></script> <script src="/js/cover.js" defer></script> diff --git a/public/js/cover.js b/public/js/cover.js index f1ca6131..412d329c 100644 --- a/public/js/cover.js +++ b/public/js/cover.js @@ -8,7 +8,7 @@ var options = { <div class="content">\ <h4 class="text"></h4>\ <p>\ - <i><i class="fa fa-clock-o"></i> visit </i><i class="fromNow"></i>\ + <i><i class="fa fa-clock-o"></i> visited </i><i class="fromNow"></i>\ <br>\ <i class="timestamp" style="display:none;"></i>\ <i class="time"></i>\ @@ -148,18 +148,19 @@ function deleteHistory() { saveHistory([]); historyList.clear(); checkHistoryList(); + deleteId = null; } else { if (!deleteId) return; getHistory(function (notehistory) { var newnotehistory = removeHistory(deleteId, notehistory); saveHistory(newnotehistory); + historyList.remove('id', deleteId); + checkHistoryList(); + deleteId = null; }); - historyList.remove('id', deleteId); - checkHistoryList(); } $('.delete-modal').modal('hide'); clearHistory = false; - deleteId = null; } $(".ui-delete-modal-confirm").click(function () { diff --git a/public/js/history.js b/public/js/history.js index 15e46cc6..10ab932f 100644 --- a/public/js/history.js +++ b/public/js/history.js @@ -93,7 +93,14 @@ function clearDuplicatedHistory(notehistory) { for (var i = 0; i < notehistory.length; i++) { var found = false; for (var j = 0; j < newnotehistory.length; j++) { - if (notehistory[i].id == newnotehistory[j].id) { + var id = LZString.decompressFromBase64(notehistory[i].id); + var newId = LZString.decompressFromBase64(newnotehistory[j].id); + if (id == newId || notehistory[i].id == newnotehistory[j].id || !notehistory[i].id || !newnotehistory[j].id) { + var time = moment(notehistory[i].time, 'MMMM Do YYYY, h:mm:ss a'); + var newTime = moment(newnotehistory[j].time, 'MMMM Do YYYY, h:mm:ss a'); + if(time >= newTime) { + newnotehistory[j] = notehistory[i]; + } found = true; break; } @@ -146,9 +153,9 @@ function writeHistoryToServer(view) { } catch (err) { var notehistory = []; } - if(!notehistory) + if (!notehistory) notehistory = []; - + var newnotehistory = generateHistory(view, notehistory); saveHistoryToServer(newnotehistory); }) @@ -163,9 +170,9 @@ function writeHistoryToCookie(view) { } catch (err) { var notehistory = []; } - if(!notehistory) + if (!notehistory) notehistory = []; - + var newnotehistory = generateHistory(view, notehistory); saveHistoryToCookie(newnotehistory); } @@ -179,9 +186,9 @@ function writeHistoryToStorage(view) { var notehistory = data; } else var notehistory = []; - if(!notehistory) + if (!notehistory) notehistory = []; - + var newnotehistory = generateHistory(view, notehistory); saveHistoryToStorage(newnotehistory); } else { @@ -223,9 +230,9 @@ function renderHistory(view) { function generateHistory(view, notehistory) { var info = renderHistory(view); - notehistory = clearDuplicatedHistory(notehistory); notehistory = removeHistory(info.id, notehistory); notehistory = addHistory(info.id, info.text, info.time, info.tags, notehistory); + notehistory = clearDuplicatedHistory(notehistory); return notehistory; } |