WordPress.org

Make WordPress Core

Changeset 22825


Ignore:
Timestamp:
11/22/2012 12:54:49 PM (8 years ago)
Author:
koopersmith
Message:

Media: Use a full uploader status view in the inline uploader. see #21390.

Location:
trunk/wp-includes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/css/media-views.css

    r22824 r22825  
    758758    position: relative;
    759759    padding-bottom: 10px;
     760}
     761
     762.media-sidebar .media-uploader-status {
    760763    border-bottom: 1px solid #dfdfdf;
    761764    box-shadow: 0 1px 0 #fff;
     765}
     766
     767.uploader-inline .media-uploader-status h3 {
     768    display: none;
    762769}
    763770
     
    792799
    793800.media-uploader-status .upload-dismiss-errors {
    794     position: absolute;
    795     top: 0;
    796     right: 0;
    797801    text-decoration: none;
     802}
     803
     804.media-sidebar .media-uploader-status .upload-dismiss-errors {
     805    position: absolute;
     806    top: 0;
     807    right: 0;
    798808}
    799809
     
    812822    font-weight: bold;
    813823    color: #fff;
    814     background: #f00;
    815     background: -webkit-linear-gradient( top, #e00, #a00 );
     824    background: #e00;
     825    background-image: -webkit-gradient(linear, left top, left bottom, from(#e00), to(#a00));
     826    background-image: -webkit-linear-gradient(top, #e00, #a00);
     827    background-image:    -moz-linear-gradient(top, #e00, #a00);
     828    background-image:      -o-linear-gradient(top, #e00, #a00);
     829    background-image:   linear-gradient(to bottom, #e00, #a00);
    816830    border-radius: 3px;
    817831}
  • trunk/wp-includes/js/media-views.js

    r22824 r22825  
    17941794                this.options.$browser = this.controller.uploader.$browser;
    17951795
    1796             wp.Uploader.errors.on( 'add', this.error, this );
    1797         },
    1798 
    1799         dispose: function() {
    1800             wp.Uploader.errors.off( null, null, this );
    1801             media.View.prototype.dispose.apply( this, arguments );
    1802             return this;
    1803         },
    1804 
    1805         error: function( error ) {
    1806             this.views.set( '.upload-errors', new media.view.UploaderStatusError({
    1807                 filename: error.get('file').name,
    1808                 message:  error.get('message')
     1796            this.views.set( '.upload-inline-status', new media.view.UploaderStatus({
     1797                controller: this.controller
    18091798            }) );
    18101799        },
     
    18451834
    18461835            this.errors = wp.Uploader.errors;
     1836            this.errors.reset();
    18471837            this.errors.on( 'add remove reset', this.visibility, this );
    18481838            this.errors.on( 'add', this.error, this );
    1849             _.each( this.errors.models, this.error, this );
    18501839        },
    18511840
  • trunk/wp-includes/media.php

    r22824 r22825  
    14981498            </div>
    14991499
    1500             <div class="upload-errors"></div>
     1500            <div class="upload-inline-status"></div>
    15011501
    15021502            <div class="post-upload-ui">
Note: See TracChangeset for help on using the changeset viewer.