You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2019/01/08 05:25:11 UTC

svn commit: r1850714 - in /ofbiz/ofbiz-plugins/branches/release18.12: ecommerce/webapp/ecommerce/images/ pricat/template/pricat/ webpos/template/shortcuts/ webpos/webapp/webpos/images/js/

Author: adityasharma
Date: Tue Jan  8 05:25:10 2019
New Revision: 1850714

URL: http://svn.apache.org/viewvc?rev=1850714&view=rev
Log:
Applied fix from trunk for revision: 1850712 
===

Improved: Replace jQuery.bind() with jQuery.on()
(OFBIZ-10758)
As of jQuery 3.0, .bind() has been deprecated. It was superseded by the .on() method for attaching event handlers to a document.
Additional change:
Improved boolean returns with single statement, replacing if blocks with explicit boolean return.

Modified:
    ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/checkoutProcess.js
    ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/profile.js
    ofbiz/ofbiz-plugins/branches/release18.12/pricat/template/pricat/pricatreport.ftl
    ofbiz/ofbiz-plugins/branches/release18.12/pricat/template/pricat/report.ftl
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/template/shortcuts/Shortcuts.ftl
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/CategoryDetail.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ChooseVariant.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/CloseTerminal.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/EditAddress.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/OpenTerminal.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PaidOutAndIn.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayCheck.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayCreditCard.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayGiftCard.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PromoCode.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchParties.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchPartiesResults.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchProducts.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchProductsResults.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ShowCart.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ShowCartItemSelected.js
    ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/VoidOrder.js

Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/checkoutProcess.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/checkoutProcess.js Tue Jan  8 05:25:10 2019
@@ -441,7 +441,7 @@ function initCartProcessObservers() {
     });
     var links = jQuery("#cartForm a[id^='removeItemLink_']");
     jQuery.each(links, function() {
-        jQuery(this).bind('click', function(){
+        jQuery(this).on('click', function(){
             removeItem(this);
         });
     });

Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/profile.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/profile.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/profile.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/profile.js Tue Jan  8 05:25:10 2019
@@ -297,12 +297,12 @@ function copyShipToBillAddress() {
 }
 
 function stopObservingShipToBillAddress() {
-    jQuery('#shipToAddress1').unbind('change');
-    jQuery('shipToAddress2').unbind('change');
-    jQuery('shipToCity').unbind('change');
-    jQuery('shipToStateProvinceGeoId').unbind('change');
-    jQuery('shipToCountryGeoId').unbind('change', copyShipToCountryToBillToCountry);
-    jQuery('shipToPostalCode').unbind('change');
+    jQuery('#shipToAddress1').off('change');
+    jQuery('shipToAddress2').off('change');
+    jQuery('shipToCity').off('change');
+    jQuery('shipToStateProvinceGeoId').off('change');
+    jQuery('shipToCountryGeoId').off('change', copyShipToCountryToBillToCountry);
+    jQuery('shipToPostalCode').off('change');
 }
 
 function showState(id) {

Modified: ofbiz/ofbiz-plugins/branches/release18.12/pricat/template/pricat/pricatreport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/pricat/template/pricat/pricatreport.ftl?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/pricat/template/pricat/pricatreport.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/pricat/template/pricat/pricatreport.ftl Tue Jan  8 05:25:10 2019
@@ -383,11 +383,7 @@ function doScroll() {
 }
 
 function isContinueChecked() {
-    if (document.main.continuereport && document.main.continuereport.checked == true) {
-        return true;
-    } else {
-        return false;
-    }
+    return document.main.continuereport && document.main.continuereport.checked == true;
 }
 
 function displayButtonRowContinue() {

Modified: ofbiz/ofbiz-plugins/branches/release18.12/pricat/template/pricat/report.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/pricat/template/pricat/report.ftl?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/pricat/template/pricat/report.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/pricat/template/pricat/report.ftl Tue Jan  8 05:25:10 2019
@@ -383,11 +383,7 @@ function doScroll() {
 }
 
 function isContinueChecked() {
-    if (document.main.continuereport && document.main.continuereport.checked == true) {
-        return true;
-    } else {
-        return false;
-    }
+    return document.main.continuereport && document.main.continuereport.checked == true;
 }
 
 function displayButtonRowContinue() {

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/template/shortcuts/Shortcuts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/template/shortcuts/Shortcuts.ftl?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/template/shortcuts/Shortcuts.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/template/shortcuts/Shortcuts.ftl Tue Jan  8 05:25:10 2019
@@ -77,21 +77,21 @@ under the License.
         e.preventDefault();
         return false;
     });
-    WebPosHotkeys.bind("keydown", "f1", productToSearchFocus, "productToSearchFocus()", "${uiLabelMap.WebPosShortcutF1}");
-    WebPosHotkeys.bind("keydown", "f2", partyToSearchFocus, "partyToSearchFocus()", "${uiLabelMap.WebPosShortcutF2}");
-    WebPosHotkeys.bind("keydown", "f3", payCash, "payCash()", "${uiLabelMap.WebPosShortcutF3}");
-    WebPosHotkeys.bind("keydown", "f4", payCheck, "payCheck()", "${uiLabelMap.WebPosShortcutF4}");
+    WebPosHotkeys.on("keydown", "f1", productToSearchFocus, "productToSearchFocus()", "${uiLabelMap.WebPosShortcutF1}");
+    WebPosHotkeys.on("keydown", "f2", partyToSearchFocus, "partyToSearchFocus()", "${uiLabelMap.WebPosShortcutF2}");
+    WebPosHotkeys.on("keydown", "f3", payCash, "payCash()", "${uiLabelMap.WebPosShortcutF3}");
+    WebPosHotkeys.on("keydown", "f4", payCheck, "payCheck()", "${uiLabelMap.WebPosShortcutF4}");
     <!--TODO: To be implemented with OFBIZ-5241-->
-    <!--WebPosHotkeys.bind("keydown", "f5", payPin, "", "${uiLabelMap.WebPosShortcutF5}");-->
-    WebPosHotkeys.bind("keydown", "f6", payGiftCard, "payGiftCard()", "${uiLabelMap.WebPosShortcutF6}");
-    WebPosHotkeys.bind("keydown", "f7", payCreditCard, "payCreditCard()", "${uiLabelMap.WebPosShortcutF7}");
-    WebPosHotkeys.bind("keydown", "f8", payFinish, "payFinish()", "${uiLabelMap.WebPosShortcutF8}");
-    WebPosHotkeys.bind("keydown", "f9", itemQuantityFocus, "itemQuantityFocus()", "${uiLabelMap.WebPosShortcutF9}");
-    WebPosHotkeys.bind("keydown", "f10", incrementItemQuantity, "incrementItemQuantity()", "${uiLabelMap.WebPosShortcutF10}");
-    WebPosHotkeys.bind("keydown", "f11", decrementItemQuantity, "decrementItemQuantity()", "${uiLabelMap.WebPosShortcutF11}");
-    WebPosHotkeys.bind("keydown", "f12", emptyCart, "emptyCart()", "${uiLabelMap.WebPosShortcutF12}");
-    WebPosHotkeys.bind("keydown", "up", keyUp, "keyUp()", "${uiLabelMap.WebPosShortcutKeyUp}");
-    WebPosHotkeys.bind("keydown", "down", keyDown, "keyDown()", "${uiLabelMap.WebPosShortcutKeyDown}");
+    <!--WebPosHotkeys.on("keydown", "f5", payPin, "", "${uiLabelMap.WebPosShortcutF5}");-->
+    WebPosHotkeys.on("keydown", "f6", payGiftCard, "payGiftCard()", "${uiLabelMap.WebPosShortcutF6}");
+    WebPosHotkeys.on("keydown", "f7", payCreditCard, "payCreditCard()", "${uiLabelMap.WebPosShortcutF7}");
+    WebPosHotkeys.on("keydown", "f8", payFinish, "payFinish()", "${uiLabelMap.WebPosShortcutF8}");
+    WebPosHotkeys.on("keydown", "f9", itemQuantityFocus, "itemQuantityFocus()", "${uiLabelMap.WebPosShortcutF9}");
+    WebPosHotkeys.on("keydown", "f10", incrementItemQuantity, "incrementItemQuantity()", "${uiLabelMap.WebPosShortcutF10}");
+    WebPosHotkeys.on("keydown", "f11", decrementItemQuantity, "decrementItemQuantity()", "${uiLabelMap.WebPosShortcutF11}");
+    WebPosHotkeys.on("keydown", "f12", emptyCart, "emptyCart()", "${uiLabelMap.WebPosShortcutF12}");
+    WebPosHotkeys.on("keydown", "up", keyUp, "keyUp()", "${uiLabelMap.WebPosShortcutKeyUp}");
+    WebPosHotkeys.on("keydown", "down", keyDown, "keyDown()", "${uiLabelMap.WebPosShortcutKeyDown}");
     updateHotKeys();
   }
 </script>
\ No newline at end of file

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/CategoryDetail.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/CategoryDetail.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/CategoryDetail.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/CategoryDetail.js Tue Jan  8 05:25:10 2019
@@ -21,11 +21,11 @@ function showSelectedButton() {
         var id = jQuery(this).attr('id');
         if (id != '') {
             id = '#' + id;
-            jQuery(id).bind('mouseover', function(event) {
+            jQuery(id).on('mouseover', function(event) {
                 jQuery(id).addClass("selectedButton");
                 jQuery(id).removeClass("notSelectedButton");
             });
-            jQuery(id).bind('mouseout', function(event) {
+            jQuery(id).on('mouseout', function(event) {
                 jQuery(id).addClass("notSelectedButton");
                 jQuery(id).removeClass("selectedButton");
             });

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ChooseVariant.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ChooseVariant.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ChooseVariant.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ChooseVariant.js Tue Jan  8 05:25:10 2019
@@ -19,7 +19,7 @@ under the License.
 var variantData = null;
 
 jQuery(document).ready(function() {
-    jQuery('#variantQuantity').bind('keypress', function(event) {
+    jQuery('#variantQuantity').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             variantConfirmed();
@@ -31,12 +31,12 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#chooseVariantConfirm').bind('click', function(event) {
+    jQuery('#chooseVariantConfirm').on('click', function(event) {
         variantConfirmed();
         return false;
     });
     
-    jQuery('#chooseVariantCancel').bind('click', function(event) {
+    jQuery('#chooseVariantCancel').on('click', function(event) {
         productToSearchFocus();
         return false;
     });
@@ -179,7 +179,7 @@ function selectVariant(data, firstTime)
                     jQuery.each(featureOrder, function(i, actualFeature) {
                         var feature = featureTypes[actualFeature];
                         featureValue = "FT" + feature;
-                        jQuery('#' + featureValue).bind('change', function(event) {
+                        jQuery('#' + featureValue).on('change', function(event) {
                             selectVariant(variantData, 'N');
                             return false;
                         });

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/CloseTerminal.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/CloseTerminal.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/CloseTerminal.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/CloseTerminal.js Tue Jan  8 05:25:10 2019
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 */
 jQuery(document).ready(function() {
-    jQuery('#endingDrawerCashAmount').bind('keypress', function(event) {
+    jQuery('#endingDrawerCashAmount').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             closeTerminalConfirm();
@@ -29,7 +29,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#endingDrawerCheckAmount').bind('keypress', function(event) {
+    jQuery('#endingDrawerCheckAmount').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             closeTerminalConfirm();
@@ -41,7 +41,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#endingDrawerCcAmount').bind('keypress', function(event) {
+    jQuery('#endingDrawerCcAmount').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             closeTerminalConfirm();
@@ -53,7 +53,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#endingDrawerGcAmount').bind('keypress', function(event) {
+    jQuery('#endingDrawerGcAmount').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             closeTerminalConfirm();
@@ -65,7 +65,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#endingDrawerOtherAmount').bind('keypress', function(event) {
+    jQuery('#endingDrawerOtherAmount').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             closeTerminalConfirm();
@@ -77,12 +77,12 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#closeTerminalConfirm').bind('click', function(event) {
+    jQuery('#closeTerminalConfirm').on('click', function(event) {
          closeTerminalConfirm();
          return false;
     });
     
-    jQuery('#closeTerminalCancel').bind('click', function(event) {
+    jQuery('#closeTerminalCancel').on('click', function(event) {
          productToSearchFocus();
          return false;
     });

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/EditAddress.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/EditAddress.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/EditAddress.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/EditAddress.js Tue Jan  8 05:25:10 2019
@@ -18,7 +18,7 @@ under the License.
 */
 var uiLabelJsonObjects = null;
 jQuery(document).ready(function() {
-    jQuery('#editAddressCreateUpdate').bind('click', function(event) {
+    jQuery('#editAddressCreateUpdate').on('click', function(event) {
         pleaseWait('Y');
         var param = 'partyId=' + jQuery('#partyId').val() + '&firstName=' + jQuery('#personFirstName').val() + '&lastName=' + jQuery('#personLastName').val() + 
                     '&contactMechId=' + jQuery('#contactMechId').val() + '&contactMechPurposeTypeId=' + jQuery('#contactMechPurposeTypeId').val() + 
@@ -42,7 +42,7 @@ jQuery(document).ready(function() {
         return false;
     });
     
-    jQuery('#editAddressCancel').bind('click', function(event) {
+    jQuery('#editAddressCancel').on('click', function(event) {
         pleaseWait('Y');
         productToSearchFocus();
         pleaseWait('N');

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/OpenTerminal.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/OpenTerminal.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/OpenTerminal.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/OpenTerminal.js Tue Jan  8 05:25:10 2019
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 */
 jQuery(document).ready(function() {
-    jQuery('#startingDrawerAmount').bind('keypress', function(event) {
+    jQuery('#startingDrawerAmount').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             openTerminalConfirm();
@@ -29,12 +29,12 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#openTerminalConfirm').bind('click', function(event) {
+    jQuery('#openTerminalConfirm').on('click', function(event) {
         openTerminalConfirm();
         return false;
     });
     
-    jQuery('#openTerminalCancel').bind('click', function(event) {
+    jQuery('#openTerminalCancel').on('click', function(event) {
         productToSearchFocus();
         return false;
     });

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PaidOutAndIn.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PaidOutAndIn.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PaidOutAndIn.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PaidOutAndIn.js Tue Jan  8 05:25:10 2019
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 */
 jQuery(document).ready(function() {
-    jQuery('#amountInOut').bind('keypress', function(event) {
+    jQuery('#amountInOut').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             paidOutAndInConfirm();
@@ -29,7 +29,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#reasonCommentInOut').bind('keypress', function(event) {
+    jQuery('#reasonCommentInOut').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             paidOutAndInConfirm();
@@ -41,12 +41,12 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#paidOutAndInConfirm').bind('click', function(event) {
+    jQuery('#paidOutAndInConfirm').on('click', function(event) {
         paidOutAndInConfirm();
         return false;
     });
     
-    jQuery('#paidOutAndInCancel').bind('click', function(event) {
+    jQuery('#paidOutAndInCancel').on('click', function(event) {
         productToSearchFocus();
         return false;
     });

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayCheck.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayCheck.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayCheck.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayCheck.js Tue Jan  8 05:25:10 2019
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 */
 jQuery(document).ready(function() {
-    jQuery('#removeCheckTotalPaid').bind('click', function(event) {
+    jQuery('#removeCheckTotalPaid').on('click', function(event) {
         pleaseWait('Y');
         var param = 'clearCash=N&clearCheck=Y&clearGift=Y&clearCredit=N';
         jQuery.ajax({url: 'ClearPayment',
@@ -36,7 +36,7 @@ jQuery(document).ready(function() {
         return false;
     });
     
-    jQuery('#amountCheck').bind('keypress', function(event) {
+    jQuery('#amountCheck').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             payCheckConfirm();
@@ -48,7 +48,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#refNumCheck').bind('keypress', function(event) {
+    jQuery('#refNumCheck').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             payCheckConfirm();
@@ -60,12 +60,12 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#payCheckConfirm').bind('click', function(event) {
+    jQuery('#payCheckConfirm').on('click', function(event) {
         payCheckConfirm();
         return false;
     });
     
-    jQuery('#payCheckCancel').bind('click', function(event) {
+    jQuery('#payCheckCancel').on('click', function(event) {
         productToSearchFocus();
         return false;
     });

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayCreditCard.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayCreditCard.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayCreditCard.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayCreditCard.js Tue Jan  8 05:25:10 2019
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 */
 jQuery(document).ready(function() {
-    jQuery('#removeCreditCardTotalPaid').bind('click', function(event) {
+    jQuery('#removeCreditCardTotalPaid').on('click', function(event) {
         pleaseWait('Y');
         var param = 'clearCash=N&clearCheck=N&clearGift=N&clearCredit=Y';
         jQuery.ajax({url: 'ClearPayment',
@@ -36,7 +36,7 @@ jQuery(document).ready(function() {
         return false;
     });
     
-    jQuery('#swipeCard').bind('click', function(event) {
+    jQuery('#swipeCard').on('click', function(event) {
         jQuery('#payCreditCard').show();
         if (jQuery('#swipeCard').val() == 'Y') {
             jQuery('#swipeCard').val('N');
@@ -56,7 +56,7 @@ jQuery(document).ready(function() {
         return false;
     });
     
-    jQuery('#swipeData').bind('keypress', function(event) {
+    jQuery('#swipeData').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             payCreditCardConfirm();
@@ -68,7 +68,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#firstName').bind('keypress', function(event) {
+    jQuery('#firstName').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             payCreditCardConfirm();
@@ -80,7 +80,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#lastName').bind('keypress', function(event) {
+    jQuery('#lastName').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             payCreditCardConfirm();
@@ -92,7 +92,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#cardNum').bind('keypress', function(event) {
+    jQuery('#cardNum').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             payCreditCardConfirm();
@@ -104,7 +104,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#securityCode').bind('keypress', function(event) {
+    jQuery('#securityCode').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             payCreditCardConfirm();
@@ -116,7 +116,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#amountCreditCard').bind('keypress', function(event) {
+    jQuery('#amountCreditCard').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             payCreditCardConfirm();
@@ -128,7 +128,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#postalCode').bind('keypress', function(event) {
+    jQuery('#postalCode').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             payCreditCardConfirm();
@@ -140,7 +140,7 @@ jQuery(document).ready(function() {
         }
     });
 
-    jQuery('#refNumCreditCard').bind('keypress', function(event) {
+    jQuery('#refNumCreditCard').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             payCreditCardConfirm();
@@ -152,12 +152,12 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#payCreditCardConfirm').bind('click', function(event) {
+    jQuery('#payCreditCardConfirm').on('click', function(event) {
         payCreditCardConfirm();
         return false;
     });
     
-    jQuery('#payCreditCardCancel').bind('click', function(event) {
+    jQuery('#payCreditCardCancel').on('click', function(event) {
         productToSearchFocus();
         return false;
     });

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayGiftCard.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayGiftCard.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayGiftCard.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayGiftCard.js Tue Jan  8 05:25:10 2019
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 */
 jQuery(document).ready(function() {
-    jQuery('#removeGiftCardTotalPaid').bind('click', function(event) {
+    jQuery('#removeGiftCardTotalPaid').on('click', function(event) {
         pleaseWait('Y');
         var param = 'clearCash=N&clearCheck=N&clearGift=Y&clearCredit=N';
         jQuery.ajax({url: 'ClearPayment',
@@ -36,7 +36,7 @@ jQuery(document).ready(function() {
         return false;
     });
     
-    jQuery('#amountGiftCard').bind('keypress', function(event) {
+    jQuery('#amountGiftCard').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             payGiftCardConfirm();
@@ -48,7 +48,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#refNumGiftCard').bind('keypress', function(event) {
+    jQuery('#refNumGiftCard').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             payGiftCardConfirm();
@@ -60,12 +60,12 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#payGiftCardConfirm').bind('click', function(event) {
+    jQuery('#payGiftCardConfirm').on('click', function(event) {
         payGiftCardConfirm();
         return false;
     });
     
-    jQuery('#payGiftCardCancel').bind('click', function(event) {
+    jQuery('#payGiftCardCancel').on('click', function(event) {
         productToSearchFocus();
         return false;
     });

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PromoCode.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PromoCode.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PromoCode.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PromoCode.js Tue Jan  8 05:25:10 2019
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 */
 jQuery(document).ready(function() {
-    jQuery('#promoCode').bind('keypress', function(event) {
+    jQuery('#promoCode').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             promoCodeConfirm();
@@ -29,12 +29,12 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#promoCodeConfirm').bind('click', function(event) {
+    jQuery('#promoCodeConfirm').on('click', function(event) {
         promoCodeConfirm();
         return false;
     });
     
-    jQuery('#promoCodeCancel').bind('click', function(event) {
+    jQuery('#promoCodeCancel').on('click', function(event) {
         productToSearchFocus();
         return false;
     });

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchParties.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchParties.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchParties.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchParties.js Tue Jan  8 05:25:10 2019
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 */
 function partyKeyEvents() {
-    jQuery('#partyToSearch').bind('keypress', function(event) {
+    jQuery('#partyToSearch').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             partySearch();
@@ -25,7 +25,7 @@ function partyKeyEvents() {
         }
     });
     
-    jQuery('#billingAddressSelected').bind('click', function(event) {
+    jQuery('#billingAddressSelected').on('click', function(event) {
         jQuery('#billingAddress').show();
         jQuery('#shippingAddress').hide();
         jQuery('#billingLocation').val("Y");
@@ -34,7 +34,7 @@ function partyKeyEvents() {
         return false;
     });
     
-    jQuery('#shippingAddressSelected').bind('click', function(event) {
+    jQuery('#shippingAddressSelected').on('click', function(event) {
         jQuery('#billingAddress').hide();
         jQuery('#shippingAddress').show();
         jQuery('#billingLocation').val("N");
@@ -43,11 +43,11 @@ function partyKeyEvents() {
         return false;
     });
     
-    jQuery('#searchPartyBy').bind('change', function(event) {
+    jQuery('#searchPartyBy').on('change', function(event) {
         partyToSearchFocus();
     });
     
-    jQuery('#partySearchConfirm').bind('click', function(event) {
+    jQuery('#partySearchConfirm').on('click', function(event) {
         partySearch();
         return false;
     });    
@@ -83,7 +83,7 @@ function getShipMethods() {
     }
     jQuery('#billingPanel').hide();
     jQuery('#shipMethodPanel').show();
-    jQuery('#shipMethod').bind('change', function(event) {
+    jQuery('#shipMethod').on('change', function(event) {
         setShipMethod();
     });
     return result;

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchPartiesResults.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchPartiesResults.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchPartiesResults.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchPartiesResults.js Tue Jan  8 05:25:10 2019
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 */
 jQuery(document).ready(function() { 
-    jQuery('#searchByPartyIdValue').bind('keypress', function(event) {
+    jQuery('#searchByPartyIdValue').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             partySearchAgain();
@@ -29,7 +29,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#searchByPartyLastName').bind('keypress', function(event) {
+    jQuery('#searchByPartyLastName').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             partySearchAgain();
@@ -41,7 +41,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#searchByPartyFirstName').bind('keypress', function(event) {
+    jQuery('#searchByPartyFirstName').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             partySearchAgain();
@@ -53,12 +53,12 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#searchPartiesResultsSearch').bind('click', function(event) {
+    jQuery('#searchPartiesResultsSearch').on('click', function(event) {
         partySearchAgain();
         return false;
     });
     
-    jQuery('#searchPartiesResultsCancel').bind('click', function(event) {
+    jQuery('#searchPartiesResultsCancel').on('click', function(event) {
         jQuery('#searchPartiesResults').hide();
         productToSearchFocus();
         return false;
@@ -155,7 +155,7 @@ function editAddressClick() {
         var id = jQuery(this).attr('id');
         if (id != '') {
             id = '#' + id;
-            jQuery(id).bind('click', function(event) {
+            jQuery(id).on('click', function(event) {
                 editAddress(jQuery('#selectedPartyId' + idx).val(), jQuery('#selectedContactMechId' + idx).val(), jQuery('#selectedContactMechPurposeTypeId' + idx).val());
                 return false;
             });

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchProducts.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchProducts.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchProducts.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchProducts.js Tue Jan  8 05:25:10 2019
@@ -19,7 +19,7 @@ under the License.
 jQuery(document).ready(function() {
     productToSearchFocus();
     
-    jQuery('#productToSearch').bind('keypress', function(event) {
+    jQuery('#productToSearch').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             productSearch();
@@ -27,12 +27,12 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#searchBy').bind('change', function(event) {
+    jQuery('#searchBy').on('change', function(event) {
         productToSearchFocus();
         return false;
     });
     
-    jQuery('#productSearchConfirm').bind('click', function(event) {
+    jQuery('#productSearchConfirm').on('click', function(event) {
         productSearch();
         return false;
     });

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchProductsResults.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchProductsResults.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchProductsResults.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchProductsResults.js Tue Jan  8 05:25:10 2019
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 */
 jQuery(document).ready(function() {
-    jQuery('#searchByProductIdValue').bind('keypress', function(event) {
+    jQuery('#searchByProductIdValue').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;   
         if (code.toString() == 13) {
             productSearchAgain();
@@ -29,7 +29,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#searchByProductName').bind('keypress', function(event) {
+    jQuery('#searchByProductName').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;   
         if (code.toString() == 13) {
             productSearchAgain();
@@ -41,7 +41,7 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#searchByProductDescription').bind('keypress', function(event) {
+    jQuery('#searchByProductDescription').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;   
         if (code.toString() == 13) {
             productSearchAgain();
@@ -53,11 +53,11 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#searchProductsResultsSearch').bind('click', function(event) {
+    jQuery('#searchProductsResultsSearch').on('click', function(event) {
         productSearchAgain();
     });
         
-    jQuery('#searchProductsResultsCancel').bind('click', function(event) {
+    jQuery('#searchProductsResultsCancel').on('click', function(event) {
         jQuery('#searchProductsResults').hide();
         productToSearchFocus();
     });

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ShowCart.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ShowCart.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ShowCart.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ShowCart.js Tue Jan  8 05:25:10 2019
@@ -21,7 +21,7 @@ function selectCartItem() {
         var id = jQuery(this).attr('id');
         if (id != '') {
             id = '#' + id;
-            jQuery(id).bind('click', function(event) {
+            jQuery(id).on('click', function(event) {
                 showCartItemSelected(id);
             });
         }
@@ -30,7 +30,7 @@ function selectCartItem() {
         var id = jQuery(this).attr('id');
         if (id != '') {
             id = '#' + id;
-            jQuery(id).bind('click', function(event) {
+            jQuery(id).on('click', function(event) {
                 showCartItemSelected(id);
             });
         }

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ShowCartItemSelected.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ShowCartItemSelected.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ShowCartItemSelected.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ShowCartItemSelected.js Tue Jan  8 05:25:10 2019
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 */
 function cartItemSelectedEvents(focusOnQuantity) {
-    jQuery('#itemQuantity').bind('keypress', function(event) {
+    jQuery('#itemQuantity').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             updateCartItem();
@@ -26,7 +26,7 @@ function cartItemSelectedEvents(focusOnQ
         } 
     });
     
-    jQuery('#modifyPrice').bind('keypress', function(event) {
+    jQuery('#modifyPrice').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             modifyPrice();
@@ -35,12 +35,12 @@ function cartItemSelectedEvents(focusOnQ
         } 
     });
     
-    jQuery('#incrementQuantity').bind('click', function(event) {
+    jQuery('#incrementQuantity').on('click', function(event) {
         incrementItemQuantity();
         return false;
     });
     
-    jQuery('#decrementQuantity').bind('click', function(event) {
+    jQuery('#decrementQuantity').on('click', function(event) {
         decrementItemQuantity();
         return false;
     });

Modified: ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/VoidOrder.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/VoidOrder.js?rev=1850714&r1=1850713&r2=1850714&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/VoidOrder.js (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/VoidOrder.js Tue Jan  8 05:25:10 2019
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 */
 jQuery(document).ready(function() {
-    jQuery('#orderId').bind('keypress', function(event) {
+    jQuery('#orderId').on('keypress', function(event) {
         code = event.keyCode ? event.keyCode : event.which;
         if (code.toString() == 13) {
             voidOrderConfirm();
@@ -29,12 +29,12 @@ jQuery(document).ready(function() {
         }
     });
     
-    jQuery('#voidOrderConfirm').bind('click', function(event) {
+    jQuery('#voidOrderConfirm').on('click', function(event) {
         voidOrderConfirm();
         return false;
     });
     
-    jQuery('#voidOrderCancel').bind('click', function(event) {
+    jQuery('#voidOrderCancel').on('click', function(event) {
         productToSearchFocus();
         return false;
     });