Skip to content

Revert "Server browser adjustments" #2414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HarryA2 wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −18
Open

Revert "Server browser adjustments" #2414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion garrysmod/html/css/menu/Servers.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,6 @@ A.bglink img
overflow: hidden;
width: 100%;
letter-spacing: -1px;
user-select: text;
}

.serverinfo button
Expand Down
23 changes: 9 additions & 14 deletions garrysmod/html/js/menu/control.Servers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,6 @@ var ServerTypes = {};
var FirstTime = true;
var UpdateInterval = undefined;

function StripWeirdSymbols( name )
{
// Weird symbols
var ret = name.replace( /[\u2100-\u23FF\u2580-\u259F\u25A0-\u25FF\u2600-\u26FF\u2700-\u27BF\u2B00-\u2BFF]/g, "" );

// Emojis
ret = ret.replace( /\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDFFF]|\uD83E[\uDD10-\uDFFF]/g, "" );
return ret;
}

function ControllerServers( $scope, $element, $rootScope, $location )
{
RootScope = $rootScope;
Expand Down Expand Up @@ -167,9 +157,14 @@ function ControllerServers( $scope, $element, $rootScope, $location )
if ( !gm ) return "Unknown Gamemode";

if ( gm.info && gm.info.title )
return StripWeirdSymbols( gm.info.title );
return gm.info.title.replace( /[\u2580-\u259F\u25A0-\u25FF\u2600-\u26FF\u2700-\u27BF\u2B00-\u2BFF]/g, "" );;

return StripWeirdSymbols( gm.name );
return gm.name.replace( /[\u2580-\u259F\u25A0-\u25FF\u2600-\u26FF\u2700-\u27BF\u2B00-\u2BFF]/g, "" );;
}

$scope.ServerName = function( server )
{
return server.name.replace( /[\u2580-\u259F\u25A0-\u25FF\u2600-\u26FF\u2700-\u27BF\u2B00-\u2BFF]/g, "" );
}

$scope.JoinServer = function( srv )
Expand Down Expand Up @@ -499,7 +494,7 @@ function AddServer( type, id, ping, name, desc, map, players, maxplayers, botpla
var data =
{
ping: parseInt( ping ),
name: StripWeirdSymbols( name.trim() ),
name: name.trim(),
desc: desc,
map: map,
players: parseInt( players ) - parseInt( botplayers ),
Expand Down Expand Up @@ -717,4 +712,4 @@ function ReceiveFoundServers( data )
Scope.FoundServers = data;

UpdateDigest( RootScope, 60 );
}
}
5 changes: 2 additions & 3 deletions garrysmod/html/template/servers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ <h1 class="menuheader">
<a class='favbutton {{IfElse( server.favorite, "favorited", "" )}}' ng-click="ToggleFavorite( server );Refresh();$event.stopPropagation();"></a>
<!--<img class="flag" ng-src='asset://garrysmod/materials/flags16/{{server.flag}}.png' onerror="MissingFlag( this )" ng-show="server.flag"/> -->
<img class="passworded" src='img/server-passworded.png' ng-show="server.pass"/>
<span>{{server.name}}</span>
<span>{{ServerName(server)}}</span>
</name>
<ping>{{server.ping}}</ping>
<players>{{server.players}} / {{server.maxplayers}}</players>
Expand Down Expand Up @@ -141,7 +141,7 @@ <h1 class="menuheader">
<a class='favbutton {{IfElse( server.favorite, "favorited", "" )}}' ng-click="ToggleFavorite( server );$event.stopPropagation();"></a>
<img class="flag" ng-src='asset://garrysmod/materials/flags16/{{server.flag}}.png' onerror="MissingFlag( this )" ng-if="server.flag" loading="lazy"/>
<img class="passworded" src='img/server-passworded.png' ng-if="server.pass" loading="lazy"/>
<span>{{server.name}}
<span>{{ServerName(server)}}
<tag class="{{IfElse( server.version_c > 0, 'future', '' )}}" ng-if="server.version_c != 0">{{IfElse( server.version_c > 0, 'Invalid version', 'Outdated' )}}: {{server.version}}</tag>
</span>
</name>
Expand Down Expand Up @@ -211,4 +211,3 @@ <h1 class="menuheader">
</div>

</div>