fix for template url cache by @kmoroder

720kb · Aug 5, 2016 · f358d40 · f358d40
1 parent 6dda279
commit f358d40
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 24 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-tooltips",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Angular.js tooltips module.",
   "authors": [
     "Filippo Oretti <[email protected]",

diff --git a/dist/angular-tooltips.css b/dist/angular-tooltips.css
diff --git a/dist/angular-tooltips.js b/dist/angular-tooltips.js
@@ -1,12 +1,12 @@
 /*
  * angular-tooltips
- * 1.1.5
+ * 1.1.6
  * 
  * Angular.js tooltips module.
  * http://720kb.github.io/angular-tooltips
  * 
  * MIT license
- * Thu Aug 04 2016
+ * Fri Aug 05 2016
  */
 /*global angular,window*/
 (function withAngular(angular, window) {

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/lib/angular-tooltips.js b/lib/angular-tooltips.js
@@ -570,7 +570,7 @@
             }
           }
           , onTooltipTemplateUrlChange = function onTooltipTemplateUrlChange(newValue) {
-            if (newValue) {
+            if (newValue && !$attrs.tooltipTemplateUrlCache) {
 
               $http.get(newValue).then(function onResponse(response) {
 
@@ -603,17 +603,9 @@
                 tooltipElement.removeClass('_force-hidden'); //see lines below, this forces to hide tooltip when is empty
                 tipTipElement.empty();
                 tipTipElement.append(closeButtonElement);
-                $http.get(newValue).then(function onResponse(response) {
-
-                  if (response &&
-                    response.data) {
-
-                    tipTipElement.append($compile(response.data)(scope));
-                    $timeout(function doLater() {
-
-                      onTooltipShow();
-                    });
-                  }
+                tipTipElement.append($compile(template)(scope));
+                $timeout(function doLater() {
+                  onTooltipShow();
                 });
               }
             } else {

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