@@ -95,16 +95,19 @@ define([
95
95
* @param {jQuery.event } e
96
96
*/
97
97
highlightDropzone : function ( e ) {
98
- var draggedItem = e . originalEvent . dataTransfer . items [ 0 ] ,
98
+ var draggedItem ,
99
99
$dropzone = $ ( e . target ) . closest ( this . dropZone ) ,
100
100
$otherDropzones = $ ( this . dropZone ) . not ( $dropzone ) ,
101
101
isInsideDropzone = ! ! $dropzone . length ;
102
102
103
- if ( draggedItem . kind === 'file' &&
104
- ( draggedItem . type === 'image/png' ||
105
- draggedItem . type === 'image/gif' ||
106
- draggedItem . type === 'image/jpg' )
103
+ if ( ! e . originalEvent . dataTransfer . items . length
107
104
) {
105
+ return false ;
106
+ }
107
+
108
+ draggedItem = e . originalEvent . dataTransfer . items [ 0 ] ;
109
+
110
+ if ( draggedItem . kind === 'file' && / i m a g e \/ / . test ( draggedItem . type ) ) {
108
111
if ( isInsideDropzone ) {
109
112
$dropzone
110
113
. removeClass ( this . classes . draggingOutside )
@@ -185,6 +188,7 @@ define([
185
188
*/
186
189
updateResponsiveClasses : function ( ) {
187
190
var classesToAdd = [ ] ,
191
+ classConfig ,
188
192
elementWidth = this . $uploadArea . width ( ) ,
189
193
modifierClass ;
190
194
@@ -195,17 +199,16 @@ define([
195
199
this . $uploadArea . removeClass ( Object . keys ( this . elementWidthModifierClasses ) . join ( ' ' ) ) ;
196
200
197
201
for ( modifierClass in this . elementWidthModifierClasses ) {
198
- if ( this . elementWidthModifierClasses . hasOwnProperty ( modifierClass ) && (
199
- this . elementWidthModifierClasses [ modifierClass ] . minWidth &&
200
- this . elementWidthModifierClasses [ modifierClass ] . maxWidth &&
201
- ( this . elementWidthModifierClasses [ modifierClass ] . minWidth <= elementWidth &&
202
- elementWidth <= this . elementWidthModifierClasses [ modifierClass ] . maxWidth ) ||
203
- this . elementWidthModifierClasses [ modifierClass ] . minWidth &&
204
- ! this . elementWidthModifierClasses [ modifierClass ] . maxWidth &&
205
- this . elementWidthModifierClasses [ modifierClass ] . minWidth <= elementWidth ||
206
- this . elementWidthModifierClasses [ modifierClass ] . maxWidth &&
207
- ! this . elementWidthModifierClasses [ modifierClass ] . minWidth &&
208
- elementWidth <= this . elementWidthModifierClasses [ modifierClass ] . maxWidth )
202
+ if ( ! this . elementWidthModifierClasses . hasOwnProperty ( modifierClass ) ) {
203
+ continue ;
204
+ }
205
+
206
+ classConfig = this . elementWidthModifierClasses [ modifierClass ] ;
207
+
208
+ if ( classConfig . minWidth && classConfig . maxWidth &&
209
+ ( classConfig . minWidth <= elementWidth && elementWidth <= classConfig . maxWidth ) ||
210
+ classConfig . minWidth && ! classConfig . maxWidth && classConfig . minWidth <= elementWidth ||
211
+ classConfig . maxWidth && ! classConfig . minWidth && elementWidth <= classConfig . maxWidth
209
212
) {
210
213
classesToAdd . push ( modifierClass ) ;
211
214
}
0 commit comments