kopia lustrzana https://github.com/c9/core
fix +14663 Environment variables popup scrollbar is hidden
rodzic
e8da10c048
commit
5f33015009
|
@ -567,10 +567,6 @@ var VirtualRenderer = function(container, cellWidth, cellHeight) {
|
||||||
var vertical = this.$treeLayer;
|
var vertical = this.$treeLayer;
|
||||||
var horizontal = this.$horHeadingLayer;
|
var horizontal = this.$horHeadingLayer;
|
||||||
|
|
||||||
var top = Math.max(this.scrollTop, 0);
|
|
||||||
var vRange = provider.getRange(top, top + this.$size.height);
|
|
||||||
var hRange = {size: 0}// horizontal.getRange(this.scrollLeft, this.scrollLeft + this.$size.width);
|
|
||||||
|
|
||||||
var minHeight = this.$size.scrollerHeight;
|
var minHeight = this.$size.scrollerHeight;
|
||||||
var maxHeight = provider.getTotalHeight();
|
var maxHeight = provider.getTotalHeight();
|
||||||
|
|
||||||
|
@ -604,6 +600,11 @@ var VirtualRenderer = function(container, cellWidth, cellHeight) {
|
||||||
|
|
||||||
if (this.provider.getScrollTop() != this.scrollTop)
|
if (this.provider.getScrollTop() != this.scrollTop)
|
||||||
this.scrollTop = this.provider.getScrollTop();
|
this.scrollTop = this.provider.getScrollTop();
|
||||||
|
|
||||||
|
var top = Math.max(this.scrollTop, 0);
|
||||||
|
var vRange = provider.getRange(top, top + this.$size.height);
|
||||||
|
var hRange = { size: 0 };// horizontal.getRange(this.scrollLeft, this.scrollLeft + this.$size.width);
|
||||||
|
|
||||||
|
|
||||||
var vOffset = this.scrollTop - vRange.size;
|
var vOffset = this.scrollTop - vRange.size;
|
||||||
var hOffset = this.scrollLeft - hRange.size;
|
var hOffset = this.scrollLeft - hRange.size;
|
||||||
|
|
|
@ -483,10 +483,9 @@ define(function(require, exports, module) {
|
||||||
|
|
||||||
layout.on("eachTheme", function(e) {
|
layout.on("eachTheme", function(e) {
|
||||||
var height = parseInt(ui.getStyleRule(".blackdg .row", "height"), 10) || 24;
|
var height = parseInt(ui.getStyleRule(".blackdg .row", "height"), 10) || 24;
|
||||||
model.rowHeightInner = height - 1;
|
|
||||||
model.rowHeight = height;
|
model.rowHeight = height;
|
||||||
|
|
||||||
if (e.changed) (datagrid).resize(true);
|
if (e.changed) datagrid.resize(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
model.$sorted = false;
|
model.$sorted = false;
|
||||||
|
@ -510,7 +509,6 @@ define(function(require, exports, module) {
|
||||||
|
|
||||||
datagrid = new Tree(div);
|
datagrid = new Tree(div);
|
||||||
datagrid.renderer.setTheme({ cssClass: "blackdg" });
|
datagrid.renderer.setTheme({ cssClass: "blackdg" });
|
||||||
datagrid.setOption("maxLines", 200);
|
|
||||||
datagrid.setDataProvider(model);
|
datagrid.setDataProvider(model);
|
||||||
datagrid.edit = new TreeEditor(datagrid);
|
datagrid.edit = new TreeEditor(datagrid);
|
||||||
|
|
||||||
|
@ -818,14 +816,18 @@ define(function(require, exports, module) {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
drawEnv();
|
drawEnv();
|
||||||
datagrid.resize();
|
|
||||||
|
|
||||||
model.session = currentSession;
|
model.session = currentSession;
|
||||||
if (!model.session.config.env)
|
if (!model.session.config.env)
|
||||||
model.session.config.env = {};
|
model.session.config.env = {};
|
||||||
|
|
||||||
reloadModel();
|
reloadModel();
|
||||||
|
|
||||||
|
var rect = mnuEnv.opener.$ext.getBoundingClientRect();
|
||||||
|
var top = rect.top;
|
||||||
|
var bottom = window.innerHeight - rect.bottom;
|
||||||
|
|
||||||
|
var maxRows = Math.floor(Math.max(top, bottom) / datagrid.model.rowHeight) - 2;
|
||||||
|
datagrid.setOption("maxLines", maxRows);
|
||||||
|
datagrid.resize();
|
||||||
mnuEnv.resize();
|
mnuEnv.resize();
|
||||||
|
|
||||||
var node = datagrid.getFirstNode();
|
var node = datagrid.getFirstNode();
|
||||||
|
|
|
@ -94,7 +94,6 @@
|
||||||
}
|
}
|
||||||
.envcontainer .blackdg{
|
.envcontainer .blackdg{
|
||||||
border-top: 1px solid #363636;
|
border-top: 1px solid #363636;
|
||||||
max-height : 300px;
|
|
||||||
}
|
}
|
||||||
.tree-row.newenv:not(.selected) {
|
.tree-row.newenv:not(.selected) {
|
||||||
color: rgb(151, 151, 151);
|
color: rgb(151, 151, 151);
|
||||||
|
|
Ładowanie…
Reference in New Issue