From 7f292d47651902cf7077717e1c10e335f1f16fc2 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 19 Jul 2024 09:12:50 +0000 Subject: remove unused functions and start removing the ominous f argument --- view/js/main.js | 134 +++----------------------------------------------------- 1 file changed, 6 insertions(+), 128 deletions(-) (limited to 'view/js') diff --git a/view/js/main.js b/view/js/main.js index 6fda3c8d0..3307086d4 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -93,7 +93,7 @@ $(document).ready(function() { $(document).on('click focus', '.comment-edit-form textarea', function(e) { if(! this.autocomplete_handled) { /* autocomplete @nicknames */ - $(this).editor_autocomplete(baseurl+"/acl?f=&n=1"); + $(this).editor_autocomplete(baseurl+"/acl?n=1"); /* autocomplete bbcode */ $(this).bbco_autocomplete('bbcode'); @@ -250,7 +250,7 @@ $(document).ready(function() { }); function getConversationSettings() { - $.get('settings/conversation/?f=&aj=1',function(data) { + $.get('settings/conversation/?aj=1',function(data) { $('#conversation_settings_body').html(data); }); } @@ -486,7 +486,7 @@ function insertCommentURL(comment, id) { if(reply && reply.length) { reply = bin2hex(reply); $('body').css('cursor', 'wait'); - $.get('linkinfo?f=&binurl=' + reply, function(data) { + $.get('linkinfo?binurl=' + reply, function(data) { var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == comment) { tmpStr = ""; @@ -566,7 +566,7 @@ function closeMenu(theID) { } function markRead(notifType) { - $.get('notifications?f=&markRead='+notifType); + $.get('notifications?markRead='+notifType); $('.' + notifType + '-button').fadeOut(function() { $("." + notifType + "-update").html('0'); $('#nav-' + notifType + '-menu').html(''); @@ -579,7 +579,7 @@ function markRead(notifType) { } function markItemRead(itemId) { - $.get('notifications?f=&markItemRead='+itemId); + $.get('notifications?markItemRead='+itemId); $('.unseen-wall-indicator-'+itemId).remove(); } @@ -1144,7 +1144,7 @@ function pageUpdate() { bParam_page = 1; } - update_url = baseurl + '/' + decodeURIComponent(page_query) + '/?f=&aj=1&page=' + bParam_page + extra_args ; + update_url = baseurl + '/' + decodeURIComponent(page_query) + '/?aj=1&page=' + bParam_page + extra_args ; $("#page-spinner").show(); update_mode = 'append'; @@ -1622,11 +1622,6 @@ $(window).scroll(function () { } }); -function addhtmltext(data) { - data = h2b(data); - addeditortext(data); -} - function loadText(textRegion,data) { var currentText = $(textRegion).val(); $(textRegion).val(currentText + data); @@ -1639,123 +1634,6 @@ function addeditortext(data) { } } -function h2b(s) { - var y = s; - function rep(re, str) { - y = y.replace(re,str); - } - - rep(/(.*?)<\/a>/gi,"[url=$1]$2[/url]"); - rep(/(.*?)<\/span>/gi,"[size=$1]$2[/size]"); - rep(/(.*?)<\/span>/gi,"[color=$1]$2[/color]"); - rep(/(.*?)<\/font>/gi,"$1"); - rep(//gi,"[img=$1x$2]$3[/img]"); - rep(//gi,"[img=$2x$1]$3[/img]"); - rep(//gi,"[img=$3x$2]$1[/img]"); - rep(//gi,"[img=$2x$3]$1[/img]"); - rep(//gi,"[img]$1[/img]"); - - rep(/
    (.*?)<\/ul>/gi,"[list]$1[/list]"); - rep(/
      (.*?)<\/ul>/gi,"[list=]$1[/list]"); - rep(/
        (.*?)<\/ul>/gi,"[list=1]$1[/list]"); - rep(/
          (.*?)<\/ul>/gi,"[list=i]$1[/list]"); - rep(/
            (.*?)<\/ul>/gi,"[list=I]$1[/list]"); - rep(/
              (.*?)<\/ul>/gi,"[list=a]$1[/list]"); - rep(/
                (.*?)<\/ul>/gi,"[list=A]$1[/list]"); - rep(/
              • (.*?)<\/li>/gi,"[li]$1[/li]"); - - rep(/(.*?)<\/code>/gi,"[code]$1[/code]"); - rep(/<\/(strong|b)>/gi,"[/b]"); - rep(/<(strong|b)>/gi,"[b]"); - rep(/<\/(em|i)>/gi,"[/i]"); - rep(/<(em|i)>/gi,"[i]"); - rep(/<\/u>/gi,"[/u]"); - - rep(/(.*?)<\/span>/gi,"[u]$1[/u]"); - rep(//gi,"[u]"); - rep(/]*>/gi,"[quote]"); - rep(/<\/blockquote>/gi,"[/quote]"); - rep(/
                /gi,"[hr]"); - rep(/
                /gi,"\n"); - rep(//gi,"\n"); - rep(/
                /gi,"\n"); - rep(/

                /gi,""); - rep(/<\/p>/gi,"\n"); - rep(/ /gi," "); - rep(/"/gi,"\""); - rep(/</gi,"<"); - rep(/>/gi,">"); - rep(/&/gi,"&"); - - return y; -} - -function b2h(s) { - var y = s; - function rep(re, str) { - y = y.replace(re,str); - } - - rep(/\&/gi,"&"); - rep(/\/gi,">"); - rep(/\"/gi,"""); - - rep(/\n/gi,"
                "); - rep(/\[b\]/gi,""); - rep(/\[\/b\]/gi,""); - rep(/\[i\]/gi,""); - rep(/\[\/i\]/gi,""); - rep(/\[u\]/gi,""); - rep(/\[\/u\]/gi,""); - rep(/\[hr\]/gi,"

                "); - rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"$2"); - rep(/\[url\](.*?)\[\/url\]/gi,"$1"); - rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,""); - rep(/\[img\](.*?)\[\/img\]/gi,""); - - rep(/\[zrl=([^\]]+)\](.*?)\[\/zrl\]/gi,"$2"); - rep(/\[zrl\](.*?)\[\/zrl\]/gi,"$1"); - rep(/\[zmg=(.*?)x(.*?)\](.*?)\[\/zmg\]/gi,""); - rep(/\[zmg\](.*?)\[\/zmg\]/gi,""); - - rep(/\[list\](.*?)\[\/list\]/gi, '
                  $1
                '); - rep(/\[list=\](.*?)\[\/list\]/gi, '
                  $1
                '); - rep(/\[list=1\](.*?)\[\/list\]/gi, '
                  $1
                '); - rep(/\[list=i\](.*?)\[\/list\]/gi,'
                  $1
                '); - rep(/\[list=I\](.*?)\[\/list\]/gi, '
                  $1
                '); - rep(/\[list=a\](.*?)\[\/list\]/gi, '
                  $1
                '); - rep(/\[list=A\](.*?)\[\/list\]/gi, '
                  $1
                '); - rep(/\[li\](.*?)\[\/li\]/gi, '
              • $1
                • '); - rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2"); - rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"$2"); - rep(/\[code\](.*?)\[\/code\]/gi,"$1"); - rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"
                $1
                "); - - rep(/\[video\](.*?)\[\/video\]/gi,"$1"); - rep(/\[audio\](.*?)\[\/audio\]/gi,"$1"); - - rep(/\[\&\;([#a-z0-9]+)\;\]/gi,'&$1;'); - - rep(/\<(.*?)(src|href)=\"[^hfm](.*?)\>/gi,'<$1$2="">'); - - return y; -} - -function zid(s) { - if((! s.length) || (s.indexOf('zid=') != (-1))) - return s; - - if(! zid.length) - return s; - - var has_params = ((s.indexOf('?') == (-1)) ? false : true); - var achar = ((has_params) ? '&' : '?'); - s = s + achar + 'f=&zid=' + zid; - - return s; -} - function makeid(length) { var result = ''; var characters = 'abcdef0123456789'; -- cgit v1.2.3