yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes dialog iframe auto-expanding

Browse Source
This commit is contained in:
perploug
2013-11-05 13:56:20 +01:00
parent 4f9ddfeb7a
commit e41e017fa3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js
View File

@@ -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

2
src/Umbraco.Web.UI.Client/src/less/modals.less
View File

@@ -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;

2
src/Umbraco.Web.UI/config/ClientDependency.config
View File

@@ -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.