Alamantus
/
lexiconga-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change externalId to externalID for backwards compatibility

This commit is contained in:
Robbie Antenesse 2019-05-23 14:20:54 -06:00
parent bf30f108fa
commit c5bdfa5450
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/account/sync.js
View File

@ -33,7 +33,7 @@ login
*/
export function syncDictionary() {
if (!window.currentDictionary.hasOwnProperty('externalId')) {
if (!window.currentDictionary.hasOwnProperty('externalID')) {
uploadWholeDictionary(true);
} else {
addMessage('Syncing...');
@ -41,7 +41,7 @@ export function syncDictionary() {
action: 'get-current-dictionary',
}, remote => {
// console.log(remote);
if (remote.details.externalId !== window.currentDictionary.externalId) {
if (remote.details.externalID !== window.currentDictionary.externalID) {
clearDictionary();
}
const detailsSynced = syncDetails(remote.details);
@ -93,7 +93,7 @@ export function uploadWholeDictionary(asNew = false) {
action: 'set-whole-current-dictionary',
dictionary,
}, remoteId => {
window.currentDictionary.externalId = remoteId;
window.currentDictionary.externalID = remoteId;
saveDictionary();
addMessage('Dictionary Uploaded Successfully');
}, errorData => {
@ -109,7 +109,7 @@ export function syncDetails(remoteDetails = false) {
let direction; // This is if/else if tree the only way I can think to correctly prioritize this when to upload vs download.
if (remoteDetails === false) {
direction = 'up';
} else if (!window.currentDictionary.hasOwnProperty('externalId')) { // If mismatched id, dictionary will be cleared, allowing it to be overwritten
} else if (!window.currentDictionary.hasOwnProperty('externalID')) { // If mismatched id, dictionary will be cleared, allowing it to be overwritten
direction = 'down';
} else if (remoteDetails.lastUpdated < window.currentDictionary.lastUpdated) {
direction = 'up';

2
src/php/api/Dictionary.php
View File

@ -87,7 +87,7 @@ VALUES ($new_id, ?, ?, ?, ?)";
$partsOfSpeech = $result['parts_of_speech'] !== '' ? $result['parts_of_speech'] : $this->defaults['partsOfSpeech'];
return array(
'externalId' => $this->token->hash($result['id']),
'externalID' => $this->token->hash($result['id']),
'name' => $result['name'],
'specification' => $result['specification'],
'description' => $result['description'],