← All changes
|
assets/src/apps/js/admin/pages/tools/database/upgrade.js
+14
-4
4.1.7
→
4.4.9
View file →
| @@ -10,8 +10,9 @@ | ||
| 10 | 10 | const elWrapperTermsUpgrade = elToolUpgradeDB.find( '.wrapper-terms-upgrade' ); |
| 11 | 11 | const elStatusUpgrade = elToolUpgradeDB.find( '.wrapper-lp-status-upgrade' ); |
| 12 | 12 | const elWrapperUpgradeMessage = elToolUpgradeDB.find( '.wrapper-lp-upgrade-message' ); |
| 13 | 13 | let checkValidBeforeUpgrade = null; |
| 14 | + const elMessageUpgrading = $( 'input[name=message-when-upgrading]' ).val(); | |
| 14 | 15 | |
| 15 | 16 | if ( elWrapperTermsUpgrade.length ) { // Show Terms Upgrade. |
| 16 | 17 | lpModalOverlay.setContentModal( elWrapperTermsUpgrade.html() ); |
| 17 | 18 | |
| @@ -17,9 +18,8 @@ | ||
| 17 | 18 | |
| 18 | 19 | const elTermUpdate = lpModalOverlay.elLPOverlay.find( '.terms-upgrade' ); |
| 19 | 20 | const elLPAgreeTerm = elTermUpdate.find( 'input[name=lp-agree-term]' ); |
| 20 | 21 | const elTermMessage = elTermUpdate.find( '.error' ); |
| 21 | - const elMessageUpgrading = $( 'input[name=message-when-upgrading]' ).val(); | |
| 22 | 22 | |
| 23 | 23 | checkValidBeforeUpgrade = function() { |
| 24 | 24 | elTermMessage.hide(); |
| 25 | 25 | elTermMessage.removeClass( 'learn-press-message' ); |
| @@ -27,9 +27,8 @@ | ||
| 27 | 27 | if ( elLPAgreeTerm.is( ':checked' ) ) { |
| 28 | 28 | handleAjax( '/lp/v1/database/agree_terms', { agree_terms: 1 }, {} ); |
| 29 | 29 | |
| 30 | 30 | lpModalOverlay.elFooter.find( '.learn-press-notice' ).remove(); |
| 31 | - lpModalOverlay.elFooter.prepend( '<span class="learn-press-notice">' + elMessageUpgrading + '</span>' ); | |
| 32 | 31 | lpModalOverlay.setContentModal( elStatusUpgrade.html() ); |
| 33 | 32 | |
| 34 | 33 | return true; |
| 35 | 34 | } |
| @@ -51,14 +50,20 @@ | ||
| 51 | 50 | |
| 52 | 51 | lpModalOverlay.setTitleModal( elToolUpgradeDB.find( 'h2' ).html() ); |
| 53 | 52 | lpModalOverlay.elBtnYes.text( 'Upgrade' ); |
| 54 | 53 | lpModalOverlay.elBtnYes.show(); |
| 55 | - lpModalOverlay.elBtnNo.text( 'close' ); | |
| 56 | - lpModalOverlay.callBackYes = function() { | |
| 54 | + lpModalOverlay.elBtnNo.text( 'Cancel' ); | |
| 55 | + lpModalOverlay.callBackYes = function( e ) { | |
| 57 | 56 | if ( ! checkValidBeforeUpgrade() ) { |
| 58 | 57 | return; |
| 59 | 58 | } |
| 60 | 59 | |
| 60 | + const target = e.target; | |
| 61 | + // Show message note when upgrading. | |
| 62 | + if ( target.innerText === 'Upgrade' ) { | |
| 63 | + lpModalOverlay.elFooter.prepend( '<span class="learn-press-notice">' + elMessageUpgrading + '</span>' ); | |
| 64 | + } | |
| 65 | + | |
| 61 | 66 | isUpgrading = 1; |
| 62 | 67 | |
| 63 | 68 | lpModalOverlay.elBtnYes.hide(); |
| 64 | 69 | lpModalOverlay.elBtnNo.hide(); |
| @@ -102,8 +107,12 @@ | ||
| 102 | 107 | // Scroll to step current. |
| 103 | 108 | const scrollToStepCurrent = ( stepCurrent ) => { |
| 104 | 109 | elItemStepCurrent = elGroupStep.find( 'input[value=' + stepCurrent + ']' ).closest( '.lp-item-step' ); |
| 105 | 110 | |
| 111 | + if ( ! elItemStepCurrent.length ) { | |
| 112 | + return; | |
| 113 | + } | |
| 114 | + | |
| 106 | 115 | const offset = elItemStepCurrent.offset().top - lpModalOverlay.elMainContent.offset().top + |
| 107 | 116 | lpModalOverlay.elMainContent.scrollTop(); |
| 108 | 117 | |
| 109 | 118 | lpModalOverlay.elMainContent.stop().animate( { |
| @@ -136,8 +145,9 @@ | ||
| 136 | 145 | setTimeout( () => { |
| 137 | 146 | lpModalOverlay.setContentModal( elWrapperUpgradeMessage.html() ); |
| 138 | 147 | }, 1000 ); |
| 139 | 148 | lpModalOverlay.elFooter.find( '.learn-press-notice' ).remove(); |
| 149 | + lpModalOverlay.elBtnNo.text( 'Close' ); | |
| 140 | 150 | lpModalOverlay.elBtnNo.show(); |
| 141 | 151 | lpModalOverlay.elBtnNo.on( 'click', () => { |
| 142 | 152 | window.location.reload(); |
| 143 | 153 | } ); |