diff --git a/editor/js/ui/common/editableList.js b/editor/js/ui/common/editableList.js index 79be3cfcb..975c8c300 100644 --- a/editor/js/ui/common/editableList.js +++ b/editor/js/ui/common/editableList.js @@ -116,6 +116,11 @@ this.uiContainer.css("minHeight",minHeight); this.element.css("minHeight",0); } + var maxHeight = this.element.css("maxHeight"); + if (maxHeight !== '0px') { + this.uiContainer.css("maxHeight",maxHeight); + this.element.css("maxHeight",null); + } if (this.options.height !== 'auto') { this.uiContainer.css("overflow-y","scroll"); if (!isNaN(this.options.height)) { diff --git a/editor/js/ui/projectSettings.js b/editor/js/ui/projectSettings.js index d495b42f6..2c3e1f54d 100644 --- a/editor/js/ui/projectSettings.js +++ b/editor/js/ui/projectSettings.js @@ -164,7 +164,7 @@ RED.projects.settings = (function() { var editButton = container.prev(); editButton.hide(); container.empty(); - var bg = $('').appendTo(container); + var bg = $('').appendTo(container); var input = $('').val(summary||"").appendTo(container); $('') .appendTo(bg) @@ -853,7 +853,7 @@ RED.projects.settings = (function() { } - var formButtons = $('').hide().appendTo(filesContainer); + var formButtons = $('').hide().appendTo(filesContainer); $('') .appendTo(formButtons) .click(function(evt) { @@ -955,35 +955,40 @@ RED.projects.settings = (function() { var localBranchContainer = $('
').appendTo(pane); $('').text("Branches").appendTo(localBranchContainer); - var row = $('').appendTo(localBranchContainer); + var row = $('').appendTo(localBranchContainer); var branchList = $('