vs wip

AnEmortalKid · Mar 3, 2017 · 7ed1cf8 · 7ed1cf8
1 parent 5a1b83a
commit 7ed1cf8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/vs/css/inventory.min.css b/vs/css/inventory.min.css
diff --git a/vs/inventory.html b/vs/inventory.html
@@ -5,7 +5,7 @@
         <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/zf/jq-2.2.4/dt-1.10.13/datatables.min.css"/>
         <script type="text/javascript" src="https://cdn.datatables.net/v/zf/jq-2.2.4/dt-1.10.13/datatables.min.js"></script>
         <!-- Have to load ours last since we override datatables css -->
-        <link rel="stylesheet" href="css/inventory.css">
+        <link rel="stylesheet" href="css/inventory.min.css">
     </head>
 
     <body>
@@ -126,6 +126,6 @@ <h5 class="underlined" align="center">Carat</h5>
 
     <script src="js/vendor/foundation.min.js"></script>
     <script src="js/vendor/what-input.js"></script>
-    <script src="js/inventory.js"></script>
-    <script src="js/partitioner.js"></script>
+    <script src="js/inventory.min.js"></script>
+    <script src="js/partitioner.min.js"></script>
 </html>
diff --git a/vs/js/inventory.js b/vs/js/inventory.js
@@ -10,16 +10,13 @@ var shapesShown = new Set();
 var labsShown = new Set();
 
 $(document).ready(function() {
-    loadTrustarData();    
+    loadTable();    
 });
 
-function loadTrustarData()
+function loadTable()
 {
-    // http://visionary-site.herokuapp.com/search/trustar
-    // http://localhost:8080/search/trustar/
-    $.get("http://visionary-site.herokuapp.com/search/trustar", function(data){
+    $.get("https://visionary-site.herokuapp.com/search/all", function(data){
 
-        // store it up higher so we can do some functions later
         var response=data;
 
         data_table = $('#inventory').DataTable( {
@@ -67,8 +64,9 @@ function set_default_shapes(shapesArray)
 
     for(shape in shapesArray)
     {
+
         var shapeName = shapesArray[shape];
-        $('input[value="'+shapeName+'"]').prop('checked',true);    
+        $('input[value="' + shapeName + '"]').prop('checked',true);    
         shapesShown.add(shapeName);
     }    
 }

diff --git a/vs/js/inventory.min.js b/vs/js/inventory.min.js
diff --git a/vs/js/partitioner.min.js b/vs/js/partitioner.min.js