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

Fixes: U4-7584 can't preview any content due to external google font

Browse Source
This commit is contained in:
Simon Busborg
2016-01-05 11:49:30 +01:00
parent 69233fbead
commit 44014fea70
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
View File

@@ -11,12 +11,10 @@ LazyLoad.js([
'../js/umbraco.security.js',
'../ServerVariables',
'../lib/spectrum/spectrum.js',
'../js/canvasdesigner.panel.js',
], function () {
jQuery(document).ready(function () {
angular.bootstrap(document, ['Umbraco.canvasdesigner']);
});
});
LazyLoad.js(['https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js']);

12
src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.controller.js
View File

@@ -102,6 +102,8 @@ var app = angular.module("Umbraco.canvasdesigner", ['colorpicker', 'ui.slider',
// Load parameters from GetLessParameters and init data of the Canvasdesigner config
$scope.initCanvasdesigner = function () {
LazyLoad.js(['https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js']);
$http.get(apiController + 'Load', { params: { pageId: $scope.pageId } })
.success(function (data) {
@@ -419,6 +421,7 @@ var app = angular.module("Umbraco.canvasdesigner", ['colorpicker', 'ui.slider',
var webFontScriptLoaded = false;
var loadGoogleFont = function (font) {
if (!webFontScriptLoaded) {
$.getScript('https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js')
.done(function () {
@@ -446,6 +449,7 @@ var app = angular.module("Umbraco.canvasdesigner", ['colorpicker', 'ui.slider',
}
});
}
};
/*****************************************************************************/
@@ -453,9 +457,11 @@ var app = angular.module("Umbraco.canvasdesigner", ['colorpicker', 'ui.slider',
/*****************************************************************************/
// Preload of the google font
$http.get(apiController + 'GetGoogleFont').success(function (data) {
$scope.googleFontFamilies = data;
});
if ($scope.showStyleEditor) {
$http.get(apiController + 'GetGoogleFont').success(function (data) {
$scope.googleFontFamilies = data;
});
}
// watch framLoaded, only if iframe page have enableCanvasdesigner()
$scope.$watch("enableCanvasdesigner", function () {