Updated production assets

# Conflicts:
#	public/js/build/app.js
#	public/js/dist/all.js

public/mix-manifest.json

@@ -1,38 +1,21 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=943f157c3577009c5169",
+    "/js/build/app.js": "/js/build/app.js",
-    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=5d8ce6b758f170008cd6",
+    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css",
-    "/css/build/app.css": "/css/build/app.css?id=9b6ddbece1a3cfc99036",
+    "/css/build/app.css": "/css/build/app.css",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=0a65220cdae6fbb6d913",
+    "/css/build/overrides.css": "/css/build/overrides.css",
-    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=a5c05d669800b5f5afa1",
+    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css",
-    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=1d5974e034b61b5795ec",
+    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css",
-    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=cf23e72b9c963c5ab23a",
+    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css",
-    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=76d0cc15e24e6a03fd2f",
+    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=97a05b4e3c6f0e31b895",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css",
-    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=d3c953fe66305cef3b54",
+    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=c2d8517bfd68b3bf3509",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=51a2ad946665800523fb",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css",
-    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=56d008e86c006d37bc23",
+    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=7af6dbd5a265f3fe205e",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css",
-    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=2b17e31c820ef66db5a1",
+    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=36169e10a1d74507c371",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=86ff7070f892baa764c7",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=f12f9af189df0ff1c615",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css",
-    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=4bf9e22405edb2dc2b76",
+    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css"
-    "/css/dist/all.css": "/css/dist/all.css?id=fc64989106daf3be016b",
-    "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
-    "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=97a05b4e3c6f0e31b895",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=c2d8517bfd68b3bf3509",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=86ff7070f892baa764c7",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=36169e10a1d74507c371",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=51a2ad946665800523fb",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=7af6dbd5a265f3fe205e",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=f12f9af189df0ff1c615",
-    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=cf23e72b9c963c5ab23a",
-    "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
-    "/css/build/signature-pad.min.css": "/css/build/signature-pad.min.css?id=d41d8cd98f00b204e980",
-    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=1e77fde04b3f42432581",
-    "/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b",
-    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=58d95c93430f2ae33392",
-    "/js/dist/all.js": "/js/dist/all.js?id=2ffa95a382ca85aa4a5f"
 }

resources/assets/js/snipeit_modals.js

@@ -159,6 +159,58 @@ $(function () {
   });
 });
 
+function formatDatalistSafe(datalist) {
+    // console.warn("What in the hell is going on with Select2?!?!!?!?");
+    // console.warn($.select2);
+    if (datalist.loading) {
+        return $('<i class="fa fa-spinner fa-spin" aria-hidden="true"></i> Loading...');
+    }
+
+    var root_div = $("<div class='clearfix'>") ;
+    var left_pull = $("<div class='pull-left' style='padding-right: 10px;'>");
+    if (datalist.image) {
+        var inner_div = $("<div style='width: 30px;'>");
+        /******************************************************************
+         * 
+         * We are specifically chosing empty alt-text below, because this 
+         * image conveys no additional information, relative to the text
+         * that will *always* be there in any select2 list that is in use
+         * in Snipe-IT. If that changes, we would probably want to change
+         * some signatures of some functions, but right now, we don't want
+         * screen readers to say "HP SuperJet 5000, .... picture of HP 
+         * SuperJet 5000..." and so on, for every single row in a list of
+         * assets or models or whatever.
+         * 
+         *******************************************************************/
+        var img = $("<img src='' style='max-height: 20px; max-width: 30px;' alt=''>");
+        // console.warn("Img is: ");
+        // console.dir(img);
+        // console.warn("Strigularly, that's: ");
+        // console.log(img);
+        img.attr("src", datalist.image );
+        inner_div.append(img)
+    } else {
+        var inner_div=$("<div style='height: 20px; width: 30px;'></div>");
+    }
+    left_pull.append(inner_div);
+    root_div.append(left_pull);
+    var name_div = $("<div>");
+    name_div.text(datalist.text);
+    root_div.append(name_div)
+    var safe_html = root_div.get(0).outerHTML;
+    var old_html = formatDatalist(datalist);
+    if(safe_html != old_html) {
+        console.log("HTML MISMATCH: ");
+        console.log("FormatDatalistSafe: ");
+        // console.dir(root_div.get(0));
+        console.log(safe_html);
+        console.log("FormatDataList: ");
+        console.log(old_html);
+    }
+    return root_div;
+
+}
+
 function formatDatalist (datalist) {
     var loading_markup = '<i class="fa fa-spinner fa-spin" aria-hidden="true"></i> Loading...';
     if (datalist.loading) {