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 19:01:19 -04:00
parent 7a4d455c18
commit 27d30c64d0
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache.manifest
View File

@ -1 +1 @@
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: * CACHE MANIFEST # v26 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: *

2
js/dropbox-provider.js
View File

@ -203,7 +203,7 @@ define(["jquery", "core", "dropbox-helper"], function($, core, dropboxHelper) {
core.showMessage('Conflict detected on "' + localTitle + '". A backup has been created locally.'); core.showMessage('Conflict detected on "' + localTitle + '". A backup has been created locally.');
} }
// If file content changed // If file content changed
if(fileContentChanged) { if(fileContentChanged && remoteContentChanged === true) {
localStorage[fileIndex + ".content"] = file.content; localStorage[fileIndex + ".content"] = file.content;
core.showMessage('"' + localTitle + '" has been updated from Dropbox.'); core.showMessage('"' + localTitle + '" has been updated from Dropbox.');
if(core.fileManager.isCurrentFileIndex(fileIndex)) { if(core.fileManager.isCurrentFileIndex(fileIndex)) {

4
js/gdrive-provider.js
View File

@ -199,13 +199,13 @@ define(["jquery", "core", "google-helper", "underscore"], function($, core, goog
core.showMessage('Conflict detected on "' + localTitle + '". A backup has been created locally.'); core.showMessage('Conflict detected on "' + localTitle + '". A backup has been created locally.');
} }
// If file title changed // If file title changed
if(fileTitleChanged) { if(fileTitleChanged && remoteTitleChanged === true) {
localStorage[fileIndex + ".title"] = file.title; localStorage[fileIndex + ".title"] = file.title;
updateFileTitles = true; updateFileTitles = true;
core.showMessage('"' + localTitle + '" has been renamed to "' + file.title + '" on Google Drive.'); core.showMessage('"' + localTitle + '" has been renamed to "' + file.title + '" on Google Drive.');
} }
// If file content changed // If file content changed
if(fileContentChanged) { if(fileContentChanged && remoteContentChanged === true) {
localStorage[fileIndex + ".content"] = file.content; localStorage[fileIndex + ".content"] = file.content;
core.showMessage('"' + file.title + '" has been updated from Google Drive.'); core.showMessage('"' + file.title + '" has been updated from Google Drive.');
if(core.fileManager.isCurrentFileIndex(fileIndex)) { if(core.fileManager.isCurrentFileIndex(fileIndex)) {

2
js/main-min.js vendored
View File

File diff suppressed because one or more lines are too long