Fixes: U4-4592 U7.1 - You can trigger a lot "Unsaved changes" bars

perploug · perploug · commit 807778a737d9 · 2014-04-03T11:50:50.000+02:00
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
@@ -70,9 +70,11 @@ function valFormManager(serverValidationManager, $rootScope, $log, $timeout, not
                             path = decodeURIComponent(path);
                         }
 
-                        var msg = { view: "confirmroutechange", args: { path: path, listener: locationEvent } };
-                        notificationsService.add(msg);
-
+                        if(!notificationsService.hasView()){
+                            var msg = { view: "confirmroutechange", args: { path: path, listener: locationEvent } };
+                            notificationsService.add(msg);
+                        }
+                        
                         event.preventDefault();
                     }
                     
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js b/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js
@@ -25,6 +25,18 @@ angular.module('umbraco.services')
 .factory('notificationsService', function ($rootScope, $timeout, angularHelper) {
 
 	var nArray = [];
+	function setViewPath(view){
+		if(view.indexOf('/') < 0)
+		{
+			view = "views/common/notifications/" + view;
+		}
+
+		if(view.indexOf('.html') < 0)
+		{
+			view = view + ".html";
+		}
+		return view;
+	}
 
 	var service = {
 
@@ -50,16 +62,7 @@ angular.module('umbraco.services')
 			angularHelper.safeApply($rootScope, function () {
 
 				if(item.view){
-					if(item.view.indexOf('/') < 0)
-					{
-						item.view = "views/common/notifications/" + item.view;
-					}
-
-					if(item.view.indexOf('.html') < 0)
-					{
-						item.view = item.view + ".html";
-					}
-
+					item.view = setViewPath(item.view);
 					item.sticky = true;
 					item.type = "form";
 					item.headline = null;
@@ -100,6 +103,14 @@ angular.module('umbraco.services')
 
 		},
 
+		hasView : function(view){
+			if(!view){
+				return _.find(nArray, function(notification){ return notification.view;});
+			}else{
+				view = setViewPath(view).toLowerCase();
+				return _.find(nArray, function(notification){ return notification.view.toLowerCase() === view;});
+			}	
+		},
 		addView: function(view, args){
 			var item = {
 				args: args,

Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,11 @@ function valFormManager(serverValidationManager, $rootScope, $log, $timeout, not`
`70`	`70`	`path = decodeURIComponent(path);`
`71`	`71`	`}`
`72`	`72`
`73`		`- var msg = { view: "confirmroutechange", args: { path: path, listener: locationEvent } };`
`74`		`- notificationsService.add(msg);`
`75`		`-`
	`73`	`+ if(!notificationsService.hasView()){`
	`74`	`+ var msg = { view: "confirmroutechange", args: { path: path, listener: locationEvent } };`
	`75`	`+ notificationsService.add(msg);`
	`76`	`+ }`
	`77`	`+`
`76`	`78`	`event.preventDefault();`
`77`	`79`	`}`
`78`	`80`