caojiezi2003/Stackedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflict detection on Google Drive

Browse Source
This commit is contained in:
OpenShift guest 2013-05-06 18:53:13 -04:00
parent f214fb35a7
commit 7a4d455c18
4 changed files with 148 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache.manifest
View File

@ -1 +1 @@
CACHE MANIFEST # v24 CACHE: index.html viewer.html css/main-min.css js/main-min.js js/require.js img/ajax-loader.gif img/glyphicons-halflings.png img/glyphicons-halflings-white.png img/icons.png img/stackedit-32.ico img/stackedit-promo.png NETWORK: *
CACHE MANIFEST # v25 CACHE: index.html viewer.html css/main-min.css js/main-min.js js/require.js img/ajax-loader.gif img/glyphicons-halflings.png img/glyphicons-halflings-white.png img/icons.png img/stackedit-32.ico img/stackedit-promo.png NETWORK: *

6
js/dropbox-provider.js
View File

@ -193,9 +193,11 @@ define(["jquery", "core", "dropbox-helper"], function($, core, dropboxHelper) {
var localContent = localStorage[fileIndex + ".content"];
var localContentChanged = syncAttributes.contentCRC != core.crc32(localContent);
var file = change.stat;
var remoteContentCRC = core.crc32(file.content);
var remoteContentChanged = syncAttributes.contentCRC != remoteContentCRC;
var fileContentChanged = localContent != file.content;
// Conflict detection
if (fileContentChanged === true && localContentChanged === true) {
if (fileContentChanged === true && localContentChanged === true && remoteContentChanged === true) {
core.fileManager.createFile(localTitle + " (backup)", localContent);
updateFileTitles = true;
core.showMessage('Conflict detected on "' + localTitle + '". A backup has been created locally.');
@ -211,7 +213,7 @@ define(["jquery", "core", "dropbox-helper"], function($, core, dropboxHelper) {
}
// Update syncAttributes
syncAttributes.version = file.versionTag;
syncAttributes.contentCRC = core.crc32(file.content);
syncAttributes.contentCRC = remoteContentCRC;
localStorage[syncIndex] = JSON.stringify(syncAttributes);
});
if(updateFileTitles) {

12
js/gdrive-provider.js
View File

@ -185,11 +185,15 @@ define(["jquery", "core", "google-helper", "underscore"], function($, core, goog
var localContent = localStorage[fileIndex + ".content"];
var localContentChanged = syncAttributes.contentCRC != core.crc32(localContent);
var file = change.file;
var remoteTitleCRC = core.crc32(file.title);
var remoteTitleChanged = syncAttributes.titleCRC != remoteTitleCRC;
var fileTitleChanged = localTitle != file.title;
var remoteContentCRC = core.crc32(file.content);
var remoteContentChanged = syncAttributes.contentCRC != remoteContentCRC;
var fileContentChanged = localContent != file.content;
// Conflict detection
if ((fileTitleChanged === true && localTitleChanged === true)
|| (fileContentChanged === true && localContentChanged === true)) {
if ((fileTitleChanged === true && localTitleChanged === true && remoteTitleChanged === true)
|| (fileContentChanged === true && localContentChanged === true && remoteContentChanged === true)) {
core.fileManager.createFile(localTitle + " (backup)", localContent);
updateFileTitles = true;
core.showMessage('Conflict detected on "' + localTitle + '". A backup has been created locally.');
@ -211,8 +215,8 @@ define(["jquery", "core", "google-helper", "underscore"], function($, core, goog
}
// Update syncAttributes
syncAttributes.etag = file.etag;
syncAttributes.contentCRC = core.crc32(file.content);
syncAttributes.titleCRC = core.crc32(file.title);
syncAttributes.contentCRC = remoteContentCRC;
syncAttributes.titleCRC = remoteTitleCRC;
localStorage[syncIndex] = JSON.stringify(syncAttributes);
});
if(updateFileTitles) {

16
js/main-min.js vendored
View File

File diff suppressed because one or more lines are too long