Merge branch 'master' into devel
This commit is contained in:
commit
ba30030a58
@ -68,6 +68,9 @@ public class MainBot {
|
|||||||
}
|
}
|
||||||
token = System.getenv("TOKEN");
|
token = System.getenv("TOKEN");
|
||||||
jda = Init.initJda(token, dev);
|
jda = Init.initJda(token, dev);
|
||||||
|
if(System.getenv("dev")!= null){
|
||||||
|
dev = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -27,6 +27,7 @@ $(document).ready(function () {
|
|||||||
btn_add = $('#add_btn');
|
btn_add = $('#add_btn');
|
||||||
switchAutoFlow = $("#autoflow");
|
switchAutoFlow = $("#autoflow");
|
||||||
|
|
||||||
|
|
||||||
setInterval("getCurentMusic()", 1000);
|
setInterval("getCurentMusic()", 1000);
|
||||||
|
|
||||||
M.Modal.init($('#modalAdd').get(0));
|
M.Modal.init($('#modalAdd').get(0));
|
||||||
@ -509,6 +510,10 @@ function listeners() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
$('#btn_search').click(search);
|
$('#btn_search').click(search);
|
||||||
|
$("form").submit(function(e) {
|
||||||
|
e.preventDefault();
|
||||||
|
search();
|
||||||
|
});
|
||||||
|
|
||||||
$('#btn_next').click(function () {
|
$('#btn_next').click(function () {
|
||||||
sendCommand({command: "NEXT"});
|
sendCommand({command: "NEXT"});
|
||||||
|
@ -193,7 +193,7 @@
|
|||||||
<label for="input_search">Search</label>
|
<label for="input_search">Search</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="input-field col l2 m2 s2" style="margin-top: 22px">
|
<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>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user