From 9ade3092f02b67fe3f35012006cab17e5938c3c9 Mon Sep 17 00:00:00 2001 From: Catouse Date: Thu, 5 Nov 2015 20:56:24 +0800 Subject: [PATCH] * fix error in model trigger. --- src/js/modal.trigger.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/js/modal.trigger.js b/src/js/modal.trigger.js index a4bccf2f3..205512469 100644 --- a/src/js/modal.trigger.js +++ b/src/js/modal.trigger.js @@ -41,6 +41,7 @@ showHeader: true, delay: 0, // iframeBodyClass: '', + // onlyIncreaseHeight: false, backdrop: true, keyboard: true }; @@ -247,10 +248,15 @@ // todo: update iframe url to ref attribute var $framebody = frame$('body').addClass('body-modal'); if(options.iframeBodyClass) $framebody.addClass(options.iframeBodyClass); - var ajustFrameSize = function() + var ajustFrameSize = function(check) { $modal.removeClass('fade'); var height = $framebody.outerHeight(); + if(check === true && options.onlyIncreaseHeight) + { + height = Math.max(height, $body.data('minModalHeight') || 0); + $body.data('minModalHeight', height); + } $body.css('height', height); if (options.fade) $modal.addClass('fade'); readyToShow(); @@ -264,7 +270,7 @@ setTimeout(ajustFrameSize, 100); - $framebody.off('resize.' + NAME).on('resize.' + NAME, ajustFrameSize); + $framebody.off('resize.' + NAME).on('resize.' + NAME, function(){ajustFrameSize(true)}); } frame$.extend( -- GitLab