fixes for non-image attachments, closes #45 (#46)

followup fix for non-image uploads

readme.markdown

@@ -244,6 +244,19 @@ For more information on file uploads, see [`bureaucracy`](https://github.com/bev
 
 Virtually the same as `images`, except an anchor `<a>` tag will be used instead of an image `<img>` tag.
 
+To set the formatting of the inserted attachment link, set `options.mergeHtmlAndAttachment`; the default follows this format:
+
+```js
+function mergeHtmlAndAttachment (chunks, link) {
+  var linkText = chunks.selection || link.title;
+  return {
+    before: chunks.before,
+    selection: '<a href="' + link.href + '">' + linkText + '</a>',
+    after: chunks.after,
+  };
+}
+```
+
 # `editor`
 
 The `editor` API allows you to interact with `woofmark` editor instances. This is what you get back from `woofmark(textarea, options)` or `woofmark.find(textarea)`.

src/bindCommands.js

@@ -71,14 +71,22 @@ function bindCommands (surface, options, editor) {
         prompts: options.prompts,
         upload: options[type + 's'],
         classes: options.classes,
-        mergeHtmlAndAttachment: options.mergeHtmlAndAttachment,
+        mergeHtmlAndAttachment: options.mergeHtmlAndAttachment || mergeHtmlAndAttachment,
         autoUpload: autoUpload
       });
     };
   }
   function bind (id, combo, fn) {
     return editor.addCommandButton(id, combo, suppress(fn));
   }
+  function mergeHtmlAndAttachment (chunks, link) {
+    var linkText = chunks.selection || link.title;
+    return {
+      before: chunks.before,
+      selection: '<a href="' + link.href + '">' + linkText + '</a>',
+      after: chunks.after,
+    };
+  }
   function router (method) {
     return function routed (mode, chunks) { commands[mode][method].call(this, chunks); };
   }

src/html/linkOrImageOrAttachment.js

@@ -48,7 +48,7 @@ function linkOrImageOrAttachment (chunks, options) {
     var link = links[0];
 
     if (type === 'attachment') {
-      parts = options.mergeHtmlAndAttachment(chunks.before + chunks.selection + chunks.after, link);
+      parts = options.mergeHtmlAndAttachment(chunks, link);
       chunks.before = parts.before;
       chunks.selection = parts.selection;
       chunks.after = parts.after;

src/prompts/prompt.js

@@ -114,7 +114,7 @@ function prompt (options, done) {
       fieldKey: upload.fieldKey,
       xhrOptions: upload.xhrOptions,
       endpoint: upload.url,
-      validate: 'image'
+      validate: upload.validate || 'image'
     });
 
     bureaucrat.on('started', function () {