From fb07248a4adbe4ded7e0f76d0f8872507cffee30 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Thu, 8 Jun 2023 13:50:37 +0700 Subject: [PATCH] Revert "Reformated JS (#753)" This reverts commit 243ddf337cfb09028027ec57bbb965deb47bc2da. --- styles/js/main.js | 120 +++++++++++++++++++++++++++++----------------- 1 file changed, 77 insertions(+), 43 deletions(-) diff --git a/styles/js/main.js b/styles/js/main.js index bd9fdc51a..e504b57f3 100644 --- a/styles/js/main.js +++ b/styles/js/main.js @@ -8,15 +8,15 @@ // prototype $ function $p() { - let elements = []; - - for (let i = 0; i < arguments.length; i++) { - let element = arguments[i]; - if (typeof element === 'string') element = document.getElementById(element); - if (arguments.length === 1) return element; + var elements = []; + for (var i = 0; i < arguments.length; i++) { + var element = arguments[i]; + if (typeof element === 'string') + element = document.getElementById(element); + if (arguments.length === 1) + return element; elements.push(element); } - return elements; } @@ -24,14 +24,16 @@ function addEvent(obj, type, fn) { if (obj.addEventListener) { obj.addEventListener(type, fn, false); EventCache.add(obj, type, fn); - } else if (obj.attachEvent) { + } + else if (obj.attachEvent) { obj["e" + type + fn] = fn; obj[type + fn] = function () { obj["e" + type + fn](window.event); }; obj.attachEvent("on" + type, obj[type + fn]); EventCache.add(obj, type, fn); - } else { + } + else { obj["on" + type] = obj["e" + type + fn]; } } @@ -39,9 +41,11 @@ function addEvent(obj, type, fn) { var EventCache = function () { var listEvents = []; return { - listEvents: listEvents, add: function (node, sEventName, fHandler) { + listEvents: listEvents, + add: function (node, sEventName, fHandler) { listEvents.push(arguments); - }, flush: function () { + }, + flush: function () { var i, item; for (i = listEvents.length - 1; i >= 0; i = i - 1) { item = listEvents[i]; @@ -65,7 +69,7 @@ if (document.all) { function imgFit(img, maxW) { img.title = 'Размеры изображения: ' + img.width + ' x ' + img.height; - if (typeof (img.naturalHeight) === 'undefined') { + if (typeof(img.naturalHeight) === 'undefined') { img.naturalHeight = img.height; img.naturalWidth = img.width; } @@ -75,18 +79,20 @@ function imgFit(img, maxW) { img.title = 'Нажмите на изображение, чтобы посмотреть его в полный размер'; img.style.cursor = 'move'; return false; - } else if (img.width === maxW && img.width < img.naturalWidth) { + } + else if (img.width === maxW && img.width < img.naturalWidth) { img.height = img.naturalHeight; img.width = img.naturalWidth; img.title = 'Размеры изображения: ' + img.naturalWidth + ' x ' + img.naturalHeight; return false; - } else { + } + else { return true; } } function toggle_block(id) { - let el = document.getElementById(id); + var el = document.getElementById(id); el.style.display = (el.style.display === 'none') ? '' : 'none'; } @@ -100,8 +106,8 @@ function rand(min, max) { // Cookie functions /** - * [name] Name of the cookie - * [value] Value of the cookie + * name Name of the cookie + * value Value of the cookie * [days] Number of days to remain active (default: end of current session) * [path] Path where the cookie is valid (default: path of calling document) * [domain] Domain where the cookie is valid @@ -119,7 +125,12 @@ function setCookie(name, value, days, path, domain, secure) { var expires = ''; } - document.cookie = name + '=' + encodeURI(value) + ((expires) ? '; expires=' + expires : '') + ((path) ? '; path=' + path : ((cookiePath) ? '; path=' + cookiePath : '')) + ((domain) ? '; domain=' + domain : ((cookieDomain) ? '; domain=' + cookieDomain : '')) + ((secure) ? '; secure' : ((cookieSecure) ? '; secure' : '')); + document.cookie = + name + '=' + encodeURI(value) + + ((expires) ? '; expires=' + expires : '') + + ((path) ? '; path=' + path : ((cookiePath) ? '; path=' + cookiePath : '')) + + ((domain) ? '; domain=' + domain : ((cookieDomain) ? '; domain=' + cookieDomain : '')) + + ((secure) ? '; secure' : ((cookieSecure) ? '; secure' : '')); } /** @@ -132,7 +143,7 @@ function getCookie(name) { } /** - * [name] name of the cookie + * name name of the cookie * [path] path of the cookie (must be same as path used to create cookie) * [domain] domain of the cookie (must be same as domain used to create cookie) */ @@ -142,7 +153,9 @@ function deleteCookie(name, path, domain) { // Menus var Menu = { - hideSpeed: 'fast', offsetCorrection_X: -4, offsetCorrection_Y: 2, + hideSpeed: 'fast', + offsetCorrection_X: -4, + offsetCorrection_Y: 2, activeMenuId: null, // currently opened menu (from previous click) clickedMenuId: null, // menu to show up @@ -252,18 +265,23 @@ $(document).ready(function () { // Menus $('body').append($('div.menu-sub')); $('a.menu-root') - .click(function (e) { - e.preventDefault(); - Menu.clicked($(this)); - return false; - }) - .hover(function () { - Menu.hovered($(this)); - return false; - }, function () { - Menu.unhovered($(this)); - return false; - }); + .click( + function (e) { + e.preventDefault(); + Menu.clicked($(this)); + return false; + }) + .hover( + function () { + Menu.hovered($(this)); + return false; + }, + function () { + Menu.unhovered($(this)); + return false; + } + ) + ; $('div.menu-sub') .mousedown(function (e) { e.stopPropagation(); @@ -271,7 +289,8 @@ $(document).ready(function () { .find('a') .click(function (e) { Menu.hide(e); - }); + }) + ; // Input hints $('input') .filter('.hint').one('focus', function () { @@ -280,7 +299,8 @@ $(document).ready(function () { .end() .filter('.error').one('focus', function () { $(this).removeClass('error'); - }); + }) + ; }); // @@ -299,14 +319,20 @@ Ajax.prototype = { state: {}, // current action state request: {}, // request data params: {}, // action params, format: ajax.params[ElementID] = { param: "val" ... } - form_token: '', hide_loading: null, + form_token: '', + hide_loading: null, exec: function (request, hide_loading = false) { this.request[request.action] = request; request['form_token'] = this.form_token; this.hide_loading = hide_loading; $.ajax({ - url: this.url, type: this.type, dataType: this.dataType, data: request, success: ajax.success, error: ajax.error + url: this.url, + type: this.type, + dataType: this.dataType, + data: request, + success: ajax.success, + error: ajax.error }); }, @@ -331,22 +357,27 @@ Ajax.prototype = { var req = ajax.request[action]; req.user_password = user_password; ajax.exec(req); - } else { + } + else { ajax.clearActionState(action); ajax.showErrorMsg('Введен неверный пароль'); } - } else if (response.prompt_confirm) { + } + else if (response.prompt_confirm) { if (window.confirm(response.confirm_msg)) { var req = ajax.request[action]; req.confirmed = 1; ajax.exec(req); - } else { + } + else { ajax.clearActionState(action); } - } else if (response.error_code) { + } + else if (response.error_code) { ajax.showErrorMsg(response.error_msg); $('.loading-1').removeClass('loading-1').html('error'); - } else { + } + else { ajax.callback[action](response); ajax.clearActionState(action); } @@ -442,7 +473,9 @@ $(document).ready(function () { status = ''; text = 'неверный формат данных'; } - $(this).html("Ошибка в: " + ajax.url + "
" + status + " " + text + "").show(); + $(this).html( + "Ошибка в: " + ajax.url + "
" + status + " " + text + "" + ).show(); ajax.setStatusBoxPosition($(this)); }); @@ -479,7 +512,8 @@ var autocomplete = function (noCenter) { if (!noCenter) { $("div#autocomplete_popup").css({ - left: _popup_left + "px", top: _popup_top + "px" + left: _popup_left + "px", + top: _popup_top + "px" }).show(1000); } else { $("div#autocomplete_popup").show(1000);