Merged in release/release-1.09 (pull request #10)
Release/release 1.09 * Install missing plugins * rs set to 1 * rebase pantheon for aws * rebase pantheon for aws * prod config change * prod config change * fix campaing issue * revert Approved-by: Jay Sharma
This commit is contained in:
committed by
Jay Sharma
parent
779393381f
commit
22f10a9edd
@@ -54,10 +54,8 @@
|
||||
events: {
|
||||
'click .modal-close': 'closeButton',
|
||||
'click #btn-ok' : 'addButton',
|
||||
'click #btn-next' : 'nextButton',
|
||||
'touchstart #btn-ok': 'addButton',
|
||||
'keydown' : 'keyboardActions',
|
||||
'input' : 'handleInputValidation'
|
||||
'keydown' : 'keyboardActions'
|
||||
},
|
||||
resizeContent: function() {
|
||||
var $content = $( '.wc-backbone-modal-content' ).find( 'article' );
|
||||
@@ -96,9 +94,9 @@
|
||||
|
||||
$( document.body ).trigger( 'wc_backbone_modal_loaded', this._target );
|
||||
},
|
||||
closeButton: function( e, addButtonCalled ) {
|
||||
closeButton: function( e ) {
|
||||
e.preventDefault();
|
||||
$( document.body ).trigger( 'wc_backbone_modal_before_remove', [ this._target, this.getFormData(), !!addButtonCalled ] );
|
||||
$( document.body ).trigger( 'wc_backbone_modal_before_remove', this._target );
|
||||
this.undelegateEvents();
|
||||
$( document ).off( 'focusin' );
|
||||
$( document.body ).css({
|
||||
@@ -109,21 +107,12 @@
|
||||
},
|
||||
addButton: function( e ) {
|
||||
$( document.body ).trigger( 'wc_backbone_modal_response', [ this._target, this.getFormData() ] );
|
||||
this.closeButton( e, true );
|
||||
this.closeButton( e );
|
||||
},
|
||||
nextButton: function( e ) {
|
||||
var context = this;
|
||||
function closeModal() {
|
||||
context.closeButton( e );
|
||||
}
|
||||
$( document.body ).trigger( 'wc_backbone_modal_next_response', [ this._target, this.getFormData(), closeModal ] );
|
||||
},
|
||||
getFormData: function( updating = true ) {
|
||||
getFormData: function() {
|
||||
var data = {};
|
||||
|
||||
if ( updating ) {
|
||||
$( document.body ).trigger( 'wc_backbone_modal_before_update', this._target );
|
||||
}
|
||||
$( document.body ).trigger( 'wc_backbone_modal_before_update', this._target );
|
||||
|
||||
$.each( $( 'form', this.$el ).serializeArray(), function( index, item ) {
|
||||
if ( item.name.indexOf( '[]' ) !== -1 ) {
|
||||
@@ -137,9 +126,6 @@
|
||||
|
||||
return data;
|
||||
},
|
||||
handleInputValidation: function() {
|
||||
$( document.body ).trigger( 'wc_backbone_modal_validation', [ this._target, this.getFormData( false ) ] );
|
||||
},
|
||||
keyboardActions: function( e ) {
|
||||
var button = e.keyCode || e.which;
|
||||
|
||||
@@ -148,11 +134,7 @@
|
||||
13 === button &&
|
||||
! ( e.target.tagName && ( e.target.tagName.toLowerCase() === 'input' || e.target.tagName.toLowerCase() === 'textarea' ) )
|
||||
) {
|
||||
if ( $( '#btn-ok' ).length ) {
|
||||
this.addButton( e );
|
||||
} else if ( $( '#btn-next' ).length ) {
|
||||
this.nextButton( e );
|
||||
}
|
||||
this.addButton( e );
|
||||
}
|
||||
|
||||
// ESC key
|
||||
|
||||
Reference in New Issue
Block a user