summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Needham <needham.thomas@gmail.com>2011-10-04 19:46:27 +0100
committerTom Needham <needham.thomas@gmail.com>2011-10-04 19:46:27 +0100
commitfa203d186e1336ad5aefde37a461a76464fa9a86 (patch)
tree471e1a1494e641d7cbb71c10394823eabc18b4b1
parent2d9c3d75f3109286f42ae417c423608ce3ee12c4 (diff)
downloadnextcloud-server-fa203d186e1336ad5aefde37a461a76464fa9a86.tar.gz
nextcloud-server-fa203d186e1336ad5aefde37a461a76464fa9a86.zip
Added fillHeight() js function for resizing editor
-rw-r--r--apps/files_texteditor/css/style.css7
-rw-r--r--apps/files_texteditor/js/editor.js8
2 files changed, 8 insertions, 7 deletions
diff --git a/apps/files_texteditor/css/style.css b/apps/files_texteditor/css/style.css
index 16d9458608d..272246901cb 100644
--- a/apps/files_texteditor/css/style.css
+++ b/apps/files_texteditor/css/style.css
@@ -1,10 +1,11 @@
#editor{
position: absoloute;
- height: 0;
- width: 0;
+ display: block;
+ padding-top: 40px
+/*
top: 41px;
left: 160px;
- z-index: -1;
+*/
}
#editorwrapper{
position: absoloute;
diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 814323732fa..1dd4b5d6152 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -1,9 +1,9 @@
function setEditorSize(){
// Sets the size of the text editor window.
//$('#editor').css('height', $(window).height()-81);
- $('#editor').css('height', $(window).height()-121);
- $('#editor').css('width', $(window).width()-160);
- $('#editor').css('padding-top', '40px');
+ //$('#editor').css('height', $(window).height()-121);
+ fillHeight($('#editor'));
+ //$('#editor').css('width', $(window).width()-160);
}
function getFileExtension(file){
@@ -137,11 +137,11 @@ function showFileEditor(dir,filename){
});
});
bindControlEvents();
+ setEditorSize();
// End success
}
// End ajax
});
- setEditorSize();
}
function hideFileEditor(){