From 8240d2bc65069a4d45929085df874d654f3a03ac Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 17 Aug 2015 14:59:35 -0700 Subject: [PATCH] Basic features of the result panel are working --- node_modules/ace_tree/lib/ace_tree/virtual_renderer.js | 4 ++-- plugins/c9.core/util.js | 4 ++-- plugins/c9.ide.ui/widgets.less | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/node_modules/ace_tree/lib/ace_tree/virtual_renderer.js b/node_modules/ace_tree/lib/ace_tree/virtual_renderer.js index 1ac072e7..6bf7dcc5 100644 --- a/node_modules/ace_tree/lib/ace_tree/virtual_renderer.js +++ b/node_modules/ace_tree/lib/ace_tree/virtual_renderer.js @@ -536,11 +536,11 @@ var VirtualRenderer = function(container, cellWidth, cellHeight) { var height = this.provider.getTotalHeight() + headingHeight; var maxHeight = this.getMaxHeight ? this.getMaxHeight() - : this.$maxLines * this.provider.rowHeight + headingHeight; + : this.$maxLines * this.provider.rowHeight + headingHeight var desiredHeight = Math.max( (this.$minLines || 1) * this.provider.rowHeight + headingHeight, Math.min(maxHeight, height) - ); + ) + this.scrollMargin.v; var vScroll = height > maxHeight; if (desiredHeight != this.desiredHeight || diff --git a/plugins/c9.core/util.js b/plugins/c9.core/util.js index 8d2a51dc..3ce82161 100644 --- a/plugins/c9.core/util.js +++ b/plugins/c9.core/util.js @@ -379,12 +379,12 @@ define(function(require, exports, module) { return cmd.replace(re, "\\$1");//.replace(/^~/, "\\~"); }; - var cloneObject = plugin.cloneObject = function(obj) { + var cloneObject = plugin.cloneObject = function(obj, shallow) { if (obj === null || typeof obj !== "object") return obj; var copy = Array.isArray(obj) ? [] : {}; Object.keys(obj).forEach(function(k) { - copy[k] = cloneObject(obj[k]); + copy[k] = shallow ? obj[k] : cloneObject(obj[k]); }); return copy; }; diff --git a/plugins/c9.ide.ui/widgets.less b/plugins/c9.ide.ui/widgets.less index 8fcfbef4..96a4313a 100644 --- a/plugins/c9.ide.ui/widgets.less +++ b/plugins/c9.ide.ui/widgets.less @@ -9,7 +9,7 @@ background : transparent; color : @color; border-radius: 3px; - margin: 1px 0px 0px 0px; + margin: 0px 0px 0px 0px; padding-left: 6px; height: @tree-row-height; }