From e4a472f9024abace84f08258ab90df4c74d49a15 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 17 Oct 2016 13:32:09 +0200 Subject: [PATCH] fixes: U4-8769 ImageCropper focal points randomly sets to 'null' --- .../components/imaging/umbimagegravity.directive.js | 10 +++++++--- .../directives/components/tabs/umbtabs.directive.js | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js index 2a183564f6..836d998412 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js @@ -118,9 +118,13 @@ angular.module("umbraco.directives") $timeout(function(){ setDimensions(); }); - var offsetX = $overlay[0].offsetLeft; - var offsetY = $overlay[0].offsetTop; - calculateGravity(offsetX, offsetY); + // Make sure we can find the offset values for the overlay(dot) before calculating + // fixes issue with resize event when printing the page (ex. hitting ctrl+p inside the rte) + if($overlay.is(':visible')) { + var offsetX = $overlay[0].offsetLeft; + var offsetY = $overlay[0].offsetTop; + calculateGravity(offsetX, offsetY); + } }); }); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabs.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabs.directive.js index 882372aba9..aa23b80665 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabs.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tabs/umbtabs.directive.js @@ -20,6 +20,8 @@ angular.module("umbraco.directives") var curr = $(event.target); // active tab var prev = $(event.relatedTarget); // previous tab + $scope.$apply(); + for (var c in callbacks) { callbacks[c].apply(this, [{current: curr, previous: prev}]); }