[shopping-cart] Ajusting l10n and blocking simultaneous actions

Rodrigo Souto
1 parent 6be61ee9
Showing 2 changed files with 12 additions and 9 deletions Show diff stats
plugins/shopping_cart/public/cart.js
plugins/shopping_cart/views/cart.html.erb
@@ -76,6 +76,7 @@ function Cart(config) {
   }
   Cart.prototype.updateQuantity = function(input, itemId, quantity) {
+    if(this.disabled) return alert(shoppingCartPluginL10n.waitLastRequest);
     quantity = parseInt(quantity);
     input.disabled = true;
     var originalBg = input.style.backgroundImage;
@@ -116,6 +117,7 @@ function Cart(config) {
   }
   Cart.addItem = function(itemId, link) {
+    if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest);
     if ( this.productsLength > 100 ) {
       // This limit protect the user from losing data on cookie limit.
       // This is NOT limiting to 100 products, is limiting to 100 kinds of products.
@@ -155,8 +157,8 @@ function Cart(config) {
   }
   Cart.removeItem = function(itemId) {
-    var message = this.instance.cartElem.getAttribute('data-l10nRemoveItem');
-    if( confirm(message) ) this.instance.removeItem(itemId);
+    if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest);
+    if( confirm(shoppingCartPluginL10n.removeItem) ) this.instance.removeItem(itemId);
   }
   Cart.prototype.removeItem = function(itemId) {
@@ -235,8 +237,8 @@ function Cart(config) {
   }
   Cart.clean = function(link) {
-    var message = this.instance.cartElem.getAttribute('data-l10nCleanCart');
-    if( confirm(message) ) link.parentNode.parentNode.parentNode.cartObj.clean();
+    if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest);
+    if( confirm(shoppingCartPluginL10n.cleanCart) ) link.parentNode.parentNode.parentNode.cartObj.clean();
   }
   Cart.prototype.clean = function() {
-<div id="cart1" class="cart" style="display:none"
-  data-l10nRemoveItem="<%=_('Are you sure you want to remove this item?')%>"
-  data-l10nCleanCart="<%=_('Are you sure you want to clean your basket?')%>">
+<div id="cart1" class="cart" style="display:none">
   <div class="cart-inner">
     <div class="cart-content">
       <h3><%= _("Basket") %></h3>
@@ -16,7 +14,7 @@
   </div>
 </div>
 <script>
-  shoppingCartPluginL10n = {
+  var shoppingCartPluginL10n = {
     getProblemConfirmReload: <%= (
       _('Ups... I had a problem to load the basket list.') +
       "\n" +
@@ -24,6 +22,9 @@
     ).to_json %>,
     maxNumberOfItens: <%= (
       _('Sorry, you can\'t have more then 100 kinds of items on this basket.')
-    ).to_json %>
+    ).to_json %>,
+    waitLastRequest: <%= _('Oops, you must wait your last request to finish first!').to_json %>,
+    removeItem: <%= _('Are you sure you want to remove this item?').to_json %>,
+    cleanCart: <%= _('Are you sure you want to clean your basket?').to_json %>
   }
 </script>