Fix editing shared files and file opening bug. Fixes oc-209 and oc-195

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 6e154bedb9ca7dd7597c6d27b2daf81f58307af0..2d07c4fd79d6620934808a75a1fb6c3e9c60e89a 100644 (file)
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -56,18 +56,16 @@ function setSyntaxMode(ext){
 
 function showControls(filename,writeperms){
        // Loads the control bar at the top.
-       $('.actions,#file_action_panel').fadeOut('slow').promise().done(function() {
-               // Load the new toolbar.
-               var editorcontrols;
-               if(writeperms=="true"){
-                       var editorcontrols = '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div><label for="gotolineval">Go to line:</label><input type="text" id="gotolineval"><div class="separator"></div>';
-               }
-               var html = '<label for="editorseachval">Search:</label><input type="text" name="editorsearchval" id="editorsearchval"><div class="separator"></div><button id="editor_close">'+t('files_texteditor','Close')+'</button>';
-               $('#controls').append(html);
-               $('#editorbar').fadeIn('slow'); 
-               var breadcrumbhtml = '<div class="crumb svg" id="breadcrumb_file" style="background-image:url(&quot;../core/img/breadcrumb.png&quot;)"><p>'+filename+'</p></div>';
-               $('.actions').before(breadcrumbhtml).before(editorcontrols);
-       });
+       // Load the new toolbar.
+       var editorbarhtml = '<div id="editorcontrols" style="display: none;"><div class="crumb svg last" id="breadcrumb_file" style="background-image:url(&quot;../core/img/breadcrumb.png&quot;)"><p>'+filename+'</p></div>';
+       if(writeperms=="true"){
+               editorbarhtml += '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div>';
+       }
+       editorbarhtml += '<label for="gotolineval">Go to line:</label><input stype="text" id="gotolineval"><label for="editorseachval">Search:</label><input type="text" name="editorsearchval" id="editorsearchval"><div class="separator"></div><button id="editor_close">'+t('files_texteditor','Close')+'</button></div>';
+       // Change breadcrumb classes
+       $('#controls .last').removeClass('last');
+       $('#controls').append(editorbarhtml);
+       $('#editorcontrols').fadeIn('slow');
 }
  
 function bindControlEvents(){
@@ -182,8 +180,10 @@ function showFileEditor(dir,filename){
                                        // Save mtime
                                        $('#editor').attr('data-mtime', result.data.mtime);
                                        // Initialise the editor
-                                       showControls(filename,result.data.write);
+                                       $('.actions,#file_action_panel').fadeOut('slow');
                                        $('table').fadeOut('slow', function() {
+                                               // Show the control bar
+                                               showControls(filename,result.data.write);
                                                // Update document title
                                                document.title = filename;
                                                $('#editor').text(result.data.filecontents);
@@ -215,7 +215,7 @@ function showFileEditor(dir,filename){
 // Fades out the editor.
 function hideFileEditor(){
        // Fades out editor controls
-       $('#controls > :not(.actions,#file_access_panel,.crumb),#breadcrumb_file').fadeOut('slow',function(){
+       $('#editorcontrols').fadeOut('slow',function(){
                $(this).remove();
        });
        // Fade out editor