feature: change template behaviour to allow angular expressions as te…

…mplate-url (close #67)
JohnnyTheTank · Jan 20, 2016 · f719a5e · f719a5e
1 parent b0e4c42
commit f719a5e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 19 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "apiNG",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "homepage": "https://github.com/JohnnyTheTank/apiNG",
   "authors": [
     "Jonathan Hornung <[email protected]>"

diff --git a/dist/aping.js b/dist/aping.js
@@ -1,6 +1,6 @@
 /**
     @name: aping 
-    @version: 1.0.1 (18-01-2016) 
+    @version: 1.0.2 (20-01-2016) 
     @author: Jonathan Hornung <[email protected]> 
     @url: https://github.com/JohnnyTheTank/apiNG 
     @license: MIT
@@ -14,9 +14,8 @@ var apingApp = angular.module('jtt_aping', ['jtt_aping_jsonloader', 'jtt_aping_n
             apingApiKeys: {}
         });
 
-
     }])
-    .directive('aping', ['apingDefaultSettings', 'apingUtilityHelper', function (apingDefaultSettings, apingUtilityHelper) {
+    .directive('aping', ['apingDefaultSettings', 'apingUtilityHelper', '$templateRequest', '$compile', function (apingDefaultSettings, apingUtilityHelper, $templateRequest, $compile) {
         return {
             restrict: 'E',
             replace: 'false',
@@ -31,6 +30,13 @@ var apingApp = angular.module('jtt_aping', ['jtt_aping_jsonloader', 'jtt_aping_n
                 payloadJson: '@',
                 removeDoubles: '@'
             },
+            link: function (scope, element, attrs) {
+                $templateRequest(scope.templateUrl || apingDefaultSettings.templateUrl).then(function (html) {
+                    var template = angular.element(html);
+                    element.append(template);
+                    $compile(template)(scope);
+                });
+            },
             controller: ['$scope', function ($scope) {
                 $scope.results = [];
                 $scope.payload = $scope.payloadJson ? apingUtilityHelper.replaceSingleQuotesAndParseJson($scope.payloadJson) : {};
@@ -147,13 +153,9 @@ var apingApp = angular.module('jtt_aping', ['jtt_aping_jsonloader', 'jtt_aping_n
                 this.apply = function () {
                     $scope.$apply();
                 };
-            }],
-            templateUrl: function (elem, scope) {
-                return scope.templateUrl || apingDefaultSettings.templateUrl;
-            }
+            }]
         };
     }]);
-
 ;"use strict";
 
 angular.module('jtt_aping').service('apingTimeHelper', function () {