From 84bd83e296722159da675197112ff8ada61f94bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= Date: Mon, 16 Mar 2015 18:37:20 +0100 Subject: [PATCH 1/2] Bump 2.1.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 024fb477..4eb44c7c 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "url": "https://twitter.com/pascalduez" } ], - "version": "2.1.4", + "version": "2.1.5", "license": { "type": "MIT", "url": "http://opensource.org/licenses/MIT" From 399bbd076834210b023be41d0d5131ce4ccb916b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= Date: Mon, 16 Mar 2015 18:37:36 +0100 Subject: [PATCH 2/2] Do not autofill `content` if already defined This prevents `@content` annotation value to be replaced with an empty string if the autofill is triggered. Refs: #383 --- src/annotation/annotations/content.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/annotation/annotations/content.js b/src/annotation/annotations/content.js index f974c238..15c68e24 100644 --- a/src/annotation/annotations/content.js +++ b/src/annotation/annotations/content.js @@ -7,7 +7,7 @@ export default function content() { }, autofill(item) { - if (item.context.code.indexOf('@content') > -1) { + if (!item.content && item.context.code.indexOf('@content') > -1) { return ''; } },