Merge pull request #116 from owncloud/remove-duplicate-ajax

Remove duplicate ajax call

1 files changed, 5 insertions, 23 deletions

diff --git a/js/editor.js b/js/editor.js
index ef2d107..620a76e 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -464,23 +464,6 @@ var Files_Texteditor = {
 	 * Loads the data through AJAX
 	 */
 	loadFile: function(dir, filename, success, failure) {
-		var _self = this;
-		var data = $.getJSON(
-			OC.filePath('files_texteditor', 'ajax', 'loadfile.php'),
-			{file: filename, dir: dir},
-			function (result) {
-				if(result.status === 'success') {
-					// Call success callback
-					OCA.Files_Texteditor.file.writeable = result.data.writeable;
-					OCA.Files_Texteditor.file.mime = result.data.mime;
-					OCA.Files_Texteditor.file.mtime = result.data.mtime;
-					success(OCA.Files_Texteditor.file, result.data.filecontents);
-				} else {
-					// Call failure callback
-					failure(result.data.message);
-				}
-		});
-
 		$.get(
 			OC.generateUrl('/apps/files_texteditor/ajax/loadfile'),
 			{
@@ -488,12 +471,11 @@ var Files_Texteditor = {
 				dir: dir
 			}
 		).done(function(data) {
-					// Call success callback
-					OCA.Files_Texteditor.file.writeable = data.writeable;
-					OCA.Files_Texteditor.file.mime = data.mime;
-					OCA.Files_Texteditor.file.mtime = data.mtime;
-					success(OCA.Files_Texteditor.file, data.filecontents);
-
+			// Call success callback
+			OCA.Files_Texteditor.file.writeable = data.writeable;
+			OCA.Files_Texteditor.file.mime = data.mime;
+			OCA.Files_Texteditor.file.mtime = data.mtime;
+			success(OCA.Files_Texteditor.file, data.filecontents);
 		}).fail(function(jqXHR) {
 			failure(JSON.parse(jqXHR.responseText).message);
 		});