diff --git a/package.json b/package.json index 1d233d41..cb44578e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.4.1-a", + "version": "0.4.1-b", "keywords": [ "Remote Management", "Intel AMT", diff --git a/webserver.js b/webserver.js index c4ca9a6e..abb0759b 100644 --- a/webserver.js +++ b/webserver.js @@ -3667,35 +3667,32 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { if (minify) { p = obj.path.join(obj.parent.webViewsOverridePath, pagename + '-mobile-min'); if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Mobile + Minify + Override document - } else { - p = obj.path.join(obj.parent.webViewsOverridePath, pagename + '-mobile'); - if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Mobile + Override document } + p = obj.path.join(obj.parent.webViewsOverridePath, pagename + '-mobile'); + if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Mobile + Override document } if (minify) { p = obj.path.join(obj.parent.webViewsPath, pagename + '-mobile-min'); if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Mobile + Minify document - } else { - p = obj.path.join(obj.parent.webViewsPath, pagename + '-mobile'); - if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Mobile document } + p = obj.path.join(obj.parent.webViewsPath, pagename + '-mobile'); + if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Mobile document } if (obj.parent.webViewsOverridePath != null) { if (minify) { p = obj.path.join(obj.parent.webViewsOverridePath, pagename + '-min'); if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Minify + Override document - } else { - p = obj.path.join(obj.parent.webViewsOverridePath, pagename); - if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Override document } + p = obj.path.join(obj.parent.webViewsOverridePath, pagename); + if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Override document } if (minify) { p = obj.path.join(obj.parent.webViewsPath, pagename + '-min'); if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Minify document - } else { - p = obj.path.join(obj.parent.webViewsPath, pagename); - if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Default document } + p = obj.path.join(obj.parent.webViewsPath, pagename); + if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Default document + return null; } // Return true if a mobile browser is detected.