diff options
| author | Marvin Thomas Rabe <m.rabe@echtzeitraum.de> | 2011-10-04 21:01:05 +0200 |
|---|---|---|
| committer | Marvin Thomas Rabe <m.rabe@echtzeitraum.de> | 2011-10-04 21:01:05 +0200 |
| commit | 451b5940ea8f81844f734f9cb9a0a14209e2dace (patch) | |
| tree | b527baf4d86f92a672692a940f46bbd257a8e342 /apps/files_texteditor | |
| parent | fa203d186e1336ad5aefde37a461a76464fa9a86 (diff) | |
| download | nextcloud-server-451b5940ea8f81844f734f9cb9a0a14209e2dace.tar.gz nextcloud-server-451b5940ea8f81844f734f9cb9a0a14209e2dace.zip | |
fixed scrollbar issues. fixed missing breadcrumb image.
Diffstat (limited to 'apps/files_texteditor')
| -rw-r--r-- | apps/files_texteditor/css/style.css | 5 | ||||
| -rw-r--r-- | 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 = '<input type="button" id="editor_close" value="Close">'; $('#controls').append(html); $('#editorbar').fadeIn('slow'); - var breadcrumbhtml = '<div class="crumb svg" id="breadcrumb_file" style="background-image:url("/core/img/breadcrumb.png")"><a href="#">'+filename+'</a></div>'; + var breadcrumbhtml = '<div class="crumb svg" id="breadcrumb_file" style="background-image:url("../core/img/breadcrumb.png")"><a href="#">'+filename+'</a></div>'; $('.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 |