Changeset 29560
- Timestamp:
- 08/21/2014 02:34:23 AM (8 years ago)
- Location:
- trunk/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/js/image-edit.js
r29269 r29560 303 303 this._view = view; 304 304 305 var d ata, elem = $('#image-editor-' + postid), head = $('#media-head-' + postid),305 var dfd, data, elem = $('#image-editor-' + postid), head = $('#media-head-' + postid), 306 306 btn = $('#imgedit-open-btn-' + postid), spin = btn.siblings('.spinner'); 307 307 … … 316 316 }; 317 317 318 elem.load(ajaxurl, data, function() { 318 dfd = $.ajax({ 319 url: ajaxurl, 320 type: 'post', 321 data: data 322 }).done(function( html ) { 323 elem.html( html ); 319 324 head.fadeOut('fast', function(){ 320 325 elem.fadeIn('fast'); … … 323 328 }); 324 329 }); 330 331 return dfd; 325 332 }, 326 333 -
trunk/src/wp-includes/css/media-views.css
r29548 r29560 2718 2718 * This should be OOCSS'd so both use a shared selector. 2719 2719 */ 2720 .edit-attachment-frame { 2721 display: block; 2722 height: 100%; 2723 width: 100%; 2724 } 2725 2720 2726 .edit-attachment-frame .edit-media-header { 2721 2727 overflow: hidden; … … 2774 2780 } 2775 2781 2782 .edit-attachment-frame .edit-media-header .left:hover, 2776 2783 .edit-attachment-frame .edit-media-header .right:hover, 2777 .edit-attachment-frame .edit-media-header .left:hover { 2784 .edit-attachment-frame .edit-media-header .left:focus, 2785 .edit-attachment-frame .edit-media-header .right:focus { 2778 2786 color: #2ea2cc; 2779 2787 } -
trunk/src/wp-includes/js/media-grid.js
r29551 r29560 366 366 367 367 events: { 368 'click .left': 'previousMediaItem', 369 'click .right': 'nextMediaItem' 368 'click .left': 'previousMediaItem', 369 'click .right': 'nextMediaItem', 370 'keydown': 'keyEvent' 370 371 }, 371 372 … … 523 524 previousMediaItem: function() { 524 525 if ( ! this.hasPrevious() ) { 526 this.$( '.left' ).blur(); 525 527 return; 526 528 } 527 529 this.model = this.library.at( this.getCurrentIndex() - 1 ); 528 529 530 this.rerender(); 531 this.$( '.left' ).focus(); 530 532 }, 531 533 … … 535 537 nextMediaItem: function() { 536 538 if ( ! this.hasNext() ) { 539 this.$( '.right' ).blur(); 537 540 return; 538 541 } 539 542 this.model = this.library.at( this.getCurrentIndex() + 1 ); 540 541 543 this.rerender(); 544 this.$( '.right' ).focus(); 542 545 }, 543 546 … … 557 560 */ 558 561 keyEvent: function( event ) { 559 var $target = $( event.target ); 560 561 //Don't go left/right if we are in a textarea or input field 562 if ( $target.is( 'input' ) || $target.is( 'textarea' ) ) { 563 return event; 564 } 565 566 // Escape key, while in the Edit Image mode 567 if ( 27 === event.keyCode ) { 568 this.modal.close(); 562 if ( 'INPUT' === event.target.tagName && ! ( event.target.readOnly || event.target.disabled ) ) { 563 return; 569 564 } 570 565 -
trunk/src/wp-includes/js/media-views.js
r29558 r29560 3257 3257 } 3258 3258 3259 $el.find( '.media-modal-close' ).focus();3259 this.$( '.media-modal-close' ).focus(); 3260 3260 3261 3261 return this.propagate('open'); … … 4810 4810 // Catch arrow events 4811 4811 if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) { 4812 this. arrowEvent(event);4812 this.controller.trigger( 'attachment:keydown:arrow', event ); 4813 4813 return; 4814 4814 } … … 4849 4849 // Don't scroll the view and don't attempt to submit anything. 4850 4850 event.stopPropagation(); 4851 },4852 /**4853 * @param {Object} event4854 */4855 arrowEvent: function( event ) {4856 this.controller.trigger( 'attachment:keydown:arrow', event );4857 return false;4858 4851 }, 4859 4852 /** … … 6579 6572 this.$( ':tabbable' ).eq( 0 ).blur(); 6580 6573 return false; 6574 } 6575 6576 if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) { 6577 this.controller.trigger( 'attachment:keydown:arrow', event ); 6578 return; 6581 6579 } 6582 6580 } … … 7158 7156 7159 7157 loadEditor: function() { 7160 this.editor.open( this.model.get('id'), this.model.get('nonces').edit, this ); 7158 var dfd = this.editor.open( this.model.get('id'), this.model.get('nonces').edit, this ); 7159 dfd.done( _.bind( this.focus, this ) ); 7160 }, 7161 7162 focus: function() { 7163 this.$( '.imgedit-submit .button' ).eq( 0 ).focus(); 7161 7164 }, 7162 7165
Note: See TracChangeset
for help on using the changeset viewer.