datatable: put javascript *after* table dom nodes: maybe some browser…

…s trigger initialization code too early
sfermigier · Feb 21, 2013 · e4eab76 · e4eab76
1 parent 75c3fe6
commit e4eab76
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 42 deletions.
diff --git a/yaka/templates/widgets/render_ajax_table.html b/yaka/templates/widgets/render_ajax_table.html
@@ -1,39 +1,3 @@
-  <script>
-    $(document).ready(function() {
-
-      var tbl = $("#{{ view.name }}").dataTable({{ datatable_options|tojson|safe }});
-
-      /* export button: setup url args on click, to match current table filtering */
-      tbl.bind('xhr', $.fn.dataTableSetExportArgs);
-      $('.btn.datatable-export').click(
-          { 'table': tbl.get(0) },
-          function(e) {
-              var tbl = e.data.table;
-              var target = $(e.target);
-              var href = target.attr('href');
-              var params = $.data(tbl, 'current-query-args');
-              window.location = href + '?' + $.param(params);
-              return false;
-          }
-      );
-
-      $(document).bind("keydown", keyDown);
-
-      function keyDown(e) {
-        var code = e.keyCode;
-        // Note: we prevent default keyboard action
-        if (code == 39) {
-          $("li.next a").click();
-          return false;
-        } else if (code == 37) {
-          $("li.prev a").click();
-          return false;
-        }
-        return true;
-      }
-    });
-  </script>
-
   <form>
     {%- if view.show_controls %}
       <div class="btn-group">
@@ -77,4 +41,40 @@
     </table>
   </form>
 
+  <script type="text/javascript">
+    $(document).ready(function() {
+
+      var tbl = $("#{{ view.name }}").dataTable({{ datatable_options|tojson|safe }});
+
+      /* export button: setup url args on click, to match current table filtering */
+      tbl.bind('xhr', $.fn.dataTableSetExportArgs);
+      $('.btn.datatable-export').click(
+          { 'table': tbl.get(0) },
+          function(e) {
+              var tbl = e.data.table;
+              var target = $(e.target);
+              var href = target.attr('href');
+              var params = $.data(tbl, 'current-query-args');
+              window.location = href + '?' + $.param(params);
+              return false;
+          }
+      );
+
+      $(document).bind("keydown", keyDown);
+
+      function keyDown(e) {
+        var code = e.keyCode;
+        // Note: we prevent default keyboard action
+        if (code == 39) {
+          $("li.next a").click();
+          return false;
+        } else if (code == 37) {
+          $("li.prev a").click();
+          return false;
+        }
+        return true;
+      }
+    });
+  </script>
+
 <div style="clear: both;"></div>
diff --git a/yaka/templates/widgets/render_table.html b/yaka/templates/widgets/render_table.html
@@ -1,10 +1,4 @@
 {%- if table %}
-  <script>
-    $(document).ready(function() {
-      {{ js }}
-    });
-  </script>
-
   <form>
     {%- if view.show_controls %}
       <div class="btn-group">
@@ -58,6 +52,13 @@
       </tfoot>
     </table>
   </form>
+
+  <script type="text/javascript">
+    $(document).ready(function() {
+      {{ js }}
+    });
+  </script>
+
 {%- else %}
   No data. {# <a href="new">{{ _("Create new") }}</a>. #}
 {%- endif %}