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

#U4-5530 Fixed Due in version: 7.2.0

Browse Source 
Check if getElementById actually has a result before using it
This commit is contained in:
Sebastiaan Janssen
2014-09-22 15:38:38 +02:00
parent b433d0a35c
commit 357187a7fd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/tuning/tuning.controller.js
View File

@@ -314,6 +314,7 @@ var app = angular.module("umbraco.tuning", ['spectrumcolorpicker', 'ui.slider',
var hideUmbracoPreviewBadge = function () { var hideUmbracoPreviewBadge = function () {
var iframe = (document.getElementById("resultFrame").contentWindow || document.getElementById("resultFrame").contentDocument); var iframe = (document.getElementById("resultFrame").contentWindow || document.getElementById("resultFrame").contentDocument);
if(iframe.document.getElementById("umbracoPreviewBadge"))
iframe.document.getElementById("umbracoPreviewBadge").style.display = "none"; iframe.document.getElementById("umbracoPreviewBadge").style.display = "none";
} }
@@ -439,6 +440,7 @@ var app = angular.module("umbraco.tuning", ['spectrumcolorpicker', 'ui.slider',
link: function (scope, element, attr) { link: function (scope, element, attr) {
element.load(function () { element.load(function () {
var iframe = (element.context.contentWindow || element.context.contentDocument); var iframe = (element.context.contentWindow || element.context.contentDocument);
if(iframe.document.getElementById("umbracoPreviewBadge"))
iframe.document.getElementById("umbracoPreviewBadge").style.display = "none"; iframe.document.getElementById("umbracoPreviewBadge").style.display = "none";
if (!document.getElementById("resultFrame").contentWindow.refrechLayout) { if (!document.getElementById("resultFrame").contentWindow.refrechLayout) {
scope.frameLoaded = true; scope.frameLoaded = true;