Handle editing whilst saving, preserve title, fixes #121

1 files changed, 26 insertions, 12 deletions

diff --git a/js/editor.js b/js/editor.js
index b90fd13..341357b 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -49,6 +49,16 @@ var Files_Texteditor = {
 	saveTimer: null,
 
 	/**
+	 * Stores the old page title
+	 */
+	oldTitle: null,
+
+	/**
+	 * Stores the timeout for the saving message
+	 */
+	saveMessageTimeout: null,
+
+	/**
 	 * preview plugins by mimetype
 	 */
 	previewPlugins: {},
@@ -77,9 +87,12 @@ var Files_Texteditor = {
 			return;
 		} else {
 			OCA.Files_Texteditor.saving = true;
-			OCA.Files_Texteditor.edited = false;
+			OCA.Files_Texteditor.file.edited = false;
 		}
 
+		// Can any fade outs on the saving message
+		clearTimeout(OCA.Files_Texteditor.saveMessageTimeout);
+
 		// Set the saving status
 		$('#editor_controls small.saving-message')
 			.text(t('files_texteditor', 'saving...'))
@@ -90,25 +103,26 @@ var Files_Texteditor = {
 			OCA.Files_Texteditor.file,
 			function(data){
 				// Yay
-				// TODO only reset edited value if not editing during saving
-				document.title = document.title.slice(2);
-				$('small.unsaved-star').css('display', 'none');
+				if(OCA.Files_Texteditor.file.edited == false) {
+					document.title = OCA.Files_Texteditor.file.name + ' - ' + OCA.Files_Texteditor.oldTitle;
+					$('small.unsaved-star').css('display', 'none');
+				}
 				OCA.Files_Texteditor.file.mtime = data.mtime;
 				OCA.Files_Texteditor.file.size = data.size;
-				OCA.Files_Texteditor.file.edited = false;
+
 				$('#editor_controls small.saving-message')
 					.text(t('files_texteditor', 'saved!'));
-				setTimeout(function() {
+				OCA.Files_Texteditor.saveMessageTimeout = setTimeout(function() {
 					$('small.saving-message').fadeOut(200);
 				}, 2000);
 			},
 			function(message){
 				// Boo
 				$('small.saving-message').text(t('files_texteditor', 'failed!'));
-				setTimeout(function() {
+				OCA.Files_Texteditor.saveMessageTimeout = setTimeout(function() {
 					$('small.saving-message').fadeOut(200);
 				}, 5000);
-				OCA.Files_Texteditor.edited = true;
+				OCA.Files_Texteditor.file.edited = true;
 			}
 		);
 		OCA.Files_Texteditor.saving = false;
@@ -136,7 +150,7 @@ var Files_Texteditor = {
 						'files_texteditor',
 						'Saved'
 						)
-					);
+					)
 					// Remove the editor
 					OCA.Files_Texteditor.closeEditor();
 				},
@@ -161,7 +175,7 @@ var Files_Texteditor = {
 	 */
 	_onReOpenTrigger: function() {
 		if($('#notification').data('reopeneditor') == true) {
-			document.title = OCA.Files_Texteditor.file.name + ' - ' + document.title;
+			document.title = OCA.Files_Texteditor.file.name + ' - ' + OCA.Files_Texteditor.oldTitle;
 			OCA.Files_Texteditor.$container.show();
 		}
 	},
@@ -203,7 +217,7 @@ var Files_Texteditor = {
 	 * Handler when unsaved work is detected
 	 */
 	_onUnsaved: function() {
-		document.title = '* '+document.title;
+		document.title = '* '+ OCA.Files_Texteditor.file.name + ' - ' + OCA.Files_Texteditor.oldTitle;
 		$('small.unsaved-star').css('display', 'inline-block');
 	},
 
@@ -274,7 +288,7 @@ var Files_Texteditor = {
 			function(file, data){
 				// Success!
 				// Sort the title
-				document.title = file.name + ' - ' + document.title;
+				document.title = file.name + ' - ' + OCA.Files_Texteditor.oldTitle;
 				// Load ace
 				$('#'+_self.editor).text(data);
 				// Configure ace