Ticket #22637: 22637.diff
File 22637.diff, 4.5 KB (added by , 13 years ago) |
---|
-
wp-includes/css/media-views.css
267 267 *max-width: 55%; /* IE7 */ 268 268 } 269 269 270 .media-sidebar .setting input[type="checkbox"] { 271 margin-top: 10px; 272 } 273 270 274 .media-sidebar .setting span, 271 275 .compat-item label span { 272 276 float: left; -
wp-includes/js/media-editor.js
189 189 args.type = 'image'; 190 190 args.perPage = -1; 191 191 192 // Mark the `orderby` override attribute. 193 if ( 'rand' === attrs.orderby ) 194 attrs._orderbyRandom = true; 195 192 196 // Map the `orderby` attribute to the corresponding model property. 193 197 if ( ! attrs.orderby || /^menu_order(?: ID)?$/i.test( attrs.orderby ) ) 194 198 args.orderby = 'menuOrder'; … … 232 236 if ( props.uploadedTo ) 233 237 attrs.id = props.uploadedTo; 234 238 239 // Check if the gallery is randomly ordered. 240 if ( attrs._orderbyRandom ) 241 attrs.orderby = 'rand'; 242 delete attrs._orderbyRandom; 243 235 244 // If the `ids` attribute is set and `orderby` attribute 236 245 // is the default value, clear it for cleaner output. 237 246 if ( attrs.ids && 'post__in' === attrs.orderby ) -
wp-includes/js/media-views.js
530 530 }, 531 531 532 532 gallerySettings: function() { 533 var library = this.get('library'); 533 var library = this.get('library'), 534 browser; 534 535 535 536 if ( ! library ) 536 537 return; 537 538 538 539 library.gallery = library.gallery || new Backbone.Model(); 539 540 540 this.frame.content.view().sidebar.set({ 541 browser = this.frame.content.view(); 542 543 browser.sidebar.set({ 541 544 gallery: new media.view.Settings.Gallery({ 542 545 controller: this, 543 546 model: library.gallery, 544 547 priority: 40 545 548 }) 546 549 }); 550 551 browser.toolbar.set( 'reverse', { 552 text: l10n.reverseOrder, 553 priority: 80, 554 555 click: function() { 556 library.reset( library.toArray().reverse() ); 557 } 558 }); 547 559 } 548 560 }); 549 561 … … 3369 3381 } else if ( $setting.is('input[type="text"], textarea') ) { 3370 3382 if ( ! $setting.is(':focus') ) 3371 3383 $setting.val( value ); 3384 3385 // Handle checkboxes. 3386 } else if ( $setting.is('input[type="checkbox"]') ) { 3387 $setting.attr( 'checked', !! value ); 3372 3388 } 3373 3389 }, 3374 3390 … … 3382 3398 if ( ! $setting.length ) 3383 3399 return; 3384 3400 3401 // Use the correct value for checkboxes. 3402 if ( $setting.is('input[type="checkbox"]') ) 3403 value = $setting[0].checked; 3404 3405 // Update the corresponding setting. 3385 3406 this.model.set( $setting.data('setting'), value ); 3386 3407 3387 3408 // If the setting has a corresponding user setting, … … 3451 3472 3452 3473 $input.show(); 3453 3474 3454 if ( 'post' == linkTo ) {3475 if ( 'post' === linkTo ) { 3455 3476 $input.val( attachment.get('link') ); 3456 } else if ( 'file' == linkTo ) {3477 } else if ( 'file' === linkTo ) { 3457 3478 $input.val( attachment.get('url') ); 3458 3479 } else if ( ! this.model.get('linkUrl') ) { 3459 3480 $input.val('http://'); 3460 3481 } 3461 3482 3462 $input.prop( 'readonly', 'custom' !== linkTo);3483 $input.prop( 'readonly', 'custom' !== linkTo ); 3463 3484 3464 3485 // If the input is visible, focus and select its contents. 3465 3486 if ( $input.is(':visible') ) -
wp-includes/media.php
670 670 $instance++; 671 671 672 672 if ( ! empty( $attr['ids'] ) ) { 673 // 'ids' is explicitly ordered 674 $attr['orderby'] = 'post__in'; 673 // 'ids' is explicitly ordered, unless you specify otherwise. 674 if ( empty( $attr['orderby'] ) ) 675 $attr['orderby'] = 'post__in'; 675 676 $attr['include'] = $attr['ids']; 676 677 } 677 678 … … 1474 1475 'updateGallery' => __( 'Update gallery' ), 1475 1476 'continueEditing' => __( 'Continue editing' ), 1476 1477 'addToGallery' => __( 'Add to gallery' ), 1478 'reverseOrder' => __( 'Reverse order' ), 1477 1479 ); 1478 1480 1479 1481 $settings = apply_filters( 'media_view_settings', $settings, $post ); … … 1847 1849 <?php endfor; ?> 1848 1850 </select> 1849 1851 </label> 1852 1853 <label class="setting"> 1854 <span><?php _e('Random'); ?></span> 1855 <input type="checkbox" data-setting="_orderbyRandom" /> 1856 </label> 1850 1857 </script> 1851 1858 1852 1859 <script type="text/html" id="tmpl-embed-link-settings">