From e41e017fa3aa17b07e4b7854ecb0f7d7ce711463 Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Tue, 5 Nov 2013 13:56:20 +0100
Subject: [PATCH] fixes dialog iframe auto-expanding

---
 src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js | 2 +-
 src/Umbraco.Web.UI.Client/src/less/modals.less                  | 2 +-
 src/Umbraco.Web.UI/config/ClientDependency.config               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js
index 352b3b78f7..6d584763dc 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js
@@ -104,7 +104,7 @@ angular.module('umbraco.services')
 
            //if iframe is enabled, inject that instead of a template
            if (dialog.iframe) {
-               var html = $("<iframe src='" + dialog.template + "' style='border: none; width: 100%; height: 100%;'></iframe>");
+               var html = $("<iframe src='" + dialog.template + "' class='auto-expand' style='border: none; width: 100%; height: 100%;'></iframe>");
                dialog.element.html(html);
   
                //append to body or whatever element is passed in as options.containerElement
diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less
index 858f45817e..1d6e07d7d8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/modals.less
+++ b/src/Umbraco.Web.UI.Client/src/less/modals.less
@@ -44,7 +44,7 @@
 	right: 15px
 }
 
-.umb-modalcolumn iframe, .umb-modal iframe {
+.umb-modalcolumn iframe.auto-expand, .umb-modal iframe.auto-expand {
 	border: none;
 	padding: 0px;
 	margin: 0px;
diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index 588ef932bc..11f7a71ea9 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="28" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="29" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.