Merge branch 'dev'

MCStreetguy · Jul 30, 2017 · ee7d2a2 · ee7d2a2
2 parents 6b20aa2 + 9824acb
commit ee7d2a2
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 1 deletion.
diff --git a/lib/snippet-injector.js b/lib/snippet-injector.js
@@ -193,7 +193,8 @@ export default {
         listitems.push({
           title: elem.getTitle(),
           uid: elem.getUID(),
-          tags: elem.getTags()
+          tags: elem.getTags(),
+          author: elem.getAuthor()
         });
         icons.push(elem.getLang());
       });

diff --git a/lib/util.js b/lib/util.js
@@ -144,8 +144,11 @@ export default class Util {
           if(text !== '' && text !== ' ' && text !== null && text !== undefined) {
             var title = element.title.toLowerCase();
             var tags = element.tags.join(' ').toLowerCase();
+            var author = element.author.toLowerCase();
             if(text.startsWith('#')) {
               return (tags.indexOf(text.split('#').join('')) > -1 ? true : false);
+            } else if(text.startsWith('@')) {
+              return (author.indexOf(text.split('@').join('')) > -1 ? true : false);
             } else {
               return (title.indexOf(text) > -1 ? true : false);
             }

diff --git a/screenshots/create_step_1-small.png → wiki/create_step_1-small.png b/screenshots/create_step_1-small.png → wiki/create_step_1-small.png
diff --git a/screenshots/create_step_2-small.png → wiki/create_step_2-small.png b/screenshots/create_step_2-small.png → wiki/create_step_2-small.png
diff --git a/screenshots/create_step_3-small.png → wiki/create_step_3-small.png b/screenshots/create_step_3-small.png → wiki/create_step_3-small.png
diff --git a/screenshots/delete_step_1-small.png → wiki/delete_step_1-small.png b/screenshots/delete_step_1-small.png → wiki/delete_step_1-small.png
diff --git a/screenshots/delete_step_2-small.png → wiki/delete_step_2-small.png b/screenshots/delete_step_2-small.png → wiki/delete_step_2-small.png
diff --git a/screenshots/delete_step_3-small.png → wiki/delete_step_3-small.png b/screenshots/delete_step_3-small.png → wiki/delete_step_3-small.png
diff --git a/screenshots/insert_step_1-small.png → wiki/insert_step_1-small.png b/screenshots/insert_step_1-small.png → wiki/insert_step_1-small.png
diff --git a/screenshots/insert_step_2-small.png → wiki/insert_step_2-small.png b/screenshots/insert_step_2-small.png → wiki/insert_step_2-small.png
diff --git a/screenshots/insert_step_3-small.png → wiki/insert_step_3-small.png b/screenshots/insert_step_3-small.png → wiki/insert_step_3-small.png
diff --git a/wiki/logo-small.png b/wiki/logo-small.png
diff --git a/wiki/logo.png b/wiki/logo.png