WordPress 4.4

[autoinstalls/wordpress.git] / wp-includes / js / media-views.js

diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js
index 0f53b0a8c4eabcb53fe3842b3e6bc44f9ce83a40..5d2fe6056219063c109a93d19686fc04621bfe3e 100644 (file)
--- a/wp-includes/js/media-views.js
+++ b/wp-includes/js/media-views.js
@@ -1182,9 +1182,9 @@ Library = wp.media.controller.State.extend({
                var defaultProps = wp.media.view.settings.defaultProps;
                this._displays = [];
                this._defaultDisplaySettings = {
-                       align: defaultProps.align || getUserSetting( 'align', 'none' ),
-                       size:  defaultProps.size  || getUserSetting( 'imgsize', 'medium' ),
-                       link:  defaultProps.link  || getUserSetting( 'urlbutton', 'file' )
+                       align: getUserSetting( 'align', defaultProps.align ) || 'none',
+                       size:  getUserSetting( 'imgsize', defaultProps.size ) || 'medium',
+                       link:  getUserSetting( 'urlbutton', defaultProps.link ) || 'none'
                };
        },
 
@@ -7855,6 +7855,10 @@ EditorUploader = View.extend({
 
                this.$document.on( 'dragstart dragend drop', _.bind( function( event ) {
                        this.localDrag = event.type === 'dragstart';
+
+                       if ( event.type === 'drop' ) {
+                               this.containerDragleave();
+                       }
                }, this ) );
 
                this.initialized = true;