Merge branch 'dev'

Author: MCStreetguy

lib/snippet-injector.js

@@ -71,7 +71,8 @@ export default {
         title: 'Choose a snippet to inject:',
         placeholder: 'Search snippets',
         listItems: listitems,
-        btncancel: 'Cancel'
+        btncancel: 'Cancel',
+        nothingfound: 'No Snippets found that match you search.'
       },function(element) {
         var snippet = new Snippet(JSON.parse(storage.retrieveFile(element)));
         atom.workspace.getActiveTextEditor().insertText(snippet.getContent(),{

lib/util.js

@@ -31,6 +31,9 @@ export default class Util {
         visible: false
       });
 
+      if(options.title !== undefined && options.title !== null) {
+        $('#input-prompt').append('<h4 class="title">'+options.title+'</h4>');
+      }
       var edit = atom.workspace.buildTextEditor({mini: true});
       edit.setPlaceholderText(''+options.placeholder);
       $('#input-prompt').append(atom.views.getView(edit));
@@ -47,7 +50,7 @@ export default class Util {
             $('#prompt-confirm').removeClass('disabled');
           }
         }
-      })
+      });
       $('#prompt-confirm').on('click',function(e) {
         if(!$(this).hasClass('disabled')) {
           modal.destroy();
@@ -76,13 +79,15 @@ export default class Util {
         visible: false
       });
 
+      if(options.title !== undefined && options.title !== null) {
+        $('#search-prompt').append('<h4 class="title">'+options.title+'</h4>');
+      }
       var edit = atom.workspace.buildTextEditor({mini: true});
       edit.setPlaceholderText(''+options.placeholder);
       $('#search-prompt').append(atom.views.getView(edit));
       $('#search-prompt').find('atom-text-editor').attr('id','prompt-search');
 
-      var listDOMstring = '<h4 class="title">'+options.title+'</h4>';
-      listDOMstring += '<ul class="nav" id="prompt-list">';
+      var listDOMstring = '<ul class="nav" id="prompt-list">';
       options.listItems.forEach(function(currentValue) {
         listDOMstring += '<li class="list-item"><p class="value">';
         listDOMstring += currentValue;
@@ -93,7 +98,7 @@ export default class Util {
 
       edit.onDidChange(function() {
         var text = edit.getText();
-        $('#prompt-list').find('.list-item').remove();
+        $('#prompt-list').find('.list-item, .notice').remove();
         var filteredItems = options.listItems.filter(function(element) {
           element = element.toLowerCase();
           text = text.toLowerCase();
@@ -104,13 +109,17 @@ export default class Util {
           }
         });
         var listDOMstring = '';
-        filteredItems.forEach(function(currentValue) {
-          listDOMstring += '<li class="list-item"><p class="value">';
-          listDOMstring += currentValue;
-          listDOMstring += '</p></li>';
-        });
+        if(filteredItems.length > 0) {
+          filteredItems.forEach(function(currentValue) {
+            listDOMstring += '<li class="list-item"><p class="value">';
+            listDOMstring += currentValue;
+            listDOMstring += '</p></li>';
+          });
+        } else {
+          listDOMstring += '<p class="notice"><i>'+options.nothingfound+'</i></p>';
+        }
         $('#prompt-list').append(listDOMstring);
-      })
+      });
       $('#search-prompt').find('.list-item').on('click',function(e) {
         if($(e.target).hasClass('value')) {
           var value = $(e.target).text();

styles/snippet-injector.less

@@ -9,26 +9,35 @@
 
 #input-prompt {
   min-width: 500px;
-  height: auto;
+  height: 30px;
 
   #prompt-input {
-    width: 60%;
+    width: 62%;
     padding-left: 5px;
     float: left;
     margin-right: 1%;
+    height: 30px;
   }
 
   #prompt-confirm, #prompt-cancel {
     width: 18%;
-    margin-right: 1%;
+    height: 30px;
+    font-size: 14px;
   }
 }
 
 #search-prompt {
 
+  .title {
+    margin-top: 0;
+    margin-bottom: 10px;
+  }
+
   #prompt-list {
     margin-bottom: 20px;
-    
+    max-height: 250px;
+    overflow-y: scroll;
+
     .list-item {
       padding: 10px;
       font-size: 13px;
@@ -37,6 +46,10 @@
       .value {
         margin: 0;
       }
+
+      &:first-of-type {
+        border-top: 1px solid grey;
+      }
     }
   }
 }