From 4218ac6880420b223c83eeb8ced7249aa8129110 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Thu, 7 Nov 2013 02:43:48 +0100
Subject: [PATCH] fix / simplify ip detection javascript

use .ready() instead of first delay
merge script blocks
---
 nsupdate/templates/base.html | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/nsupdate/templates/base.html b/nsupdate/templates/base.html
index 2747d21..3842323 100644
--- a/nsupdate/templates/base.html
+++ b/nsupdate/templates/base.html
@@ -121,26 +121,17 @@
         </div>
         <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.1/js/bootstrap.min.js"></script>
         <div id="ip_detection" style="display: none">
-            {% if not request.session.ipv4 %}
-                <script type="text/javascript">
-                    function insert_img_ipv4() {
-                        $('#ip_detection').add(
-                            '<img src="//{{ WWW_IPV4_HOST }}/detectip/{{ request.session.session_key }}/" >');
-                    }
-                    $(setTimeout("insert_img_ipv4()", 1000));
-                </script>
-            {% endif %}
-            {% if not request.session.ipv6 %}
-                <script type="text/javascript">
-                    function insert_img_ipv6() {
-                        $('#ip_detection').add(
-                            '<img src="//{{ WWW_IPV6_HOST }}/detectip/{{ request.session.session_key }}/" >');
-                    }
-                    $(setTimeout("insert_img_ipv6()", 1000));
-                </script>
-            {% endif %}
             {% if not request.session.ipv4 or not request.session.ipv6 %}
                 <script type="text/javascript">
+                $(document).ready(function() {
+                    {% if not request.session.ipv4 %}
+                        $('#ip_detection').add(
+                            '<img src="//{{ WWW_IPV4_HOST }}/detectip/{{ request.session.session_key }}/" >');
+                    {% endif %}
+                    {% if not request.session.ipv6 %}
+                        $('#ip_detection').add(
+                            '<img src="//{{ WWW_IPV6_HOST }}/detectip/{{ request.session.session_key }}/" >');
+                    {% endif %}
                     function insert_ips() {
                         $.getJSON("{%  url 'ajax_get_ips' %}")
                         .done(function(data) {
@@ -148,7 +139,8 @@
                             $('#ipv6').text(data['ipv6']);
                         });
                     }
-                    $(setTimeout("insert_ips()", 2000));
+                    setTimeout(insert_ips, 1000);
+                });
                 </script>
             {% endif %}
         </div>