Merge branch 'master' into devel

src/main/java/net/Broken/MainBot.java

@@ -68,6 +68,9 @@ public class MainBot {
         }
         token = System.getenv("TOKEN");
         jda = Init.initJda(token, dev);
+        if(System.getenv("dev")!= null){
+            dev = true;
+        }
 
 
 

src/main/resources/static/js/music.js

@@ -27,6 +27,7 @@ $(document).ready(function () {
         btn_add = $('#add_btn');
         switchAutoFlow = $("#autoflow");
 
+
         setInterval("getCurentMusic()", 1000);
 
         M.Modal.init($('#modalAdd').get(0));
@@ -509,6 +510,10 @@ function listeners() {
     });
 
     $('#btn_search').click(search);
+    $("form").submit(function(e) {
+        e.preventDefault();
+        search();
+    });
 
     $('#btn_next').click(function () {
         sendCommand({command: "NEXT"});

src/main/resources/templates/music.html

@@ -193,7 +193,7 @@
                         <label for="input_search">Search</label>
                     </div>
                     <div class="input-field col l2 m2 s2" style="margin-top: 22px">
-                        <button class="btn waves-effect waves-light green darken-4 white-text" id="btn_search"><i class="material-icons">search</i></button>
+                        <button class="btn waves-effect waves-light green darken-4 white-text" id="btn_search" type="button"><i class="material-icons">search</i></button>
                     </div>
                 </div>