diff --git a/package.json b/package.json index 2f4496b..d2dde26 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lexiconga", - "version": "2.1.6", + "version": "2.1.7", "description": "The quick and easy dictionary builder for constructed languages.", "main": "template-index.html", "repository": "https://github.com/Alamantus/Lexiconga.git", diff --git a/src/js/account/sync.js b/src/js/account/sync.js index ba200c5..cc01c10 100644 --- a/src/js/account/sync.js +++ b/src/js/account/sync.js @@ -174,10 +174,11 @@ export function syncWords(remoteWords, deletedWords) { } remoteWords.forEach(remoteWord => { - let localWord = words.find(word => word.wordId === remoteWord.wordId); + const localWordIndex = words.findIndex(word => word.wordId === remoteWord.wordId); + const localWord = words[localWordIndex]; if (localWord) { if (localWord.lastUpdated < remoteWord.lastUpdated) { - localWord = remoteWord; + words[localWordIndex] = remoteWord; } else if (localWord.lastUpdated > remoteWord.lastUpdated) { // Add more-recently-updated words to upload localWordsToUpload.push(localWord); diff --git a/src/php/api/Dictionary.php b/src/php/api/Dictionary.php index 02cfc73..95ecea7 100644 --- a/src/php/api/Dictionary.php +++ b/src/php/api/Dictionary.php @@ -258,7 +258,7 @@ WHERE dictionary=$dictionary"; $word_ids = array(); $most_recent_word_update = 0; foreach($words as $word) { - $last_updated = isset($word['lastUpdated']) ? $word['createdOn'] : $word['lastUpdated']; + $last_updated = isset($word['lastUpdated']) ? $word['lastUpdated'] : $word['createdOn']; if ($most_recent_word_update < $last_updated) { $most_recent_word_update = $last_updated; } diff --git a/src/php/router.php b/src/php/router.php index bd42e60..fc9c784 100644 --- a/src/php/router.php +++ b/src/php/router.php @@ -134,7 +134,7 @@ switch ($view) { oldLoad && oldLoad(); if (UpUp) { UpUp.start({ - 'cache-version': '2.1.6', + 'cache-version': '2.1.7', 'content-url': 'offline.html', 'assets': [ \"" . implode('","', $files) . "\"