Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branch

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 4bbb8ab7..ace588f6 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -56,10 +56,14 @@
        var dialogHeight = $("#gDialog").height();
        var cssWidth = new String($("#gDialog form").css("width"));
        var childWidth = cssWidth.replace(/[^0-9]/g,"");
+       var size = $.gallery_get_viewport_size();
        if ($("#gDialog iframe").length) {
-         dialogWidth = $(window).width() - 100;
+         dialogWidth = size.width() - 100;
          // Set the iframe width and height
-         $("#gDialog iframe").width("100%").height($(window).height() - 100);
+         $("#gDialog iframe").width("100%").height(size.height() - 100);
+       } else if ($("#gDialog .gDialogPanel").length) {
+         dialogWidth = size.width() - 100;
+         $("#gDialog").dialog("option", "height", size.height() - 100);
        } else if (childWidth == "" || childWidth > 300) {
          dialogWidth = 500;
        }