From 178b89194eae2e64d33682505999add1ab29af64 Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Fri, 22 Feb 2013 10:29:57 +0100 Subject: [PATCH] new source view, document view bugfix, css fixes --- frontend/css/documentSourceView.css | 17 +- frontend/js/collections/arangoDocument.js | 3 +- frontend/js/templates/documentSourceView.ejs | 7 +- frontend/js/views/documentSourceView.js | 10 +- frontend/js/views/documentView.js | 1 - frontend/js/views/documentView.js_BACKUP | 265 +++++++++++++++++++ frontend/js/views/documentsView.js | 1 - 7 files changed, 290 insertions(+), 14 deletions(-) create mode 100644 frontend/js/views/documentView.js_BACKUP diff --git a/frontend/css/documentSourceView.css b/frontend/css/documentSourceView.css index 98c26dc3fe..3b7e509b48 100644 --- a/frontend/css/documentSourceView.css +++ b/frontend/css/documentSourceView.css @@ -1,8 +1,11 @@ -#documentSourceBox { - min-height: 400px; - width: 885px; - border: 1px solid black; - border-radius: 0; +#sourceEditor { + height: 400px; + width: 900px; + margin-left: 20px; + margin-top: 30px; + overflow:hidden; + padding-bottom: 20px; + border: 1px solid #A0A0A0; } #saveSourceDoc, #tableView { @@ -25,3 +28,7 @@ background-color: rgba(0, 0, 0, 0.05); } + +.sourceBox { + padding-bottom:20px; +} diff --git a/frontend/js/collections/arangoDocument.js b/frontend/js/collections/arangoDocument.js index 9a00b1e9a0..75c7f89dd0 100644 --- a/frontend/js/collections/arangoDocument.js +++ b/frontend/js/collections/arangoDocument.js @@ -107,7 +107,8 @@ window.arangoDocument = Backbone.Collection.extend({ saveDocument: function (view) { if (view === "source") { - var model = $('#documentSourceBox').val(); + var editor = ace.edit("sourceEditor"); + var model = editor.getValue(); var tmp1 = window.location.hash.split("/")[2]; var tmp2 = window.location.hash.split("/")[1]; var docID = tmp2 + "/" + tmp1; diff --git a/frontend/js/templates/documentSourceView.ejs b/frontend/js/templates/documentSourceView.ejs index f311cd3fb0..1b28e83ed1 100644 --- a/frontend/js/templates/documentSourceView.ejs +++ b/frontend/js/templates/documentSourceView.ejs @@ -1,10 +1,9 @@ -