Press esc to close splash screen

fix splash page user menu item not having a hand cursor
other icon for splash page user menu item
fix splash screen order

js/custom.js

@@ -1516,7 +1516,7 @@ $(document).on("click", ".testTab", function () {
     if(input.val() !== ''){
         var post = {
             url:input.val()
-        }
+        };
         organizrAPI('POST','api/?v1/test/iframe',post).success(function(data) {
             var html = JSON.parse(data);
             if(html.data == true){
@@ -1540,7 +1540,7 @@ $(document).on("click", ".testEditTab", function () {
     if(input.val() !== ''){
         var post = {
             url:input.val()
-        }
+        };
         organizrAPI('POST','api/?v1/test/iframe',post).success(function(data) {
             var html = JSON.parse(data);
             if(html.data == true){
@@ -1690,26 +1690,29 @@ Mousetrap.bind("c c", function() { closeCurrentTab() });
 Mousetrap.bind("s s", function() { openSettings() });
 Mousetrap.bind("h h", function() { openHomepage() });
 Mousetrap.bind("f f", function() { toggleFullScreen() });
+Mousetrap.bind("esc", function () {
+    $('.splash-screen').removeClass('in').addClass('hidden')
+});
 $(document).on('change', "#new-tab-form-chooseImage", function (e) {
-    var newIcon = $('#new-tab-form-chooseImage').val()
+    var newIcon = $('#new-tab-form-chooseImage').val();
     if(newIcon !== 'Select or type Icon'){
         $('#new-tab-form-inputImageNew').val(newIcon);
     }
 });
 $(document).on('change', "#edit-tab-form-chooseImage", function (e) {
-    var newIcon = $('#edit-tab-form-chooseImage').val()
+    var newIcon = $('#edit-tab-form-chooseImage').val();
     if(newIcon !== 'Select or type Icon'){
         $('#edit-tab-form-inputImage').val(newIcon);
     }
 });
 $(document).on('change', "#new-tab-form-chooseIcon", function (e) {
-    var newIcon = $('#new-tab-form-chooseIcon').val()
+    var newIcon = $('#new-tab-form-chooseIcon').val();
     if(newIcon !== 'Select or type Icon'){
         $('#new-tab-form-inputImageNew').val(newIcon);
     }
 });
 $(document).on('change', "#edit-tab-form-chooseIcon", function (e) {
-    var newIcon = $('#edit-tab-form-chooseIcon').val()
+    var newIcon = $('#edit-tab-form-chooseIcon').val();
     if(newIcon !== 'Select or type Icon'){
         $('#edit-tab-form-inputImage').val(newIcon);
     }

js/functions.js

@@ -1315,6 +1315,7 @@ function buildLockscreen(){
 function buildSplashScreenItem(arrayItems){
     var splashList = '';
     if (Array.isArray(arrayItems['data']['tabs']) && arrayItems['data']['tabs'].length > 0) {
+        arrayItems['data']['tabs'].sort((a, b) => parseFloat(a.order) - parseFloat(b.order));
         $.each(arrayItems['data']['tabs'], function(i,v) {
             if(v.enabled === 1 && v.splash === 1){
                 splashList += `
@@ -1335,7 +1336,7 @@ function buildSplashScreenItem(arrayItems){
 }
 function buildSplashScreen(json){
     var items = buildSplashScreenItem(json);
-    var menu = '<li ><a onclick="$(\'.splash-screen\').removeClass(\'hidden\').addClass(\'in\')"><i class="ti-settings fa-fw"></i> <span lang="en">Splash Page</span></a></li>';
+    var menu = '<li ><a href="javascript:void(0)" onclick="$(\'.splash-screen\').removeClass(\'hidden\').addClass(\'in\')"><i class="ti-layout-grid2 fa-fw"></i> <span lang="en">Splash Page</span></a></li>';
     if(items){
         closeSideMenu();
         console.log("Organizr Function: Adding Splash Screen");
@@ -4373,7 +4374,7 @@ function messageSingle(heading,text,position,color,icon,timeout){
     }
 }
 function blockDev(e) {
-    var evtobj = window.event? event : e
+    var evtobj = window.event ? event : e;
     if (evtobj.keyCode == 73 && evtobj.shiftKey && evtobj.ctrlKey){
         evtobj.preventDefault();
     }

package-lock.json

@@ -0,0 +1,11 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "yuicompressor": {
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/yuicompressor/-/yuicompressor-2.4.8.tgz",
+      "integrity": "sha1-mNJnUfFm49uRmy/j6nz2Qt6ZjYs="
+    }
+  }
+}