Merge "Fix heights of Reference, ReferenceList and Template dialogs"

This commit is contained in:
jenkins-bot 2014-07-22 16:11:39 +00:00 committed by Gerrit Code Review
commit 107ce12f9d
3 changed files with 4 additions and 4 deletions

View file

@ -157,7 +157,7 @@ ve.ui.MWReferenceDialog.static.getPasteRules = function () {
[
// Nested references are impossible
'mwReference', 'mwReferenceList',
// Lists are tables are actually possible in wikitext with a leading
// Lists and tables are actually possible in wikitext with a leading
// line break but we prevent creating these with the UI
'list', 'listItem', 'definitionList', 'definitionListItem',
'table', 'tableCaption', 'tableSection', 'tableRow', 'tableCell'
@ -217,7 +217,7 @@ ve.ui.MWReferenceDialog.prototype.onReady = function () {
* @inheritdoc
*/
ve.ui.MWReferenceDialog.prototype.getBodyHeight = function () {
return this.editPanel.$element[0].scrollHeight;
return Math.min( 400, Math.ceil( this.panels.getCurrentItem().$element[0].scrollHeight ) );
};
/**

View file

@ -63,7 +63,7 @@ ve.ui.MWReferenceListDialog.static.actions = [
* @inheritdoc
*/
ve.ui.MWReferenceListDialog.prototype.getBodyHeight = function () {
return this.editPanel.$element[0].scrollHeight;
return Math.ceil( this.editPanel.$element[0].scrollHeight );
};
/**

View file

@ -228,7 +228,7 @@ ve.ui.MWTemplateDialog.prototype.isInsertable = function () {
* @inheritdoc
*/
ve.ui.MWTemplateDialog.prototype.getBodyHeight = function () {
return 350;
return 400;
};
/**