105c8f2a by Adam Heath

Flow doesn't handle accept=undefined on the incoming options correctly.

1 parent a90ccb0c
...@@ -186,9 +186,11 @@ define(function(require) { ...@@ -186,9 +186,11 @@ define(function(require) {
186 var eventHandler = Upload.flowEventHandlers[eventName] || makeFallbackFlowEventHandler(eventName); 186 var eventHandler = Upload.flowEventHandlers[eventName] || makeFallbackFlowEventHandler(eventName);
187 flow.on(eventName, _.bind(eventHandler, instance)); 187 flow.on(eventName, _.bind(eventHandler, instance));
188 }); 188 });
189 flow.assignBrowse(el, true, false, { 189 var assignOptions = {};
190 accept: model.get('accept'), 190 if (locals.accept) {
191 }); 191 assignOptions.accept = locals.accept;
192 }
193 flow.assignBrowse(el, true, false, assignOptions);
192 flow.assignDrop(el); 194 flow.assignDrop(el);
193 instance.view = rivets.bind($(el).contents(), this.view.models); 195 instance.view = rivets.bind($(el).contents(), this.view.models);
194 return {}; 196 return {};
......