' + 'Bike' + '
'); - } else if (type == 'truck') { - $('#licenses').append('' + 'Truck' + '
'); - } else if (type == 'car') { - $('#licenses').append('' + 'Car' + '
'); - } - }); - } + if (type == 'bike') { + $('#licenses').append('' + 'Bike' + '
'); + } + else if (type == 'truck') { + $('#licenses').append('' + 'Truck' + '
'); + } + else if (type == 'car') { + $('#licenses').append('' + 'Car' + '
'); + } + }); + } - $('#id-card').css('background', 'url(assets/images/license.png)'); - } else { - $('#id-card').css('background', 'url(assets/images/idcard.png)'); - } - } else if (type == 'weapon') { - $('img').hide(); - $('#name').css('color', '#d9d9d9'); - $('#name').text(userData.firstname + ' ' + userData.lastname); - $('#dob').text(userData.dateofbirth); - $('#signature').text(userData.firstname + ' ' + userData.lastname); + $('#id-card').css('background', 'url(assets/images/license.png)'); + } + else { + $('#id-card').css('background', 'url(assets/images/idcard.png)'); + } + } + else if (type == 'weapon') { + $('img').hide(); + $('#name').css('color', '#d9d9d9'); + $('#name').text(userData.firstname + ' ' + userData.lastname); + $('#dob').text(userData.dateofbirth); + $('#signature').text(userData.firstname + ' ' + userData.lastname); - $('#id-card').css('background', 'url(assets/images/firearm.png)'); - } + $('#id-card').css('background', 'url(assets/images/firearm.png)'); + } - $('#id-card').show(); - } else if (event.data.action == 'close') { - $('#name').text(''); - $('#dob').text(''); - $('#height').text(''); - $('#signature').text(''); - $('#sex').text(''); - $('#id-card').hide(); - $('#licenses').html(''); - } - }); + $('#id-card').show(); + } + else if (event.data.action == 'close') { + $('#name').text(''); + $('#dob').text(''); + $('#height').text(''); + $('#signature').text(''); + $('#sex').text(''); + $('#id-card').hide(); + $('#licenses').html(''); + } + }); }); \ No newline at end of file diff --git a/server-data/resources/[bpt_addons]/bpt_idcard/html/assets/js/materialize.js b/server-data/resources/[bpt_addons]/bpt_idcard/html/assets/js/materialize.js index 3037f362b..79f6d7c12 100644 --- a/server-data/resources/[bpt_addons]/bpt_idcard/html/assets/js/materialize.js +++ b/server-data/resources/[bpt_addons]/bpt_idcard/html/assets/js/materialize.js @@ -1,276 +1,312 @@ -/*! +/* ! * Materialize v1.0.0-beta (http://materializecss.com) * Copyright 2014-2017 Materialize * MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE) */ -var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } }; - -var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); - -function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -/*! cash-dom 1.3.5, https://github.com/kenwheeler/cash @license MIT */ -(function (factory) { - window.cash = factory(); -})(function () { - var doc = document, - win = window, - ArrayProto = Array.prototype, - slice = ArrayProto.slice, - filter = ArrayProto.filter, - push = ArrayProto.push; - - var noop = function () { }, - isFunction = function (item) { - // @see https://crbug.com/568448 - return typeof item === typeof noop && item.call; - }, - isString = function (item) { - return typeof item === typeof ""; - }; - - var idMatch = /^#[\w-]*$/, - classMatch = /^\.[\w-]*$/, - htmlMatch = /<.+>/, - singlet = /^\w+$/; - - function find(selector, context) { - context = context || doc; - var elems = classMatch.test(selector) ? context.getElementsByClassName(selector.slice(1)) : singlet.test(selector) ? context.getElementsByTagName(selector) : context.querySelectorAll(selector); - return elems; - } - - var frag; - function parseHTML(str) { - if (!frag) { - frag = doc.implementation.createHTMLDocument(null); - var base = frag.createElement("base"); - base.href = doc.location.href; - frag.head.appendChild(base); - } - - frag.body.innerHTML = str; - - return frag.body.childNodes; - } - - function onReady(fn) { - if (doc.readyState !== "loading") { - fn(); - } else { - doc.addEventListener("DOMContentLoaded", fn); - } - } - - function Init(selector, context) { - if (!selector) { - return this; - } - - // If already a cash collection, don't do any further processing - if (selector.cash && selector !== win) { - return selector; - } - - var elems = selector, - i = 0, - length; - - if (isString(selector)) { - elems = idMatch.test(selector) ? - // If an ID use the faster getElementById check - doc.getElementById(selector.slice(1)) : htmlMatch.test(selector) ? - // If HTML, parse it into real elements - parseHTML(selector) : - // else use `find` - find(selector, context); - - // If function, use as shortcut for DOM ready - } else if (isFunction(selector)) { - onReady(selector); return this; - } - - if (!elems) { - return this; - } - - // If a single DOM element is passed in or received via ID, return the single element - if (elems.nodeType || elems === win) { - this[0] = elems; - this.length = 1; - } else { - // Treat like an array and loop through each item. - length = this.length = elems.length; - for (; i < length; i++) { - this[i] = elems[i]; - } - } - - return this; - } - - function cash(selector, context) { - return new Init(selector, context); - } - - var fn = cash.fn = cash.prototype = Init.prototype = { // jshint ignore:line - cash: true, - length: 0, - push: push, - splice: ArrayProto.splice, - map: ArrayProto.map, - init: Init - }; - - Object.defineProperty(fn, "constructor", { value: cash }); - - cash.parseHTML = parseHTML; - cash.noop = noop; - cash.isFunction = isFunction; - cash.isString = isString; - - cash.extend = fn.extend = function (target) { - target = target || {}; - - var args = slice.call(arguments), - length = args.length, - i = 1; - - if (args.length === 1) { - target = this; - i = 0; - } - - for (; i < length; i++) { - if (!args[i]) { - continue; - } - for (var key in args[i]) { - if (args[i].hasOwnProperty(key)) { - target[key] = args[i][key]; - } - } - } - - return target; - }; - - function each(collection, callback) { - var l = collection.length, - i = 0; - - for (; i < l; i++) { - if (callback.call(collection[i], collection[i], i, collection) === false) { - break; - } - } - } - - function matches(el, selector) { - var m = el && (el.matches || el.webkitMatchesSelector || el.mozMatchesSelector || el.msMatchesSelector || el.oMatchesSelector); - return !!m && m.call(el, selector); - } - - function getCompareFunction(selector) { - return ( - /* Use browser's `matches` function if string */ - isString(selector) ? matches : - /* Match a cash element */ - selector.cash ? function (el) { - return selector.is(el); - } : - /* Direct comparison */ - function (el, selector) { - return el === selector; - } - ); - } - - function unique(collection) { - return cash(slice.call(collection).filter(function (item, index, self) { - return self.indexOf(item) === index; - })); - } - - cash.extend({ - merge: function (first, second) { - var len = +second.length, - i = first.length, - j = 0; - - for (; j < len; i++, j++) { - first[i] = second[j]; - } - - first.length = i; - return first; - }, - - each: each, - matches: matches, - unique: unique, - isArray: Array.isArray, - isNumeric: function (n) { - return !isNaN(parseFloat(n)) && isFinite(n); - } - - }); - - var uid = cash.uid = "_cash" + Date.now(); - - function getDataCache(node) { - return node[uid] = node[uid] || {}; - } - - function setData(node, key, value) { - return getDataCache(node)[key] = value; - } - - function getData(node, key) { - var c = getDataCache(node); - if (c[key] === undefined) { - c[key] = node.dataset ? node.dataset[key] : cash(node).attr("data-" + key); - } - return c[key]; - } - - function removeData(node, key) { - var c = getDataCache(node); - if (c) { - delete c[key]; - } else if (node.dataset) { - delete node.dataset[key]; - } else { - cash(node).removeAttr("data-" + name); - } - } - - fn.extend({ - data: function (name, value) { - if (isString(name)) { - return value === undefined ? getData(this[0], name) : this.each(function (v) { - return setData(v, name, value); - }); - } - - for (var key in name) { - this.data(key, name[key]); - } - - return this; - }, - - removeData: function (key) { - return this.each(function (v) { - return removeData(v, key); - }); - } +// eslint-disable-next-line max-statements-per-line +const _get = function get(object, property, receiver) { + // eslint-disable-next-line max-statements-per-line + if (object === null) object = Function.prototype; const desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { + // eslint-disable-next-line max-statements-per-line + const parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } + else { return get(parent, property, receiver); } + } + else if ('value' in desc) { return desc.value; } + // eslint-disable-next-line max-statements-per-line + else { const getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } +}; - }); +// eslint-disable-next-line max-statements-per-line +const _createClass = function() { function defineProperties(target, props) { for (let i = 0; i < props.length; i++) { const descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function(Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +// eslint-disable-next-line max-statements-per-line +function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError('this hasn\'t been initialised - super() hasn\'t been called'); } return call && (typeof call === 'object' || typeof call === 'function') ? call : self; } + +// eslint-disable-next-line max-statements-per-line +function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } + +// eslint-disable-next-line max-statements-per-line +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } } + +/* ! cash-dom 1.3.5, https://github.com/kenwheeler/cash @license MIT */ +(function(factory) { + window.cash = factory(); +})(function() { + // eslint-disable-next-line prefer-const + const doc = document, + // eslint-disable-next-line prefer-const + win = window, + // eslint-disable-next-line prefer-const + ArrayProto = Array.prototype, + // eslint-disable-next-line prefer-const + slice = ArrayProto.slice, + // eslint-disable-next-line prefer-const + filter = ArrayProto.filter, + push = ArrayProto.push; + + // eslint-disable-next-line prefer-const, no-empty-function + const noop = function() { }, + // eslint-disable-next-line prefer-const + isFunction = function(item) { + // @see https://crbug.com/568448 + return typeof item === typeof noop && item.call; + }, + isString = function(item) { + return typeof item === typeof ''; + }; + + // eslint-disable-next-line prefer-const + const idMatch = /^#[\w-]*$/, + // eslint-disable-next-line prefer-const + classMatch = /^\.[\w-]*$/, + // eslint-disable-next-line prefer-const + htmlMatch = /<.+>/, + singlet = /^\w+$/; + + function find(selector, context) { + context = context || doc; + const elems = classMatch.test(selector) ? context.getElementsByClassName(selector.slice(1)) : singlet.test(selector) ? context.getElementsByTagName(selector) : context.querySelectorAll(selector); + return elems; + } + + let frag; + function parseHTML(str) { + if (!frag) { + frag = doc.implementation.createHTMLDocument(null); + const base = frag.createElement('base'); + base.href = doc.location.href; + frag.head.appendChild(base); + } + + frag.body.innerHTML = str; + + return frag.body.childNodes; + } + + function onReady(fn) { + if (doc.readyState !== 'loading') { + fn(); + } + else { + doc.addEventListener('DOMContentLoaded', fn); + } + } + + function Init(selector, context) { + if (!selector) { + return this; + } + + // If already a cash collection, don't do any further processing + if (selector.cash && selector !== win) { + return selector; + } + + let elems = selector, + i = 0, + length; + + if (isString(selector)) { + elems = idMatch.test(selector) ? + // If an ID use the faster getElementById check + doc.getElementById(selector.slice(1)) : htmlMatch.test(selector) ? + // If HTML, parse it into real elements + parseHTML(selector) : + // else use `find` + find(selector, context); + + // If function, use as shortcut for DOM ready + } + else if (isFunction(selector)) { + onReady(selector); return this; + } + + if (!elems) { + return this; + } + + // If a single DOM element is passed in or received via ID, return the single element + if (elems.nodeType || elems === win) { + this[0] = elems; + this.length = 1; + } + else { + // Treat like an array and loop through each item. + length = this.length = elems.length; + for (; i < length; i++) { + this[i] = elems[i]; + } + } + + return this; + } + + function cash(selector, context) { + return new Init(selector, context); + } + + // eslint-disable-next-line no-inline-comments + const fn = cash.fn = cash.prototype = Init.prototype = { // jshint ignore:line + cash: true, + length: 0, + push: push, + splice: ArrayProto.splice, + map: ArrayProto.map, + init: Init, + }; + + Object.defineProperty(fn, 'constructor', { value: cash }); + + cash.parseHTML = parseHTML; + cash.noop = noop; + cash.isFunction = isFunction; + cash.isString = isString; + + cash.extend = fn.extend = function(target) { + target = target || {}; + + // eslint-disable-next-line prefer-const + let args = slice.call(arguments), + // eslint-disable-next-line prefer-const + length = args.length, + i = 1; + + if (args.length === 1) { + target = this; + i = 0; + } + + for (; i < length; i++) { + if (!args[i]) { + continue; + } + for (const key in args[i]) { + if (Object.prototype.hasOwnProperty.call(args[i], key)) { + target[key] = args[i][key]; + } + } + } + + return target; + }; + + function each(collection, callback) { + // eslint-disable-next-line prefer-const + let l = collection.length, + i = 0; + + for (; i < l; i++) { + if (callback.call(collection[i], collection[i], i, collection) === false) { + break; + } + } + } + + function matches(el, selector) { + const m = el && (el.matches || el.webkitMatchesSelector || el.mozMatchesSelector || el.msMatchesSelector || el.oMatchesSelector); + return !!m && m.call(el, selector); + } + + function getCompareFunction(selector) { + return ( + /* Use browser's `matches` function if string */ + isString(selector) ? matches : + /* Match a cash element */ + selector.cash ? function(el) { + return selector.is(el); + } : + /* Direct comparison */ + // eslint-disable-next-line no-shadow + function(el, selector) { + return el === selector; + } + ); + } + + function unique(collection) { + return cash(slice.call(collection).filter(function(item, index, self) { + return self.indexOf(item) === index; + })); + } + + cash.extend({ + merge: function(first, second) { + // eslint-disable-next-line prefer-const + let len = +second.length, + i = first.length, + j = 0; + + for (; j < len; i++, j++) { + first[i] = second[j]; + } + + first.length = i; + return first; + }, + + each: each, + matches: matches, + unique: unique, + isArray: Array.isArray, + isNumeric: function(n) { + return !isNaN(parseFloat(n)) && isFinite(n); + }, + + }); + + const uid = cash.uid = '_cash' + Date.now(); + + function getDataCache(node) { + return node[uid] = node[uid] || {}; + } + + function setData(node, key, value) { + return getDataCache(node)[key] = value; + } + + function getData(node, key) { + const c = getDataCache(node); + if (c[key] === undefined) { + c[key] = node.dataset ? node.dataset[key] : cash(node).attr('data-' + key); + } + return c[key]; + } + + function removeData(node, key) { + const c = getDataCache(node); + if (c) { + delete c[key]; + } + else if (node.dataset) { + delete node.dataset[key]; + } + else { + cash(node).removeAttr('data-' + name); + } + } + + fn.extend({ + data: function(name, value) { + if (isString(name)) { + return value === undefined ? getData(this[0], name) : this.each(function(v) { + return setData(v, name, value); + }); + } + + for (const key in name) { + this.data(key, name[key]); + } + + return this; + }, + + removeData: function(key) { + return this.each(function(v) { + return removeData(v, key); + }); + }, + + }); var notWhiteMatch = /\S+/g; diff --git a/server-data/resources/[bpt_addons]/bpt_loadscreen/js/color-change.js b/server-data/resources/[bpt_addons]/bpt_loadscreen/js/color-change.js index 1edeb6e85..7a0dfd085 100644 --- a/server-data/resources/[bpt_addons]/bpt_loadscreen/js/color-change.js +++ b/server-data/resources/[bpt_addons]/bpt_loadscreen/js/color-change.js @@ -1,60 +1,60 @@ function updateColors() { - // color background - document.documentElement.style.setProperty("--header-color", config.BASE.color.background); + // color background + document.documentElement.style.setProperty('--header-color', config.BASE.color.background); - // color servername - const servername = Object.values(config.BASE.color.servername); + // color servername + const servername = Object.values(config.BASE.color.servername); - document.documentElement.style.setProperty("--text-color", servername[0]); - document.documentElement.style.setProperty("--dud-color", servername[1]) + document.documentElement.style.setProperty('--text-color', servername[0]); + document.documentElement.style.setProperty('--dud-color', servername[1]); - // cursor - document.documentElement.style.setProperty("--cursor-dot", config.BASE.color.cursor_dot); - document.documentElement.style.setProperty("--cursor-ring", config.BASE.color.cursor_ring); + // cursor + document.documentElement.style.setProperty('--cursor-dot', config.BASE.color.cursor_dot); + document.documentElement.style.setProperty('--cursor-ring', config.BASE.color.cursor_ring); - // color logs - document.documentElement.style.setProperty("--log-color", config.BASE.color.logs); + // color logs + document.documentElement.style.setProperty('--log-color', config.BASE.color.logs); - // color music text - document.documentElement.style.setProperty("--music-color", config.BASE.color.music_text); + // color music text + document.documentElement.style.setProperty('--music-color', config.BASE.color.music_text); - // color music icons - document.documentElement.style.setProperty("--music-icons", config.BASE.color.music_icons); + // color music icons + document.documentElement.style.setProperty('--music-icons', config.BASE.color.music_icons); - // color nav - const nav_background = Object.values(config.BASE.color.nav_background); - const nav_text = Object.values(config.BASE.color.nav_text); + // color nav + const nav_background = Object.values(config.BASE.color.nav_background); + const nav_text = Object.values(config.BASE.color.nav_text); - document.documentElement.style.setProperty("--nav-icon", config.BASE.color.music_icons); - document.documentElement.style.setProperty("--nav-background", nav_background[0]); - document.documentElement.style.setProperty("--nav-background-back", nav_background[1]); - document.documentElement.style.setProperty("--nav-underline", config.BASE.color.nav_underline); - document.documentElement.style.setProperty("--nav-text", nav_text[0]); - document.documentElement.style.setProperty("--nav-text-highlight", nav_text[1]); + document.documentElement.style.setProperty('--nav-icon', config.BASE.color.music_icons); + document.documentElement.style.setProperty('--nav-background', nav_background[0]); + document.documentElement.style.setProperty('--nav-background-back', nav_background[1]); + document.documentElement.style.setProperty('--nav-underline', config.BASE.color.nav_underline); + document.documentElement.style.setProperty('--nav-text', nav_text[0]); + document.documentElement.style.setProperty('--nav-text-highlight', nav_text[1]); - // color loadingbar - const loadingbar_background = Object.values(config.BASE.color.loadingbar_background); + // color loadingbar + const loadingbar_background = Object.values(config.BASE.color.loadingbar_background); - document.documentElement.style.setProperty("--bg-first", loadingbar_background[0]); - document.documentElement.style.setProperty("--bg-second", loadingbar_background[1]); - document.documentElement.style.setProperty("--bg-third", loadingbar_background[2]); - document.documentElement.style.setProperty("--bg-fourth", loadingbar_background[3]); + document.documentElement.style.setProperty('--bg-first', loadingbar_background[0]); + document.documentElement.style.setProperty('--bg-second', loadingbar_background[1]); + document.documentElement.style.setProperty('--bg-third', loadingbar_background[2]); + document.documentElement.style.setProperty('--bg-fourth', loadingbar_background[3]); - const loadingbar_text = Object.values(config.BASE.color.loadingbar_text); + const loadingbar_text = Object.values(config.BASE.color.loadingbar_text); - document.documentElement.style.setProperty("--text-first", loadingbar_text[0]); - document.documentElement.style.setProperty("--text-second", loadingbar_text[1]); - document.documentElement.style.setProperty("--text-third", loadingbar_text[2]); - document.documentElement.style.setProperty("--text-fourth", loadingbar_text[3]); + document.documentElement.style.setProperty('--text-first', loadingbar_text[0]); + document.documentElement.style.setProperty('--text-second', loadingbar_text[1]); + document.documentElement.style.setProperty('--text-third', loadingbar_text[2]); + document.documentElement.style.setProperty('--text-fourth', loadingbar_text[3]); - // color waves - const waves_color = Object.values(config.BASE.color.waves); + // color waves + const waves_color = Object.values(config.BASE.color.waves); - document.documentElement.style.setProperty("--waves-first", waves_color[0]); - document.documentElement.style.setProperty("--waves-second", waves_color[1]); - document.documentElement.style.setProperty("--waves-third", waves_color[2]); - document.documentElement.style.setProperty("--waves-fourth", waves_color[3]); + document.documentElement.style.setProperty('--waves-first', waves_color[0]); + document.documentElement.style.setProperty('--waves-second', waves_color[1]); + document.documentElement.style.setProperty('--waves-third', waves_color[2]); + document.documentElement.style.setProperty('--waves-fourth', waves_color[3]); } updateColors(); \ No newline at end of file diff --git a/server-data/resources/[bpt_addons]/bpt_loadscreen/js/config.js b/server-data/resources/[bpt_addons]/bpt_loadscreen/js/config.js index a1493a4d5..57ad75182 100644 --- a/server-data/resources/[bpt_addons]/bpt_loadscreen/js/config.js +++ b/server-data/resources/[bpt_addons]/bpt_loadscreen/js/config.js @@ -1,101 +1,107 @@ -var config = +// eslint-disable-next-line no-unused-vars +const config = { - // Base - BASE: { + // Base + BASE: { - color: { - background: "linear-gradient(45deg, rgba(0,0,0,1) 0%, rgba(85,85,85,1) 100%)", - servername: + color: { + background: 'linear-gradient(45deg, rgba(0,0,0,1) 0%, rgba(85,85,85,1) 100%)', + servername: [ - "rgba(250,250,250,1)", // main color - "rgba(66,66,66,1)" // change color + // eslint-disable-next-line no-inline-comments + 'rgba(250,250,250,1)', // main color + // eslint-disable-next-line no-inline-comments + 'rgba(66,66,66,1)', // change color ], - cursor_dot: "rgba(255,255,255,1)", - cursor_ring: "rgba(255,255,255,1)", - logs: "rgba(255, 255, 255, 0.46)", - music_text: "rgba(117,117,117,1)", - music_icons: "rgba(255,255,255,1)", - nav_icon: "rgba(255,255,255,1)", - nav_background: + cursor_dot: 'rgba(255,255,255,1)', + cursor_ring: 'rgba(255,255,255,1)', + logs: 'rgba(255, 255, 255, 0.46)', + music_text: 'rgba(117,117,117,1)', + music_icons: 'rgba(255,255,255,1)', + nav_icon: 'rgba(255,255,255,1)', + nav_background: [ - "rgba(9,9,12,1)", // front - "rgba(20,21,26,0.6)" // back + // eslint-disable-next-line no-inline-comments + 'rgba(9,9,12,1)', // front + // eslint-disable-next-line no-inline-comments + 'rgba(20,21,26,0.6)', // back ], - nav_underline: "rgba(117,117,117,1)", - nav_text: + nav_underline: 'rgba(117,117,117,1)', + nav_text: [ - "rgba(255,255,255,0.6)", // normal - "rgba(255,255,255,1)" // highlight + // eslint-disable-next-line no-inline-comments + 'rgba(255,255,255,0.6)', // normal + // eslint-disable-next-line no-inline-comments + 'rgba(255,255,255,1)', // highlight ], - loadingbar_background: + loadingbar_background: [ - "rgba(66,66,66,1)", // Pre-Map - "rgba(88,88,88,1)", // Map - "rgba(110,110,110,1)", // Post-Map - "rgba(132,132,132,1)" // Session + // eslint-disable-next-line no-inline-comments + 'rgba(66,66,66,1)', // Pre-Map + // eslint-disable-next-line no-inline-comments + 'rgba(88,88,88,1)', // Map + // eslint-disable-next-line no-inline-comments + 'rgba(110,110,110,1)', // Post-Map + // eslint-disable-next-line no-inline-comments + 'rgba(132,132,132,1)', // Session ], - loadingbar_text: + loadingbar_text: [ - "rgba(66,66,66,1)", // Pre-Map - "rgba(88,88,88,1)", // Map - "rgba(110,110,110,1)", // Post-Map - "rgba(132,132,132,1)" // Session + // eslint-disable-next-line no-inline-comments + 'rgba(66,66,66,1)', // Pre-Map + // eslint-disable-next-line no-inline-comments + 'rgba(88,88,88,1)', // Map + // eslint-disable-next-line no-inline-comments + 'rgba(110,110,110,1)', // Post-Map + // eslint-disable-next-line no-inline-comments + 'rgba(132,132,132,1)', // Session ], - waves: + waves: [ - "rgba(66,66,66,0.7)", // back - "rgba(88,88,88,0.5)", - "rgba(110,110,110,0.3)", - "rgba(132,132,132,1)" // front + // eslint-disable-next-line no-inline-comments + 'rgba(66,66,66,0.7)', // back + 'rgba(88,88,88,0.5)', + 'rgba(110,110,110,0.3)', + // eslint-disable-next-line no-inline-comments + 'rgba(132,132,132,1)', // front ], - } + }, - }, + }, - NAV: { - enable: true, - list: - { - GitHub: - [ - "GitHub", - "https://github.com/bitpredator/empiretown" - ], - } - }, - - // Server Name - SVN: { - enable: true, - phrases: + // Server Name + SVN: { + enable: true, + phrases: [ - 'EMPIRETOWN', - 'EMP', - 'BPT-CORE', - 'BPT-FRAMEWORK', + 'EMPIRETOWN', + 'EMP', + 'BPT-CORE', + 'BPT-FRAMEWORK', ], - chars: 'EMPIRETOWN EMP BPT-CORE BPT-FRAMEWORK', - changeTime: 15, - changePhrasesTime: 30, - }, + chars: 'EMPIRETOWN EMP BPT-CORE BPT-FRAMEWORK', + changeTime: 15, + changePhrasesTime: 30, + }, - // Logs - LOG: { - enable: false, - }, + // Logs + LOG: { + enable: false, + }, - // Music - MUSIC: { - enable: true, - music: // YT ID + // Music + MUSIC: { + enable: true, + // eslint-disable-next-line no-inline-comments + music: // YT ID [ - "RLr59M_Zvlg" + 'RLr59M_Zvlg', ], - Volume: 20, - TextPrefix: "EMP:" - } -} \ No newline at end of file + Volume: 20, + TextPrefix: 'EMP:', + }, +}; \ No newline at end of file diff --git a/server-data/resources/[bpt_addons]/bpt_loadscreen/js/loadingbar.js b/server-data/resources/[bpt_addons]/bpt_loadscreen/js/loadingbar.js index 6407ad8e4..760c9f851 100644 --- a/server-data/resources/[bpt_addons]/bpt_loadscreen/js/loadingbar.js +++ b/server-data/resources/[bpt_addons]/bpt_loadscreen/js/loadingbar.js @@ -1,212 +1,223 @@ if (!String.format) { - String.format = function (format) { - var args = Array.prototype.slice.call(arguments, 1); - return format.replace(/{(\d+)}/g, function (match, number) { - return typeof args[number] != 'undefined' - ? args[number] - : match - ; - }); - }; + String.format = function(format) { + const args = Array.prototype.slice.call(arguments, 1); + return format.replace(/{(\d+)}/g, function(match, number) { + return typeof args[number] != 'undefined' + ? args[number] + : match + ; + }); + }; } -const loadingStages = ["Pre-map", "Map", "Post-map", "Session"]; -const technicalNames = ["INIT_BEFORE_MAP_LOADED", "MAP", "INIT_AFTER_MAP_LOADED", "INIT_SESSION"]; -var currentLoadingStage = 0; -var loadingWeights = [1.5 / 10, 4 / 10, 1.5 / 10, 3 / 10]; +// eslint-disable-next-line no-unused-vars +const loadingStages = ['Pre-map', 'Map', 'Post-map', 'Session']; +const technicalNames = ['INIT_BEFORE_MAP_LOADED', 'MAP', 'INIT_AFTER_MAP_LOADED', 'INIT_SESSION']; +let currentLoadingStage = 0; +const loadingWeights = [1.5 / 10, 4 / 10, 1.5 / 10, 3 / 10]; -var loadingTotals = [70, 70, 70, 220]; -var registeredTotals = [0, 0, 0, 0]; -var stageVisible = [false, false, false, false]; +const loadingTotals = [70, 70, 70, 220]; +const registeredTotals = [0, 0, 0, 0]; +const stageVisible = [false, false, false, false]; -var currentProgress = [0.0, 0.0, 0.0, 0.0]; -var currentProgressSum = 0.0; -var currentLoadingCount = 0; +const currentProgress = [0.0, 0.0, 0.0, 0.0]; +// eslint-disable-next-line no-unused-vars +const currentProgressSum = 0.0; +let currentLoadingCount = 0; -var minScale = 1.03 -var maxScale = 1.20 -var diffScale = maxScale - minScale -var backgroundPositionEnd = [0, 0]; +const minScale = 1.03; +const maxScale = 1.20; +// eslint-disable-next-line no-unused-vars +const diffScale = maxScale - minScale; +// eslint-disable-next-line no-unused-vars +const backgroundPositionEnd = [0, 0]; function doProgress(stage) { - var idx = technicalNames.indexOf(stage); - if (idx >= 0) { - registeredTotals[idx]++; - if (idx > currentLoadingStage) { - while (currentLoadingStage < idx) { - currentProgress[currentLoadingStage] = 1.0; - currentLoadingStage++; - } - currentLoadingCount = 1; - } - else - currentLoadingCount++; - currentProgress[currentLoadingStage] = Math.min(currentLoadingCount / loadingTotals[idx], 1.0); - updateProgress(); - } + const idx = technicalNames.indexOf(stage); + if (idx >= 0) { + registeredTotals[idx]++; + if (idx > currentLoadingStage) { + while (currentLoadingStage < idx) { + currentProgress[currentLoadingStage] = 1.0; + currentLoadingStage++; + } + currentLoadingCount = 1; + } + else {currentLoadingCount++;} + currentProgress[currentLoadingStage] = Math.min(currentLoadingCount / loadingTotals[idx], 1.0); + updateProgress(); + } } const totalWidth = 99.1; -var progressPositions = []; -var progressMaxLengths = []; +const progressPositions = []; +const progressMaxLengths = []; progressPositions[0] = 0.0; -var i = 0; +let i = 0; while (i < currentProgress.length) { - progressMaxLengths[i] = loadingWeights[i] * totalWidth; - progressPositions[i + 1] = progressPositions[i] + progressMaxLengths[i]; - i++; + progressMaxLengths[i] = loadingWeights[i] * totalWidth; + progressPositions[i + 1] = progressPositions[i] + progressMaxLengths[i]; + i++; } function updateProgress() { - document.querySelector('#debug').innerHTML = ''; - var i = 0; - while (i <= currentLoadingStage) { - if ((currentProgress[i] > 0 || !currentProgress[i - 1]) && !stageVisible[i]) { - document.querySelector("#" + technicalNames[i] + "-label").style.display = 'inline-block'; - - document.querySelector("#" + technicalNames[i] + "-bar").style.display = 'inline-block'; - stageVisible[i] = true; - } - document.querySelector("#" + technicalNames[i] + "-bar").style.width = currentProgress[i] * progressMaxLengths[i] + '%'; - document.querySelector("#" + technicalNames[i] + "-label").style.width = progressMaxLengths[i] + '%'; - if (config.LOG.enable) { - document.querySelector('#debug').innerHTML += String.format('{0}: {1}| {{content}} | {{/head}}' + + '
| {{{content}}} | {{/cols}}' + + '