From a8b529b49e0bd42961b348c959eaa69f7856531a Mon Sep 17 00:00:00 2001 From: Nate Abele Date: Tue, 21 Apr 2015 13:04:38 -0400 Subject: [PATCH] feat($templateFactory): use $templateRequest on 1.3 Fixes #1882 --- Gruntfile.js | 2 +- src/templateFactory.js | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 5ec55ac4a..4dc260e65 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -129,7 +129,7 @@ module.exports = function (grunt) { } }); - grunt.registerTask('integrate', ['build', 'jshint', 'karma:unit', 'karma:past', 'karma:unstable']); + grunt.registerTask('integrate', ['build', 'jshint', 'karma:unit', 'karma:past', 'karma:unstable', 'karma:future']); grunt.registerTask('default', ['build', 'jshint', 'karma:unit']); grunt.registerTask('build', 'Perform a normal build', ['concat', 'uglify']); grunt.registerTask('dist', 'Perform a clean build', ['clean', 'build']); diff --git a/src/templateFactory.js b/src/templateFactory.js index ca491a987..06c36135e 100644 --- a/src/templateFactory.js +++ b/src/templateFactory.js @@ -12,6 +12,12 @@ $TemplateFactory.$inject = ['$http', '$templateCache', '$injector']; function $TemplateFactory( $http, $templateCache, $injector) { + var $templateRequest = ( + $injector.has && + $injector.has('$templateRequest') && + $injector.get('$templateRequest') + ); + /** * @ngdoc function * @name ui.router.util.$templateFactory#fromConfig @@ -82,9 +88,11 @@ function $TemplateFactory( $http, $templateCache, $injector) { this.fromUrl = function (url, params) { if (isFunction(url)) url = url(params); if (url == null) return null; - else return $http - .get(url, { cache: $templateCache, headers: { Accept: 'text/html' }}) - .then(function(response) { return response.data; }); + + return ($templateRequest && $templateRequest(url) || $http.get(url, { + cache: $templateCache, + headers: { Accept: 'text/html' } + })).then(function(response) { return response.data; }); }; /**