fix thanks to @nhardy PR #213

720kb · Jun 20, 2017 · 920b052 · 920b052
1 parent 2e749ee
commit 920b052
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-tooltips",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Angular.js tooltips module.",
   "authors": [
     "Filippo Oretti <filippo.oretti@gmail.com",

diff --git a/dist/angular-tooltips.css b/dist/angular-tooltips.css
@@ -1,12 +1,12 @@
 /*
  * angular-tooltips
- * 1.2.1
+ * 1.2.2
  * 
  * Angular.js tooltips module.
  * http://720kb.github.io/angular-tooltips
  * 
  * MIT license
- * Tue May 23 2017
+ * Tue Jun 20 2017
  */
 @-webkit-keyframes animate-tooltip {
   0% {

diff --git a/dist/angular-tooltips.js b/dist/angular-tooltips.js
@@ -1,12 +1,12 @@
 /*
  * angular-tooltips
- * 1.2.1
+ * 1.2.2
  * 
  * Angular.js tooltips module.
  * http://720kb.github.io/angular-tooltips
  * 
  * MIT license
- * Tue May 23 2017
+ * Tue Jun 20 2017
  */
 /*global angular,window*/
 (function withAngular(angular, window) {
@@ -279,7 +279,7 @@
       }
     };
   }
-  , tooltipDirective = /*@ngInject*/ ['$log', '$http', '$compile', '$timeout', '$controller', '$injector', 'tooltipsConf', '$templateCache', function tooltipDirective($log, $http, $compile, $timeout, $controller, $injector, tooltipsConf, $templateCache) {
+  , tooltipDirective = /*@ngInject*/ ['$log', '$http', '$compile', '$timeout', '$controller', '$injector', 'tooltipsConf', '$templateCache', '$q', function tooltipDirective($log, $http, $compile, $timeout, $controller, $injector, tooltipsConf, $templateCache, $q) {
 
     var linkingFunction = function linkingFunction($scope, $element, $attrs, $controllerDirective, $transcludeFunc) {
 
@@ -541,17 +541,17 @@
 
             var template = $templateCache.get(tooltipTemplateUrl);
 
-            if (typeof template === 'undefined') {
-
-              // How should failing to load the template be handled?
-              template = $http.get(tooltipTemplateUrl).then(function onGetTemplateSuccess(response) {
-
-                return response.data;
-              });
-              $templateCache.put(tooltipTemplateUrl, template);
+            if (typeof template !== 'undefined') {
+              // Wrap template in a Promise so that getTemplate always returns a Promise
+              return $q.resolve(template);
             }
-
-            return template;
+
+            // How should failing to load the template be handled?
+            return $http.get(tooltipTemplateUrl).then(function onGetTemplateSuccess(response) {
+              $templateCache.put(tooltipTemplateUrl, response.data);
+
+              return response.data;
+            });
           }
           , onTooltipTemplateChange = function onTooltipTemplateChange(newValue) {
 

diff --git a/dist/angular-tooltips.js.map b/dist/angular-tooltips.js.map
diff --git a/dist/angular-tooltips.min.css b/dist/angular-tooltips.min.css
diff --git a/dist/angular-tooltips.min.js b/dist/angular-tooltips.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-tooltips",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Angular.js tooltips module.",
   "homepage": "http://720kb.github.io/angular-tooltips",
   "main": "index.js",