Navigator: ability to add interceptors, use dojo.request.registry when loading templates

libs/adstream/navigator/Controller.js

@@ -27,16 +27,20 @@ dojo.declare('adstream.navigator.Controller', [dijit._Widget], {
 		var hash = dojo.hash(),
 			mapped = hash && this.mapper( hash );
 
-		if( !mapped ) {
-			if( adstream.navigator.config.defaultHash )	
-				dojo.hash( adstream.navigator.config.defaultHash ); // Auto-forward to default hash
-		} else if( this._lastLoaded !== hash ) {
-			this._lastLoaded = hash;
-			dojo.when( 
-				mapped.execute( hash, this.domNode ),
-				done, done
-			);
-		}
+		adstream.navigator.core.getInterceptors(hash).then(function(res){
+			if( !mapped ) {
+				if( adstream.navigator.config.defaultHash )
+					dojo.hash( adstream.navigator.config.defaultHash ); // Auto-forward to default hash
+			} else if( this._lastLoaded !== hash ) {
+				this._lastLoaded = hash;
+				dojo.when( 
+					mapped.execute( hash, this.domNode ),
+					done, done
+				);
+			}
+		}, function(newHash){
+			dojo.hash(newHash);
+		})
 
 		function done( result ) {
 			if( result instanceof Error )

libs/adstream/navigator/core.js

@@ -12,14 +12,53 @@ dojo.require( 'adstream.navigator.util' );
 if( !navigator.config )
 	navigator.config = {};
 
-var src_map = [];
+var src_map = [],
+	interceptorFunctions = [];
 
 adstream.navigator.on = function( pattern ) {
 	var e = new MapEntry( pattern );
 	src_map.push( e );
 	return e;
 };
 
+// the interceptor function should return Deffered Object
+adstream.navigator.addInterceptor = function(interceptorFunc){
+	if (interceptorFunc != null) {
+		interceptorFunctions.push(interceptorFunc);
+	}
+
+	return adstream.navigator;
+}
+
+adstream.navigator.core.getInterceptors = function (hash) {
+	var def = new dojo.Deferred(),
+		count = 0,
+		resolveOrContinue = function () {
+			if (interceptorFunctions.length === count) {
+				def.resolve();
+			} else {
+				executeFunc();
+			}
+		},
+		executeFunc = function () {
+			var func = interceptorFunctions[count];
+			func(hash).then(
+				function () {
+					count++;
+					resolveOrContinue();
+				},
+				function (errHash) {
+					console.log(errHash);
+					def.reject(errHash);
+				}
+			);
+		};
+
+	resolveOrContinue();
+
+	return def;
+}
+
 adstream.navigator.core.mapper = function() {
 
 	var map = {}, src = [];

libs/dojox/jtlc/CHT/loader.js

@@ -12,6 +12,7 @@ dojo.provide( 'dojox.jtlc.CHT.loader' );
 dojo.require( 'dojox.jtlc.CHT' );
 dojo.require( 'dojo.i18n' );
 dojo.require( 'dojo.DeferredList' );
+dojo.require( 'dojo.request.registry' );
 
 dojox.jtlc.CHT.loader = (function() {
 
@@ -43,8 +44,8 @@ dojox.jtlc.CHT.loader = (function() {
 			},
 
 			sourceText: function() {
-				return (d.global.preloadedCHT || {})[this.url()] ||
-						d.xhrGet({ url: this.url(), headers: { "X-Requested-With": null } });
+				return (d.global.preloadedCHT || {})[this.url()]
+					|| dojo.request.registry.get(this.url(), {method: 'GET', headers: {'X-Requested-With': null}});
 			}
 		}
 	);