diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-29 16:23:05 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-29 16:23:05 +0100 |
| commit | 6b2e65b750de70e9d5586f86306078f080dd42ba (patch) | |
| tree | 4bd695fe4c94818ad62dbe7dedd67182990f2337 | |
| parent | 03270abcd33477f9ceab904fd7ee87c87774d67a (diff) | |
| download | Ishtar-6b2e65b750de70e9d5586f86306078f080dd42ba.tar.bz2 Ishtar-6b2e65b750de70e9d5586f86306078f080dd42ba.zip | |
JS: on dynamic load force execution of inner scripts
| -rw-r--r-- | ishtar_common/static/js/ishtar.js | 6 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index d54bdd796..0ac0a4e89 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -206,7 +206,11 @@ function dynamic_load(url, target){ success: function(data, textStatus, jqXHR) { $(target).html(jqXHR.responseText); var response = $(jqXHR.responseText); - var responseScript = response.filter("script"); + var responseScript = response.find("script"); + $.each(responseScript, function(idx, val) { + eval(val.text); + } ); + responseScript = response.filter("script"); $.each(responseScript, function(idx, val) { eval(val.text); } ); diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html index c5dea616f..75a7aa542 100644 --- a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html +++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html @@ -236,7 +236,6 @@ var plot_{{unique_id}} = $.jqplot('chart_{{unique_id}}', ); $('#chart_img_{{unique_id}}').show('slow'); }); - } $('#search_{{unique_id}}').click(function (){ @@ -247,6 +246,5 @@ $('#search_{{unique_id}}').click(function (){ }); return false; }); - }); </script> |