Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

This commit is contained in:
Michael Hackstein 2013-07-08 15:04:09 +02:00
parent 772a1ab2f0 30c3f1ae5a
commit d4079a3df4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/admin/css/shellView.css
View File

@ -18,7 +18,7 @@
#editor { #editor {
float:left; float:left;
width: 300px; width: 150px;
height: 400px; height: 400px;
background-color:white; background-color:white;
overflow: hidden; overflow: hidden;

4
html/admin/js/views/shellView.js
View File

@ -21,6 +21,7 @@ var shellView = Backbone.View.extend({
$("#shell_workspace").splitter({ $("#shell_workspace").splitter({
dock: true dock: true
}); });
$("#shell_workspace").trigger("resize", [ 150 ]);
$('.vsplitbar').append('<div id="editor-run"><img src="img/right_icon.png"></img></div>'); $('.vsplitbar').append('<div id="editor-run"><img src="img/right_icon.png"></img></div>');
this.resize(); this.resize();
@ -38,10 +39,11 @@ var shellView = Backbone.View.extend({
resize: function () { resize: function () {
// prevent endless recursion // prevent endless recursion
if (! this.resizing) { if (! this.resizing) {
var editorWidth = $('#editor').width();
this.resizing = true; this.resizing = true;
var windowHeight = $(window).height() - 200; var windowHeight = $(window).height() - 200;
$('#shell_workspace').height(windowHeight); $('#shell_workspace').height(windowHeight);
$("#shell_workspace").trigger("resize", [ 200 ]); $("#shell_workspace").trigger("resize", [ editorWidth ]);
this.resizing = false; this.resizing = false;
} }
}, },