From 0c25c36af04bd633f2ad1808bbce24308714cd79 Mon Sep 17 00:00:00 2001 From: Sebastiaan Jansssen Date: Fri, 9 Feb 2018 09:46:05 +0100 Subject: [PATCH 1/9] Bump version to 7.7.11 --- src/SolutionInfo.cs | 4 ++-- src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index 2f9911bfbe..335d5fb8b8 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -11,5 +11,5 @@ using System.Resources; [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyFileVersion("7.7.10")] -[assembly: AssemblyInformationalVersion("7.7.10")] \ No newline at end of file +[assembly: AssemblyFileVersion("7.7.11")] +[assembly: AssemblyInformationalVersion("7.7.11")] \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index f4a6dd9377..7542e77002 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs @@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration { public class UmbracoVersion { - private static readonly Version Version = new Version("7.7.10"); + private static readonly Version Version = new Version("7.7.11"); /// /// Gets the current version of Umbraco. diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 7e215fca26..e0c7fcec6a 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -1023,9 +1023,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" True True - 7710 + 7711 / - http://localhost:7710 + http://localhost:7711 False False From 4a8730b925e94e029d9a26d82dc612ef058b18ac Mon Sep 17 00:00:00 2001 From: Sebastiaan Jansssen Date: Thu, 1 Mar 2018 16:45:38 +0100 Subject: [PATCH 2/9] U4-10891 Color Picker Cannot read property 'hasOwnProperty' of null --- .../views/propertyeditors/colorpicker/colorpicker.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js index 7d847dbc83..5230f9ef2c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js @@ -15,7 +15,7 @@ function ColorPickerController($scope) { $scope.toggleItem = function (color) { - var currentColor = $scope.model.value.hasOwnProperty("value") + var currentColor = ($scope.model.value && $scope.model.value.hasOwnProperty("value")) ? $scope.model.value.value : $scope.model.value; From 7c264b4da001146900584683fe04f69eb053e422 Mon Sep 17 00:00:00 2001 From: Claus Date: Fri, 23 Mar 2018 11:57:29 +0100 Subject: [PATCH 3/9] adding using statement to preview file to prevent missing htmlhelper error. --- src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml index 71e9ff36c9..621d542edc 100644 --- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml +++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml @@ -1,4 +1,5 @@ -@inherits System.Web.Mvc.WebViewPage +@using System.Web.Mvc.Html +@inherits System.Web.Mvc.WebViewPage @{ var disableDevicePreview = Model.DisableDevicePreview.ToString().ToLowerInvariant(); } From 89c376f77a5f4b5f738916b265bf288e16ba0549 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 26 Mar 2018 20:08:11 +1100 Subject: [PATCH 4/9] adds ValueTuple reference to nuspec --- build/NuSpecs/UmbracoCms.Core.nuspec | 1 + 1 file changed, 1 insertion(+) diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 6425c306ea..1b0e082aa8 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -39,6 +39,7 @@ + From 28a0e303151a36b2622d34faa8fa5f6b88de4273 Mon Sep 17 00:00:00 2001 From: Dave Woestenborghs Date: Fri, 30 Mar 2018 11:20:41 +0200 Subject: [PATCH 5/9] U4-11164 fixed blank screen for about 30 seconds after logging in. Because of q.all we don't need to wait until promise is resolved, because all promises are resolved when this is hit --- .../src/common/services/user.service.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js index eda46fbb71..a66fd80c5e 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js @@ -278,7 +278,7 @@ angular.module('umbraco.services') /** Loads the Moment.js Locale for the current user. */ loadMomentLocaleForCurrentUser: function () { - var deferred = $q.defer(); + function loadLocales(currentUser, supportedLocales) { @@ -295,11 +295,9 @@ angular.module('umbraco.services') } } assetsService.load(localeUrls).then(function () { - deferred.resolve(localeUrls); + }); - } else { - deferred.resolve(['']); - } + } } var promises = { @@ -307,11 +305,11 @@ angular.module('umbraco.services') supportedLocales: javascriptLibraryService.getSupportedLocalesForMoment() } - $q.all(promises).then(function (values) { - loadLocales(values.currentUser, values.supportedLocales); + return $q.all(promises).then(function (values) { + return loadLocales(values.currentUser, values.supportedLocales); }); - return deferred.promise; + }, From e019c94207136a1491efa27e510a35e7bdc33450 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 3 Apr 2018 10:42:57 +1000 Subject: [PATCH 6/9] changes back to correct version --- src/SolutionInfo.cs | 4 ++-- src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index a3a3080dd3..c21446bf8d 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -11,5 +11,5 @@ using System.Resources; [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyFileVersion("7.11.0")] -[assembly: AssemblyInformationalVersion("7.11.0")] \ No newline at end of file +[assembly: AssemblyFileVersion("7.10.0")] +[assembly: AssemblyInformationalVersion("7.10.0")] \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index 7eca275901..9268cbbd91 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs @@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration { public class UmbracoVersion { - private static readonly Version Version = new Version("7.11.0"); + private static readonly Version Version = new Version("7.10.0"); /// /// Gets the current version of Umbraco. diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 1577442ede..fe8fb807d4 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -1035,9 +1035,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" True True - 7110 + 7100 / - http://localhost:7110 + http://localhost:7100 False False From a27ea994b7bfcb5b078355a1231abdd546025474 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 3 Apr 2018 10:59:55 +1000 Subject: [PATCH 7/9] updates the loadMomentLocaleForCurrentUser to always return a promise --- .../src/common/services/user.service.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js index a66fd80c5e..3eed77f535 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js @@ -294,10 +294,15 @@ angular.module('umbraco.services') localeUrls.push('lib/moment/' + majorLocale); } } - assetsService.load(localeUrls).then(function () { - - }); - } + return assetsService.load(localeUrls); + } + else { + //return a noop promise + var deferred = $q.defer(); + var promise = deferred.promise; + deferred.resolve(true); + return promise; + } } var promises = { From e77ebc0c1c772136b32681dd219b594b39a30a66 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 3 Apr 2018 11:27:53 +1000 Subject: [PATCH 8/9] Fixes all references to assetsService.load* that do not pass in a required scope object and changes assets.service to always use the $rootScope of an explicit scope is not passed --- .../components/umbaceeditor.directive.js | 2 +- .../components/umbclipboard.directive.js | 2 +- .../components/umbdatetimepicker.directive.js | 4 +-- .../src/common/services/assets.service.js | 32 ++++++++----------- .../src/common/services/user.service.js | 4 +-- .../dialogs/approvedcolorpicker.controller.js | 8 ++--- .../dashboard/dashboard.tabs.controller.js | 2 +- .../partialviewmacros/edit.controller.js | 4 +-- .../src/views/partialviews/edit.controller.js | 2 +- .../multicolorpicker.controller.js | 2 +- .../datepicker/datepicker.controller.js | 2 +- .../googlemaps/googlemaps.controller.js | 4 +-- .../markdowneditor.controller.js | 2 +- .../rte/rte.prevalues.controller.js | 4 +-- .../slider/slider.controller.js | 4 +-- .../propertyeditors/tags/tags.controller.js | 2 +- .../src/views/scripts/edit.controller.js | 4 +-- .../src/views/templates/edit.controller.js | 2 +- 18 files changed, 39 insertions(+), 47 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js index 40a1a2cc6d..ca389a74a7 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js @@ -125,7 +125,7 @@ function link(scope, el, attr, ngModel) { // Load in ace library - assetsService.load(['lib/ace-builds/src-min-noconflict/ace.js', 'lib/ace-builds/src-min-noconflict/ext-language_tools.js']).then(function () { + assetsService.load(['lib/ace-builds/src-min-noconflict/ace.js', 'lib/ace-builds/src-min-noconflict/ext-language_tools.js'], scope).then(function () { if (angular.isUndefined(window.ace)) { throw new Error('ui-ace need ace to work... (o rly?)'); } else { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbclipboard.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbclipboard.directive.js index bb49a60eca..575b5bd698 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbclipboard.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbclipboard.directive.js @@ -101,7 +101,7 @@ var clipboard; var target = element[0]; - assetsService.loadJs("lib/clipboard/clipboard.min.js") + assetsService.loadJs("lib/clipboard/clipboard.min.js", scope) .then(function () { if(scope.umbClipboardTarget) { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js index 7047fdb0a2..19ab789363 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js @@ -92,10 +92,10 @@ Use this directive to render a date time picker scope.hasTranscludedContent = element.find('.js-datePicker__transcluded-content')[0].children.length > 0; // load css file for the date picker - assetsService.loadCss('lib/datetimepicker/bootstrap-datetimepicker.min.css'); + assetsService.loadCss('lib/datetimepicker/bootstrap-datetimepicker.min.css', scope); // load the js file for the date picker - assetsService.loadJs('lib/datetimepicker/bootstrap-datetimepicker.js').then(function () { + assetsService.loadJs('lib/datetimepicker/bootstrap-datetimepicker.js', scope).then(function () { // init date picker initDatePicker(); }); diff --git a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js index 16330f5493..3b49df10a6 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js @@ -129,14 +129,12 @@ angular.module('umbraco.services') asset.state = "loading"; LazyLoad.css(appendRnd(path), function () { if (!scope) { - asset.state = "loaded"; - asset.deferred.resolve(true); - } else { - asset.state = "loaded"; - angularHelper.safeApply(scope, function () { - asset.deferred.resolve(true); - }); + scope = $rootScope; } + asset.state = "loaded"; + angularHelper.safeApply(scope, function () { + asset.deferred.resolve(true); + }); }); } else if (asset.state === "loaded") { asset.deferred.resolve(true); @@ -171,14 +169,12 @@ angular.module('umbraco.services') LazyLoad.js(appendRnd(path), function () { if (!scope) { - asset.state = "loaded"; - asset.deferred.resolve(true); - } else { - asset.state = "loaded"; - angularHelper.safeApply(scope, function () { - asset.deferred.resolve(true); - }); + scope = $rootScope; } + asset.state = "loaded"; + angularHelper.safeApply(scope, function () { + asset.deferred.resolve(true); + }); }); } else if (asset.state === "loaded") { @@ -234,8 +230,7 @@ angular.module('umbraco.services') assets.push(asset); } - //we need to always push to the promises collection to monitor correct - //execution + //we need to always push to the promises collection to monitor correct execution promises.push(asset.deferred.promise); } }); @@ -256,8 +251,7 @@ angular.module('umbraco.services') function assetLoaded(asset) { asset.state = "loaded"; if (!scope) { - asset.deferred.resolve(true); - return; + scope = $rootScope; } angularHelper.safeApply(scope, function () { @@ -280,4 +274,4 @@ angular.module('umbraco.services') }; return service; -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js index 3eed77f535..80565c23e3 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js @@ -278,8 +278,6 @@ angular.module('umbraco.services') /** Loads the Moment.js Locale for the current user. */ loadMomentLocaleForCurrentUser: function () { - - function loadLocales(currentUser, supportedLocales) { var locale = currentUser.locale.toLowerCase(); @@ -294,7 +292,7 @@ angular.module('umbraco.services') localeUrls.push('lib/moment/' + majorLocale); } } - return assetsService.load(localeUrls); + return assetsService.load(localeUrls, $rootScope); } else { //return a noop promise diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js index 95a39e04aa..5e5363ae6c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js @@ -1,6 +1,6 @@ angular.module("umbraco") .controller("Umbraco.Dialogs.ApprovedColorPickerController", function ($scope, $http, umbPropEditorHelper, assetsService) { - assetsService.loadJs("lib/cssparser/cssparser.js") + assetsService.loadJs("lib/cssparser/cssparser.js", $scope) .then(function () { var cssPath = $scope.dialogData.cssPath; @@ -19,7 +19,7 @@ angular.module("umbraco") $scope.classes.splice(0, 0, "noclass"); }) - assetsService.loadCss("/App_Plugins/Lecoati.uSky.Grid/lib/uSky.Grid.ApprovedColorPicker.css"); - assetsService.loadCss(cssPath); + assetsService.loadCss("/App_Plugins/Lecoati.uSky.Grid/lib/uSky.Grid.ApprovedColorPicker.css", $scope); + assetsService.loadCss(cssPath, $scope); }); -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js index 2cb4e7be50..a57078bc9e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js @@ -95,7 +95,7 @@ function startUpDynamicContentController($timeout, dashboardResource, assetsServ })); //proxy remote css through the local server - assetsService.loadCss( dashboardResource.getRemoteDashboardCssUrl("content") ); + assetsService.loadCss(dashboardResource.getRemoteDashboardCssUrl("content"), $scope); dashboardResource.getRemoteDashboardContent("content").then( function (data) { diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js index 8b326db4f5..266bc3264b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js @@ -249,7 +249,7 @@ function init() { //we need to load this somewhere, for now its here. - assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css"); + assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css", $scope); if ($routeParams.create) { @@ -355,4 +355,4 @@ } angular.module("umbraco").controller("Umbraco.Editors.PartialViewMacros.EditController", partialViewMacrosEditController); -})(); \ No newline at end of file +})(); diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js index d10c0e23be..960549aabf 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js @@ -242,7 +242,7 @@ function init() { //we need to load this somewhere, for now its here. - assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css"); + assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css", $scope); if ($routeParams.create) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js index dd25741aeb..98e649729c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js @@ -105,5 +105,5 @@ }; //load the separate css for the editor to avoid it blocking our js loading - assetsService.loadCss("lib/spectrum/spectrum.css"); + assetsService.loadCss("lib/spectrum/spectrum.css", $scope); }); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js index 6c1e596014..1e0493e8f1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js @@ -112,7 +112,7 @@ function dateTimePickerController($scope, notificationsService, assetsService, a //get the current user to see if we can localize this picker userService.getCurrentUser().then(function (user) { - assetsService.loadCss('lib/datetimepicker/bootstrap-datetimepicker.min.css').then(function() { + assetsService.loadCss('lib/datetimepicker/bootstrap-datetimepicker.min.css', $scope).then(function() { var filesToLoad = ["lib/datetimepicker/bootstrap-datetimepicker.js"]; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.controller.js index 1d6261c10a..f32c188d63 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.controller.js @@ -2,7 +2,7 @@ angular.module("umbraco") .controller("Umbraco.PropertyEditors.GoogleMapsController", function ($element, $rootScope, $scope, notificationsService, dialogService, assetsService, $log, $timeout) { - assetsService.loadJs('https://www.google.com/jsapi') + assetsService.loadJs('https://www.google.com/jsapi', $scope) .then(function () { google.load("maps", "3", { @@ -94,4 +94,4 @@ angular.module("umbraco") //update the display val again if it has changed from the server initMap(); }; - }); \ No newline at end of file + }); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js index 7a3abdd0e6..155fa3d854 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js @@ -74,7 +74,7 @@ function MarkdownEditorController($scope, $element, assetsService, dialogService }); //load the seperat css for the editor to avoid it blocking our js loading TEMP HACK - assetsService.loadCss("lib/markdown/markdown.css"); + assetsService.loadCss("lib/markdown/markdown.css", $scope); }) } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js index 65a62f599c..e1c9ce9ba2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js @@ -117,5 +117,5 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.RteController", }); // load TinyMCE skin which contains css for font-icons - assetsService.loadCss("lib/tinymce/skins/umbraco/skin.min.css"); - }); \ No newline at end of file + assetsService.loadCss("lib/tinymce/skins/umbraco/skin.min.css", $scope); + }); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js index 321ac13555..95b74a2ced 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js @@ -211,7 +211,7 @@ }); //load the separate css for the editor to avoid it blocking our js loading - assetsService.loadCss("lib/slider/bootstrap-slider.css"); - assetsService.loadCss("lib/slider/bootstrap-slider-custom.css"); + assetsService.loadCss("lib/slider/bootstrap-slider.css", $scope); + assetsService.loadCss("lib/slider/bootstrap-slider-custom.css", $scope); } angular.module("umbraco").controller("Umbraco.PropertyEditors.SliderController", sliderController); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js index a1e48bbc99..06365d0483 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js @@ -7,7 +7,7 @@ angular.module("umbraco") $scope.isLoading = true; $scope.tagToAdd = ""; - assetsService.loadJs("lib/typeahead.js/typeahead.bundle.min.js").then(function () { + assetsService.loadJs("lib/typeahead.js/typeahead.bundle.min.js", $scope).then(function () { $scope.isLoading = false; diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js index c284100cb2..68fd2d0107 100644 --- a/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/scripts/edit.controller.js @@ -92,7 +92,7 @@ function init() { //we need to load this somewhere, for now its here. - assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css"); + assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css", $scope); if ($routeParams.create) { codefileResource.getScaffold("scripts", $routeParams.id).then(function (script) { @@ -199,4 +199,4 @@ } angular.module("umbraco").controller("Umbraco.Editors.Scripts.EditController", ScriptsEditController); -})(); \ No newline at end of file +})(); diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js index 5d2129668e..36f64c11ee 100644 --- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js @@ -105,7 +105,7 @@ vm.init = function () { //we need to load this somewhere, for now its here. - assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css"); + assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css", $scope); //load templates - used in the master template picker templateResource.getAll() From 047a05cfb3b606ec74aeccaee4cc68ce74dc776e Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 3 Apr 2018 11:38:13 +1000 Subject: [PATCH 9/9] bumps version --- src/SolutionInfo.cs | 4 ++-- src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index c21446bf8d..0f6528a8b8 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -11,5 +11,5 @@ using System.Resources; [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyFileVersion("7.10.0")] -[assembly: AssemblyInformationalVersion("7.10.0")] \ No newline at end of file +[assembly: AssemblyFileVersion("7.10.1")] +[assembly: AssemblyInformationalVersion("7.10.1")] \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index 9268cbbd91..83303aae57 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs @@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration { public class UmbracoVersion { - private static readonly Version Version = new Version("7.10.0"); + private static readonly Version Version = new Version("7.10.1"); /// /// Gets the current version of Umbraco. diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index fe8fb807d4..a6898806ec 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -1035,9 +1035,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" True True - 7100 + 7101 / - http://localhost:7100 + http://localhost:7101 False False