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

Fix Google Drive Realtime document import

Browse Source
This commit is contained in:
benweet 2013-09-20 20:40:11 +01:00
parent e0ae607f3d
commit 24009e4564
2 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/core.js
View File

@ -510,10 +510,10 @@ define([
return function() { return function() {
if(documentContent === undefined) { if(documentContent === undefined) {
makePreview(); makePreview();
eventMgr.onFileOpen(fileDesc);
$previewContainerElt.scrollTop(fileDesc.previewScrollTop); $previewContainerElt.scrollTop(fileDesc.previewScrollTop);
_.defer(function() { _.defer(function() {
aceEditor.renderer.scrollToY(fileDesc.editorScrollTop); aceEditor.renderer.scrollToY(fileDesc.editorScrollTop);
eventMgr.onFileOpen(fileDesc);
}); });
} }
else { else {
@ -528,10 +528,10 @@ define([
return function() { return function() {
makePreview(); makePreview();
if(documentContent === undefined) { if(documentContent === undefined) {
eventMgr.onFileOpen(fileDesc);
$previewContainerElt.scrollTop(fileDesc.previewScrollTop); $previewContainerElt.scrollTop(fileDesc.previewScrollTop);
_.defer(function() { _.defer(function() {
aceEditor.renderer.scrollToY(fileDesc.editorScrollTop); aceEditor.renderer.scrollToY(fileDesc.editorScrollTop);
eventMgr.onFileOpen(fileDesc);
}); });
} }
checkDocumentChanges(); checkDocumentChanges();

64
res/providers/gdriveProvider.js
View File

@ -267,18 +267,15 @@ define([
// Keep a link to the Pagedown editor // Keep a link to the Pagedown editor
var pagedownEditor = undefined; var pagedownEditor = undefined;
var undoExecute = undefined;
var redoExecute = undefined;
var setUndoRedoButtonStates = undefined;
eventMgr.addListener("onPagedownConfigure", function(pagedownEditorParam) { eventMgr.addListener("onPagedownConfigure", function(pagedownEditorParam) {
pagedownEditor = pagedownEditorParam; pagedownEditor = pagedownEditorParam;
}); });
// Start realtime synchronization
var realtimeDocument = undefined;
var realtimeBinding = undefined;
var realtimeString = undefined;
var undoExecute = undefined;
var redoExecute = undefined;
var setUndoRedoButtonStates = undefined;
// Keep a link to the ACE editor // Keep a link to the ACE editor
var realtimeContext = undefined;
var aceEditor = undefined; var aceEditor = undefined;
var isAceUpToDate = true; var isAceUpToDate = true;
eventMgr.addListener('onAceCreated', function(aceEditorParam) { eventMgr.addListener('onAceCreated', function(aceEditorParam) {
@ -286,38 +283,42 @@ define([
// Listen to editor's changes // Listen to editor's changes
aceEditor.session.on('change', function(e) { aceEditor.session.on('change', function(e) {
// Update the real time model if any // Update the real time model if any
realtimeString && realtimeString.setText(aceEditor.getValue()); realtimeContext && realtimeContext.string && realtimeContext.string.setText(aceEditor.getValue());
}); });
}); });
// Start realtime synchronization
var Range = require('ace/range').Range; var Range = require('ace/range').Range;
gdriveProvider.startRealtimeSync = function(fileDesc, syncAttributes) { gdriveProvider.startRealtimeSync = function(fileDesc, syncAttributes) {
var localContext = {};
realtimeContext = localContext;
googleHelper.loadRealtime(syncAttributes.id, fileDesc.content, function(err, doc) { googleHelper.loadRealtime(syncAttributes.id, fileDesc.content, function(err, doc) {
if(err || !doc) { if(err || !doc) {
return; return;
} }
// If user just switched to another document // If user just switched to another document or file has just been
if(fileMgr.currentFile !== fileDesc) { // reselected
if(localContext.isStopped === true) {
doc.close(); doc.close();
return; return;
} }
logger.log("Starting Google Drive realtime synchronization"); logger.log("Starting Google Drive realtime synchronization");
realtimeDocument = doc; localContext.document = doc;
var model = realtimeDocument.getModel(); var model = doc.getModel();
var realtimeStringLocal = model.getRoot().get('content'); var realtimeString = model.getRoot().get('content');
// Saves model content checksum // Saves model content checksum
function updateContentState() { function updateContentState() {
syncAttributes.contentCRC = utils.crc32(realtimeStringLocal.getText()); syncAttributes.contentCRC = utils.crc32(realtimeString.getText());
utils.storeAttributes(syncAttributes); utils.storeAttributes(syncAttributes);
} }
var debouncedRefreshPreview = _.debounce(pagedownEditor.refreshPreview, 100); var debouncedRefreshPreview = _.debounce(pagedownEditor.refreshPreview, 100);
// Listen to insert text events // Listen to insert text events
realtimeStringLocal.addEventListener(gapi.drive.realtime.EventType.TEXT_INSERTED, function(e) { realtimeString.addEventListener(gapi.drive.realtime.EventType.TEXT_INSERTED, function(e) {
if(aceEditor !== undefined && (isAceUpToDate === false || e.isLocal === false)) { if(aceEditor !== undefined && (isAceUpToDate === false || e.isLocal === false)) {
// Update ACE editor // Update ACE editor
var position = aceEditor.session.doc.indexToPosition(e.index); var position = aceEditor.session.doc.indexToPosition(e.index);
@ -332,7 +333,7 @@ define([
} }
}); });
// Listen to delete text events // Listen to delete text events
realtimeStringLocal.addEventListener(gapi.drive.realtime.EventType.TEXT_DELETED, function(e) { realtimeString.addEventListener(gapi.drive.realtime.EventType.TEXT_DELETED, function(e) {
if(aceEditor !== undefined && (isAceUpToDate === false || e.isLocal === false)) { if(aceEditor !== undefined && (isAceUpToDate === false || e.isLocal === false)) {
// Update ACE editor // Update ACE editor
var range = (function(posStart, posEnd) { var range = (function(posStart, posEnd) {
@ -348,7 +349,7 @@ define([
aceEditor === undefined && debouncedRefreshPreview(); aceEditor === undefined && debouncedRefreshPreview();
} }
}); });
realtimeDocument.addEventListener(gapi.drive.realtime.EventType.DOCUMENT_SAVE_STATE_CHANGED, function(e) { doc.addEventListener(gapi.drive.realtime.EventType.DOCUMENT_SAVE_STATE_CHANGED, function(e) {
// Save success event // Save success event
if(e.isPending === false && e.isSaving === false) { if(e.isPending === false && e.isSaving === false) {
logger.log("Google Drive realtime document successfully saved on server"); logger.log("Google Drive realtime document successfully saved on server");
@ -359,7 +360,7 @@ define([
// Try to merge offline modifications // Try to merge offline modifications
var localContent = fileDesc.content; var localContent = fileDesc.content;
var localContentChanged = syncAttributes.contentCRC != utils.crc32(localContent); var localContentChanged = syncAttributes.contentCRC != utils.crc32(localContent);
var remoteContent = realtimeStringLocal.getText(); var remoteContent = realtimeString.getText();
var remoteContentCRC = utils.crc32(remoteContent); var remoteContentCRC = utils.crc32(remoteContent);
var remoteContentChanged = syncAttributes.contentCRC != remoteContentCRC; var remoteContentChanged = syncAttributes.contentCRC != remoteContentCRC;
var fileContentChanged = localContent != remoteContent; var fileContentChanged = localContent != remoteContent;
@ -371,13 +372,13 @@ define([
} }
else { else {
// Add local modifications if no collaborators change // Add local modifications if no collaborators change
realtimeStringLocal.setText(localContent); realtimeString.setText(localContent);
} }
} }
if(aceEditor === undefined) { if(aceEditor === undefined) {
// Binds model with textarea // Binds model with textarea
realtimeBinding = gapi.drive.realtime.databinding.bindString(realtimeStringLocal, document.getElementById("wmd-input")); localContext.binding = gapi.drive.realtime.databinding.bindString(realtimeString, document.getElementById("wmd-input"));
} }
// Update content state according to collaborators changes // Update content state according to collaborators changes
@ -390,14 +391,14 @@ define([
if(aceEditor !== undefined) { if(aceEditor !== undefined) {
// Tell ACE to update realtime string on each change // Tell ACE to update realtime string on each change
realtimeString = realtimeStringLocal; localContext.string = realtimeString;
// Save undo/redo buttons actions // Save undo/redo buttons default actions
undoExecute = pagedownEditor.uiManager.buttons.undo.execute; undoExecute = pagedownEditor.uiManager.buttons.undo.execute;
redoExecute = pagedownEditor.uiManager.buttons.redo.execute; redoExecute = pagedownEditor.uiManager.buttons.redo.execute;
setUndoRedoButtonStates = pagedownEditor.uiManager.setUndoRedoButtonStates; setUndoRedoButtonStates = pagedownEditor.uiManager.setUndoRedoButtonStates;
// Set new actions for undo/redo buttons // Set temporary actions for undo/redo buttons
pagedownEditor.uiManager.buttons.undo.execute = function() { pagedownEditor.uiManager.buttons.undo.execute = function() {
if(model.canUndo) { if(model.canUndo) {
// This flag is used to avoid replaying editor's own // This flag is used to avoid replaying editor's own
@ -449,19 +450,14 @@ define([
// Stop realtime synchronization // Stop realtime synchronization
gdriveProvider.stopRealtimeSync = function() { gdriveProvider.stopRealtimeSync = function() {
logger.log("Stopping Google Drive realtime synchronization"); logger.log("Stopping Google Drive realtime synchronization");
if(realtimeString !== undefined) { if(realtimeContext !== undefined) {
realtimeString = undefined; realtimeContext.isStopped = true;
} realtimeContext.binding && realtimeContext.binding.unbind();
if(realtimeBinding !== undefined) { realtimeContext.document && realtimeContext.document.close();
realtimeBinding.unbind(); realtimeContext = undefined;
realtimeBinding = undefined;
}
if(realtimeDocument !== undefined) {
realtimeDocument.close();
realtimeDocument = undefined;
} }
if(aceEditor !== undefined) { if(setUndoRedoButtonStates !== undefined) {
// Set back original undo/redo actions // Set back original undo/redo actions
pagedownEditor.uiManager.buttons.undo.execute = undoExecute; pagedownEditor.uiManager.buttons.undo.execute = undoExecute;
pagedownEditor.uiManager.buttons.redo.execute = redoExecute; pagedownEditor.uiManager.buttons.redo.execute = redoExecute;