[Pkg-javascript-commits] [dojo] 17/41: refs #18155, fix aspect nextId when running multiple versions of Dojo in the same app

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag 1.9.8
in repository dojo.

commit f9e6981f53d9c42cf5a8015b3dac493c87fe670d
Author: Benjamin Santalucia <ben at dojotoolkit-fr.org>
Date:   Fri Sep 11 13:10:22 2015 -0700

    refs #18155, fix aspect nextId when running multiple versions of Dojo in the same app
    
    (cherry picked from commit ea0b4971c6ce363647ff26243fb4e9d957dd8dad)
---
 aspect.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/aspect.js b/aspect.js
index a3af7c6..e136a65 100644
--- a/aspect.js
+++ b/aspect.js
@@ -4,7 +4,7 @@ define([], function(){
 	//		dojo/aspect
 
 	"use strict";
-	var undefined, nextId = 0;
+	var undefined;
 	function advise(dispatcher, type, advice, receiveArguments){
 		var previous = dispatcher[type];
 		var around = type == "around";
@@ -49,7 +49,7 @@ define([], function(){
 						dispatcher = advice = signal.advice = null;
 					}
 				},
-				id: nextId++,
+				id: dispatcher.nextId++,
 				advice: advice,
 				receiveArguments: receiveArguments
 			};
@@ -79,7 +79,7 @@ define([], function(){
 			if(!existing || existing.target != target){
 				// no dispatcher in place
 				target[methodName] = dispatcher = function(){
-					var executionId = nextId;
+					var executionId = dispatcher.nextId;
 					// before advice
 					var args = arguments;
 					var before = dispatcher.before;
@@ -115,6 +115,7 @@ define([], function(){
 					}};
 				}
 				dispatcher.target = target;
+				dispatcher.nextId = dispatcher.nextId || 0;
 			}
 			var results = advise((dispatcher || existing), type, advice, receiveArguments);
 			advice = null;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git