Merge pull request #10332 from nanaya/store-cart-ts

Typescript StoreCart class
ppy · Jul 4, 2023 · e830ee4 · e830ee4
2 parents 314b4f4 + f96b6b7
commit e830ee4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/resources/js/_classes/store-cart.coffee b/resources/js/_classes/store-cart.coffee
diff --git a/resources/js/core-legacy/store-supporter-tag.coffee b/resources/js/core-legacy/store-supporter-tag.coffee
@@ -3,6 +3,7 @@
 
 import { route } from 'laroute'
 import { fadeToggle } from 'utils/fade'
+import { toggleCart } from 'utils/store-cart'
 
 export default class StoreSupporterTag
   RESOLUTION: 8
@@ -148,7 +149,7 @@ export default class StoreSupporterTag
     messageInputVisible = enabled && @user?.id != window.currentUser.id
     fadeToggle(@messageInput, messageInputVisible)
 
-    StoreCart.setEnabled(enabled)
+    toggleCart(enabled)
     # TODO: need to elevate this element when switching over to new store design.
     $(@el).toggleClass('js-store--disabled', !enabled)
     $('.js-slider').slider('disabled': !enabled)
diff --git a/resources/js/entrypoints/app.ts b/resources/js/entrypoints/app.ts
@@ -5,7 +5,6 @@ import 'app-deps';
 
 import 'jquery-pubsub.coffee';
 
-import '_classes/store-cart.coffee';
 import '_classes/store-supporter-tag-price.coffee';
 import '_classes/timeout.coffee';
 

diff --git a/resources/js/store-username-change.coffee b/resources/js/store-username-change.coffee
@@ -3,9 +3,10 @@
 
 import { route } from 'laroute'
 import { trans } from 'utils/lang'
+import { toggleCart } from 'utils/store-cart'
 
 preventUsernameSubmission = ->
-  StoreCart.setEnabled(false)
+  toggleCart(false)
   $('#username-check-price').text ''
 
 checkUsernameValidity = ->
@@ -17,10 +18,9 @@ checkUsernameValidity = ->
     return unless data.username == $('.js-username-change-input').val()
 
     if data.available
-      $('.js-store-add-to-cart').attr 'disabled', false
+      toggleCart(true)
       $('#username-check-price').text data.costString
       $('#username-form-price').val data.cost
-      $('#product-form').data('disabled', false)
     else
       preventUsernameSubmission()
 

diff --git a/resources/js/utils/store-cart.ts b/resources/js/utils/store-cart.ts
@@ -0,0 +1,7 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+export function toggleCart(flag: boolean) {
+  $('.js-store-add-to-cart').prop('disabled', !flag);
+  $('#product-form').data('disabled', !flag);
+}