Upgrade DataTables to 1.10.15

chovanecm · May 4, 2017 · 25c50a5 · 25c50a5
1 parent ef7e166
commit 25c50a5
Show file tree

Hide file tree

Showing 45 changed files with 751 additions and 3,458 deletions.
diff --git a/sacredboard/static/css/runs.css b/sacredboard/static/css/runs.css
@@ -76,4 +76,9 @@ tr.shown td.details-control:before {
     border-width: 1.5px;
     z-index: 1;
     padding: 0.5em;
+}
+
+/* Fix DataTables button padding */
+.dataTables_paginate .paginate_button {
+    padding: 0.1px !important;
 }
diff --git a/sacredboard/static/scripts/main.js b/sacredboard/static/scripts/main.js
@@ -5,8 +5,8 @@ var require = {
         jquery: "../vendors/jquery/jquery-3.1.1.min",
         knockout: "../vendors/knockout/knockout-min",
         "datatable": "../vendors/datatables/datatables.min",
-        "datatables.net": "../vendors/datatables/DataTables-1.10.13/js/jquery.dataTables",
-        "datatables-bootstrap" : "../vendors/datatables/DataTables-1.10.13/js/dataTables.bootstrap",
+        "datatables.net": "../vendors/datatables/DataTables-1.10.15/js/jquery.dataTables",
+        "datatables-bootstrap" : "../vendors/datatables/DataTables-1.10.15/js/dataTables.bootstrap",
         bootstrap: "../vendors/bootstrap/js/bootstrap.min",
         "text": "../vendors/text"
 
@@ -15,5 +15,4 @@ var require = {
         "bootstrap" : { "deps" :["jquery"]},
         "datatables": { "deps": ["jquery", "datatables.net", "datatables-bootstrap"]}
     }
-};
-
+};
diff --git a/sacredboard/static/scripts/tests/node_tests.js b/sacredboard/static/scripts/tests/node_tests.js
@@ -5,20 +5,20 @@ requirejs.config({
     /**
      * Paths must be kept in sync with main.js
      */
-    paths: {
+ paths: {
         jquery: "../vendors/jquery/jquery-3.1.1.min",
         knockout: "../vendors/knockout/knockout-min",
-        datatables: "../vendors/datatables/datatables.min",
-        "datatables.net": "../vendors/datatables/DataTables-1.10.13/js/jquery.dataTables",
-        "datatables-bootstrap": "../vendors/datatables/DataTables-1.10.13/js/dataTables.bootstrap",
+        "datatable": "../vendors/datatables/datatables.min",
+        "datatables.net": "../vendors/datatables/DataTables-1.10.15/js/jquery.dataTables",
+        "datatables-bootstrap" : "../vendors/datatables/DataTables-1.10.15/js/dataTables.bootstrap",
         bootstrap: "../vendors/bootstrap/js/bootstrap.min",
-        text: "../vendors/text"
+        "text": "../vendors/text"
+
     },
-    shim: {
-        "bootstrap": {"deps": ["jquery"]},
-        "datatables": {"deps": ["jquery", "datatables.net", "datatables-bootstrap"]}
+    shim : {
+        "bootstrap" : { "deps" :["jquery"]},
+        "datatables": { "deps": ["jquery", "datatables.net", "datatables-bootstrap"]}
     }
-});
 /**
  @typedef {{async:async, equal:equal, deepEqual:deepEqual, notEqual:notEqual, notOk:notOk, ok:ok, throws:throws}} QAssert
  */

diff --git a/sacredboard/static/vendors/datatables/DataTables-1.10.13/css/jquery.dataTables.min.css b/sacredboard/static/vendors/datatables/DataTables-1.10.13/css/jquery.dataTables.min.css
diff --git a/...bles-1.10.13/css/dataTables.bootstrap.css → ...bles-1.10.15/css/dataTables.bootstrap.css b/...bles-1.10.13/css/dataTables.bootstrap.css → ...bles-1.10.15/css/dataTables.bootstrap.css
@@ -117,22 +117,22 @@ div.dataTables_scrollHead table.dataTable {
   margin-bottom: 0 !important;
 }
 
-div.dataTables_scrollBody table {
+div.dataTables_scrollBody > table {
   border-top: none;
   margin-top: 0 !important;
   margin-bottom: 0 !important;
 }
-div.dataTables_scrollBody table thead .sorting:after,
-div.dataTables_scrollBody table thead .sorting_asc:after,
-div.dataTables_scrollBody table thead .sorting_desc:after {
+div.dataTables_scrollBody > table > thead .sorting:after,
+div.dataTables_scrollBody > table > thead .sorting_asc:after,
+div.dataTables_scrollBody > table > thead .sorting_desc:after {
   display: none;
 }
-div.dataTables_scrollBody table tbody tr:first-child th,
-div.dataTables_scrollBody table tbody tr:first-child td {
+div.dataTables_scrollBody > table > tbody > tr:first-child > th,
+div.dataTables_scrollBody > table > tbody > tr:first-child > td {
   border-top: none;
 }
 
-div.dataTables_scrollFoot table {
+div.dataTables_scrollFoot > table {
   margin-top: 0 !important;
   border-top: none;
 }