@@ -1,7 +1,9 @@ <%= javascript_include_merged :base %> <% javascript_tag do %> - var attachmentOnChange = function(element) { + var attachmentOnChange = function(element) { + warn('element = ' + element); + warn('element value = ' + element.value); attachment_uuid = '<%= current_object.attachment_uuid %>'; with(window.parent) { window.eval('attachmentOnChangeUpdateParent("' + attachment_uuid + '","' + escape(element.value) + '")'); app/views/attachments/new.html.erb @@ -525,18 +525,23 @@ var findSubmit = function(form_element_or_id) { } var attachmentOnChangeUpdateParent = function(attachment_uuid, filename) { - filename = unescape(filename); - if (short_name = filename.match(/([^\/\\]+)\.\w+$/)[1]) { - filename = short_name; - } preview_slot = document.getElementById(attachment_uuid + '-preview'); // TODO: report prototype bug: preview_slot.update should work but fails in IE - Element.update(preview_slot, '<img src="/images/wait_lg.gif"> Uploading...'); + Element.update(preview_slot, '<img src="/images/wait_lg.gif"> Uploading...'); + + // Set the card name from filename if we can find the name field and it's blank. if (name_field = preview_slot.up('form').down('.card-name-field')) { if (!name_field.value || name_field.value.blank()) { + filename = unescape(filename); + // chop off directories etc. + if (match_bits = filename.match(/([^\/\\]+)\.\w+$/)) { + filename = match_bits[1]; + } name_field.value = filename; } - } + } + + // for now, don't let users submit while the image is in process of uploading. deactivateSubmit(attachment_uuid); } public/javascripts/application.js d990424a8b95a4581b3c2110e483b0984331473f Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/624bb5c20c6f102628be04660512d27e13ead4d5 624bb5c20c6f102628be04660512d27e13ead4d5 2009-06-16T14:50:12-07:00 2009-06-16T14:50:12-07:00 fix image update bug existing code depended on regex matching, so it was failing for files with no filesystem path prepended. the presense of this was somewhat browser dependent. 25f036665727946ec1956b24137bf5b99a57c689 Lewis Hoffman lewis@grasscommons.org