Skip to content

Commit bdfbf26

Browse files
committed
Addons/saves/dupes
Addon list: small optimisations. Addon list workshop files: Make use of the optimised UpdateDigest system. Save/Dupe tabs in spawn menu: Keep the special handling for menu resizing (also used on first load), but prevent it from being cancelled by the optimised UpdateDigest.
1 parent 444a8f3 commit bdfbf26

File tree

4 files changed

+20
-13
lines changed

4 files changed

+20
-13
lines changed

garrysmod/html/js/creations/dupes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ function WindowResized()
101101
dupe.UpdatePageNav();
102102

103103
// Refresh HTML
104-
dupe.DigestUpdate = setTimeout( function()
104+
dupe.DigestUpdateResize = setTimeout( function()
105105
{
106-
self.DigestUpdate = 0;
106+
self.DigestUpdateResize = 0;
107107
Scope.Go( 0 );
108108
}, 500 )
109109
}

garrysmod/html/js/creations/saves.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ function WindowResized()
9494
save.UpdatePageNav();
9595

9696
// Refresh HTML
97-
save.DigestUpdate = setTimeout( function()
97+
save.DigestUpdateResize = setTimeout( function()
9898
{
99-
self.DigestUpdate = 0;
99+
self.DigestUpdateResize = 0;
100100
Scope.Go( 0 );
101101
}, 500 )
102102
}

garrysmod/html/js/menu/WorkshopFiles.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,17 +312,24 @@ WorkshopFiles.prototype.ReceiveImage = function( id, url )
312312

313313
WorkshopFiles.prototype.Changed = function()
314314
{
315+
316+
if ( !IS_SPAWN_MENU ) // Game menu works with the common.js UpdateDigest
317+
{
318+
UpdateDigest( this.Scope, 10 );
319+
return;
320+
}
321+
315322
this.Scope.$digest();
316323

317324
// An update is queued - so chill
318-
if ( this.DigestUpdate ) return;
325+
if ( this.DigestUpdateResize ) return;
319326

320327
var self = this;
321328

322329
// Update the digest in 10ms
323-
this.DigestUpdate = setTimeout( function()
330+
this.DigestUpdateResize = setTimeout( function()
324331
{
325-
self.DigestUpdate = 0;
332+
self.DigestUpdateResize = 0;
326333
self.Scope.$digest();
327334
}, 10 )
328335
}

garrysmod/html/template/addon_list.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ <h1 class="menuheader">
5454
<workshopmessage ng-show="( TotalResults == 0 || NumResults == 0 ) && !Loading && ( !Disabled || Category != 'subscribed' )" ng-Tranny="'addons.none'">...</workshopmessage>
5555
<workshopmessage ng-show="TotalResults == 0 && !Loading && Disabled && Category == 'subscribed'" ng-Tranny="'addons.disabled'">...</workshopmessage>
5656

57-
<workshopicon ng-hide="Loading" ng-repeat="file in Files" ng-click="ToggleSelect( file, $event )" style="width: {{IconWidth|number:0}}px; height: {{IconHeight|number:0}}px" class="{{GetAddonClasses( file )}}">
57+
<workshopicon ng-hide="Loading" ng-repeat="file in Files track by file.id" ng-click="ToggleSelect( file, $event )" style="width: {{IconWidth|number:0}}px; height: {{IconHeight|number:0}}px" class="{{GetAddonClasses( file )}}">
5858

5959
<preview style="width: {{IconMax|number:0}}px; height: {{IconMax|number:0}}px; margin-left: -{{IconMax*0.5|number:0}}px; margin-top: -{{IconMax*0.5|number:0}}px">
6060
<img src='../{{file.background || "img/downloading.png"}}' style="width: {{IconMax|number:0}}px; height: {{IconMax|number:0}}px;" loading="lazy"/>
@@ -151,7 +151,7 @@ <h1 class="menuheader">
151151
</div>
152152
</div>
153153

154-
<div class="modaldialog" ng-show="CreatePresetOpen">
154+
<div class="modaldialog" ng-if="CreatePresetOpen">
155155
<div class="centermessage left create_preset">
156156
<b ng-tranny="'addons.create_preset'"></b>
157157
<br/><br/>
@@ -175,7 +175,7 @@ <h1 class="menuheader">
175175
</div>
176176
</div>
177177

178-
<div class="modaldialog" ng-show="ImportPresetOpen">
178+
<div class="modaldialog" ng-if="ImportPresetOpen">
179179
<div class="centermessage left create_preset">
180180
<b ng-tranny="'addons.import_preset'"></b>
181181
<br/><br/>
@@ -199,13 +199,13 @@ <h1 class="menuheader">
199199
</div>
200200
</div>
201201

202-
<div class="modaldialog" ng-show="ImportPresetLoading">
202+
<div class="modaldialog" ng-if="ImportPresetLoading">
203203
<div class="centermessage left create_preset">
204204
<h1 ng-tranny="'dupes.loading'"></h1>
205205
</div>
206206
</div>
207207

208-
<div class="modaldialog" ng-show="LoadPresetMenuOpen">
208+
<div class="modaldialog" ng-if="LoadPresetMenuOpen">
209209
<div class="centermessage left">
210210
<b ng-tranny="'addons.load_preset'"></b>
211211
<br/><br/>
@@ -236,7 +236,7 @@ <h1 ng-tranny="'dupes.loading'"></h1>
236236
--><a ng-click="ClosePopupMessage()" ng-tranny="'addons.cancel'"></a></div>
237237
</div>
238238

239-
<div class="modaldialog" ng-show="PopupMessageDisplayed">
239+
<div class="modaldialog" ng-if="PopupMessageDisplayed">
240240
<div class="centermessage">
241241
<span ng-tranny="'addons.warning'"></span>
242242
<span ng-tranny="PopupMessageDisplayedMessage"></span>

0 commit comments

Comments
 (0)