Fix issues

Author: artem-dudarev

src/VirtoCommerce.Platform.Web/wwwroot/js/app/navigation/blade/bladeContainer.tpl.html

@@ -42,7 +42,7 @@
             </div>
 
             <div class="blade-header">
-                <i ng-if="!blade.currentEntity.iconUrl && !blade.iconUrl" ng-class="blade.headIcon ? blade.headIcon : 'fa fa-folder'" class="blade-header__icon"></i>
+                <span ng-if="!blade.iconUrl && !blade.currentEntity.iconUrl" ng-class="blade.headIcon ? blade.headIcon : 'fa fa-folder'" class="blade-header__icon"></span>
 
                 <img ng-if="blade.iconUrl || blade.currentEntity.iconUrl" ng-src="{{ blade.iconUrl || blade.currentEntity.iconUrl }}" fallback-src="{{ blade.fallbackIconUrl }}" class="blade-header__img" />
 

src/VirtoCommerce.Platform.Web/wwwroot/js/app/security/login/headerUserProfileWidget.js

@@ -1,5 +1,6 @@
 angular.module('platformWebApp')
-    .directive('vaHeaderUserProfileWidget', ['$document', '$state', 'platformWebApp.authService', 'platformWebApp.dialogService', 'platformWebApp.login', 'platformWebApp.userProfileIconService',
+    .directive('vaHeaderUserProfileWidget', [
+        '$document', '$state', 'platformWebApp.authService', 'platformWebApp.dialogService', 'platformWebApp.login', 'platformWebApp.userProfileIconService',
         function ($document, $state, authService, dialogService, loginResources, userProfileIconService) {
 
             return {
@@ -71,7 +72,7 @@ angular.module('platformWebApp')
                     });
 
                     scope.$watch(function () {
-                        return userProfileIconService.iconUrlChanging;
+                        return userProfileIconService.iconUrlChanged;
                     }, function () {
                         scope.userIconUrl = userProfileIconService.getUserIconUrl();
                     });

src/VirtoCommerce.Platform.Web/wwwroot/js/app/security/services/auth.js

@@ -1,5 +1,7 @@
 angular.module('platformWebApp')
-    .factory('platformWebApp.authService', ['$http', '$rootScope', '$interpolate', '$q', '$window', 'platformWebApp.authDataStorage', 'platformWebApp.externalSignInStorage', function ($http, $rootScope, $interpolate, $q, $window, authDataStorage, externalSignInStorage) {
+    .factory('platformWebApp.authService', [
+        '$http', '$rootScope', '$interpolate', '$q', '$window', 'platformWebApp.authDataStorage', 'platformWebApp.externalSignInStorage',
+        function ($http, $rootScope, $interpolate, $q, $window, authDataStorage, externalSignInStorage) {
     var serviceBase = 'api/platform/security/';
     var authContext = {
         userId: null,

src/VirtoCommerce.Platform.Web/wwwroot/js/app/userProfile/blades/userProfile.js

@@ -1,5 +1,8 @@
 angular.module('platformWebApp')
-    .controller('platformWebApp.userProfile.userProfileController', ['$rootScope', '$scope', 'platformWebApp.i18n', 'platformWebApp.userProfile', 'platformWebApp.common.languages', 'platformWebApp.common.locales', 'platformWebApp.common.timeZones', 'platformWebApp.userProfileApi', 'platformWebApp.userProfileIconService',
+    .controller('platformWebApp.userProfile.userProfileController', [
+        '$rootScope', '$scope',
+        'platformWebApp.i18n', 'platformWebApp.userProfile', 'platformWebApp.common.languages', 'platformWebApp.common.locales', 'platformWebApp.common.timeZones',
+        'platformWebApp.userProfileApi', 'platformWebApp.userProfileIconService',
         function ($rootScope, $scope, i18n, userProfile, languages, locales, timeZones, userProfileApi, userProfileIconService) {
             var blade = $scope.blade;
             blade.headIcon = 'fa fa-user';
@@ -116,7 +119,7 @@ angular.module('platformWebApp')
             }
 
             $scope.$watch(function () {
-                return userProfileIconService.iconUrlChanging;
+                return userProfileIconService.iconUrlChanged;
             }, function () {
                 blade.iconUrl = userProfileIconService.getUserIconUrl();
             });

src/VirtoCommerce.Platform.Web/wwwroot/js/app/userProfile/services/userProfileIconService.js

@@ -12,7 +12,7 @@ angular.module('platformWebApp')
     });
 
     var service = {
-        iconUrlChanging: false,
+        iconUrlChanged: Date.now(),
         setUserIconUrl: setUserIconUrl,
         getUserIconUrl: function () {
             return userIconUrl;
@@ -22,7 +22,7 @@ angular.module('platformWebApp')
     function setUserIconUrl (memberId, url) {
         if (currentMemberId === memberId) {
             userIconUrl = url;
-            service.iconUrlChanging = !service.iconUrlChanging;
+            service.iconUrlChanged = Date.now();
         }
     }