From 451b5940ea8f81844f734f9cb9a0a14209e2dace Mon Sep 17 00:00:00 2001 From: Marvin Thomas Rabe Date: Tue, 4 Oct 2011 21:01:05 +0200 Subject: [PATCH] fixed scrollbar issues. fixed missing breadcrumb image. --- apps/files_texteditor/css/style.css | 5 +---- apps/files_texteditor/js/editor.js | 13 +++++-------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/apps/files_texteditor/css/style.css b/apps/files_texteditor/css/style.css index 272246901cb..9ad6eeaa814 100644 --- a/apps/files_texteditor/css/style.css +++ b/apps/files_texteditor/css/style.css @@ -1,11 +1,8 @@ #editor{ position: absoloute; display: block; - padding-top: 40px -/* - top: 41px; + top: 80px; left: 160px; -*/ } #editorwrapper{ position: absoloute; diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js index 1dd4b5d6152..779c292a31e 100644 --- a/apps/files_texteditor/js/editor.js +++ b/apps/files_texteditor/js/editor.js @@ -1,9 +1,6 @@ function setEditorSize(){ // Sets the size of the text editor window. - //$('#editor').css('height', $(window).height()-81); - //$('#editor').css('height', $(window).height()-121); - fillHeight($('#editor')); - //$('#editor').css('width', $(window).width()-160); + fillWindow($('#editor')); } function getFileExtension(file){ @@ -13,7 +10,7 @@ function getFileExtension(file){ function setSyntaxMode(ext){ // Loads the syntax mode files and tells the editor - var filetype = new Array() + var filetype = new Array(); // Todo finish these filetype["php"] = "php"; filetype["html"] = "html"; @@ -42,7 +39,7 @@ function showControls(filename){ var html = ''; $('#controls').append(html); $('#editorbar').fadeIn('slow'); - var breadcrumbhtml = ''; + var breadcrumbhtml = ''; $('.actions').before(breadcrumbhtml); $('.actions').before(savebtnhtml); }); @@ -131,13 +128,13 @@ function showFileEditor(dir,filename){ $('#editor').attr('data-filename', filename); window.aceEditor = ace.edit("editor"); aceEditor.setShowPrintMargin(false); + setEditorSize(); setSyntaxMode(getFileExtension(filename)); OC.addScript('files_texteditor','aceeditor/theme-clouds', function(){ window.aceEditor.setTheme("ace/theme/clouds"); }); }); - bindControlEvents(); - setEditorSize(); + bindControlEvents(); // End success } // End ajax -- 2.39.5