Skip to content
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

Update AngularJS from 1.1.2 to 1.8.2 #2190

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update AngularJS from 1.1.2 to 1.8.2 #2190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a2dc51
Update AngularJS, fix files
DarthTealc Jan 21, 2025
58db167
Prevent middle-click links breaking menu
DarthTealc Feb 6, 2025
2c23cfa
Revert "Prevent middle-click links breaking menu"
DarthTealc Feb 7, 2025
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
2 changes: 1 addition & 1 deletion garrysmod/html/dupes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<script type="text/javascript" src="js/thirdparty/jquery.js"></script>
<script type="text/javascript" src="js/thirdparty/jquery-color.js"></script>
<script type="text/javascript" src="js/thirdparty/angular.js"></script>
<script type="text/javascript" src="js/thirdparty/angular.legacy.js"></script>

<script type="text/javascript" src="js/menu/WorkshopFiles.js"></script>
<script type="text/javascript" src="js/svc.Tranny.js"></script>
Expand Down
8 changes: 6 additions & 2 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 @@ -567,8 +567,10 @@ function MissingFlag( element )
return true;
}

function ReverseFilter( cat, me )
function ReverseFilter( me )
{
cat = me.dataset.cat;

RootScope.GMCats.forEach( function( category )
{
RootScope.GMFilterTags[ category ] = true;
Expand All @@ -583,8 +585,10 @@ function ReverseFilter( cat, me )
UpdateDigest( RootScope, 50 );
}

function SwitchFilter( cat, me )
function SwitchFilter( me )
{
cat = me.dataset.cat;

if ( me.checked )
{
RootScope.GMFilterTags[ cat ] = true;
Expand Down
26 changes: 22 additions & 4 deletions garrysmod/html/js/menu/menuApp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

var IN_ENGINE = navigator.userAgent.indexOf( "Valve Source Client" ) != -1;
var IS_SPAWN_MENU = false
var IS_SPAWN_MENU = false;

var App = angular.module( 'MenuApp', [ 'tranny', 'ui' ] );
var App = angular.module( 'MenuApp', [ 'ngRoute', 'tranny', 'ui' ] );

App.config( function( $routeProvider, $locationProvider )
App.config( function( $routeProvider, $compileProvider, $locationProvider, $controllerProvider )
{
$routeProvider.when('/', { templateUrl: 'template/main.html' } );
$routeProvider.when('/addons/', { templateUrl: 'template/addon_list.html' } );
Expand All @@ -13,6 +12,25 @@ App.config( function( $routeProvider, $locationProvider )
$routeProvider.when('/demos/', { templateUrl: 'template/demos.html' } );
$routeProvider.when('/saves/', { templateUrl: 'template/saves.html' } );
$routeProvider.when('/dupes/', { templateUrl: 'template/dupes.html' } );

$controllerProvider.register( 'MenuController', MenuController );
$controllerProvider.register( 'ControllerMain', ControllerMain );
$controllerProvider.register( 'ControllerNewGame', ControllerNewGame );
$controllerProvider.register( 'ControllerServers', ControllerServers );
$controllerProvider.register( 'ControllerAddons', ControllerAddons );
$controllerProvider.register( 'ControllerDupes', ControllerDupes );
$controllerProvider.register( 'ControllerSaves', ControllerSaves );
$controllerProvider.register( 'ControllerDemos', ControllerDemos );

//Update trusted protocols to include asset://
$compileProvider.imgSrcSanitizationTrustedUrlList( /^\s*((https?|ftp|file|blob|asset):|data:image\/)/ ); //Default: /^\s*((https?|ftp|file|blob):|data:image\/)/
$compileProvider.aHrefSanitizationTrustedUrlList( /^\s*(https?|s?ftp|mailto|tel|file|asset):/ ); //Default: /^\s*(https?|s?ftp|mailto|tel|file):/

//Default prefix is '!'. Gmod doesn't use this.
$locationProvider.hashPrefix( '' );

//Disable debug info for "a significant performance boost" https://docs.angularjs.org/api/ng/provider/$compileProvider#debugInfoEnabled
$compileProvider.debugInfoEnabled( false ); //Comment out for debugging
} );

function UpdateDigest( scope, timeout )
Expand Down
17 changes: 17 additions & 0 deletions garrysmod/html/js/thirdparty/angular-route.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading