Merge branch 'hotfix/content-autofill'

valeriangalliat · valeriangalliat · commit 3a8a00e8891d · 2015-03-16T18:38:56.000+01:00
diff --git 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"
diff --git 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 '';
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`"url": "https://twitter.com/pascalduez"`
`22`	`22`	`}`
`23`	`23`	`],`
`24`		`- "version": "2.1.4",`
	`24`	`+ "version": "2.1.5",`
`25`	`25`	`"license": {`
`26`	`26`	`"type": "MIT",`
`27`	`27`	`"url": "http://opensource.org/licenses/MIT"`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ export default function content() {`
`7`	`7`	`},`
`8`	`8`
`9`	`9`	`autofill(item) {`
`10`		`- if (item.context.code.indexOf('@content') > -1) {`
	`10`	`+ if (!item.content && item.context.code.indexOf('@content') > -1) {`
`11`	`11`	`return '';`
`12`	`12`	`}`
`13`	`13`	`},`