feat($templateFactory): use $templateRequest on 1.3

Fixes #1882
angular-ui · Apr 21, 2015 · a8b529b · a8b529b
1 parent 0250291
commit a8b529b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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; });
   };
 
   /**