Merge branch 'development'

Author: jg

gui/css/jquery-ui.structure.min.css

@@ -19,7 +19,6 @@ function buttonMenuValidate(){
                 required: true
             },
             cooldownButtons:{
-                required: true,
                 commaNumbers: true
             },
             cooldownLength:{
@@ -42,18 +41,15 @@ jQuery.validator.addMethod("commaNumbers", function(value, element) {
 
 // Clear Form
 function clearValidate(form){
-    setTimeout(function(){ 
-        if (form == "new-button-form"){
-            console.log(form);
-            var validator = $('#new-button-form').validate();
-            validator.resetForm();
-        }
-    }, 500);
+    var validator = $('#new-button-form').validate();
+    validator.resetForm();
 }
 
 // Load up autocomplete for game buttons
-  $( function() {
-    // This is a list of all valid buttons for bot robotjs and kbm robot.
+function gameButtonValidation(){
+    // First destory any pre-existing auto completes.
+
+   // This is a list of all valid buttons for bot robotjs and kbm robot.
     var availableButtons = [
     "a",
     "b",
@@ -139,12 +135,37 @@ function clearValidate(form){
       source: availableButtons,
       appendTo: ".game-button-counter"
     });
-  });
+    $( ".multi-button-key input" ).autocomplete({
+      source: availableButtons,
+      appendTo: ".multi-button-key"
+    });
+}
+
+// Load up autocomplete for game buttons
+function gameButtonModifierValidation(){
+    // First destory any pre-existing auto completes.
+
+   // This is a list of all valid buttons for bot robotjs and kbm robot.
+    var availableButtons = [
+    "alt",
+    "control",
+    "command",
+    "shift",
+    ];
+    $( ".multi-button-array input" ).autocomplete({
+      source: availableButtons,
+      appendTo: ".multi-button-array"
+    });
+}
 
 // Exports
+exports.gameValidate = gameButtonValidation;
+exports.gameModifierValidate = gameButtonModifierValidation;
 exports.clearValidate = clearValidate;
 
 // On App Load
 $(document).ready(function () {
     buttonMenuValidate();
+    gameButtonValidation();
+    gameButtonModifierValidation();
 });

gui/css/main.css

@@ -3,7 +3,7 @@ const shell = require('electron').shell;
 // Random BG Image
 function randomBG(){
     var random = Math.floor(Math.random() * 5) + 1 ;
-    $('body').css('background-image', 'url("./images/bg/'+random+'.jpg")');
+    $('html').css('background-image', 'url("./images/bg/'+random+'.jpg")');
 }
 randomBG();
 
@@ -27,31 +27,21 @@ function pageNavigation(){
         $.sidr('close','main-menu');
 
         // If the selected page is 
-        if (nextup !== "start" && nextup !== "login" && nextup !== "updates"){
-            $('.interactive-status').fadeIn('fast');
+        if (nextup !== "login" && nextup !== "updates"){
+            $('.interactive-status, .chat-status').fadeIn('fast');
         } else {
-            $('.interactive-status').fadeOut('fast');
+            $('.interactive-status, .chat-status').fadeOut('fast');
         }
 
         return false; 
     } );
 }
 pageNavigation();
 
-// Launches tooltip
-// This initializes all tooltips
-$(document).ready(function() {
-    $('.tooltip').tooltipster({
-        delay: 100,
-        maxWidth: 500,
-        speed: 300,
-        interactive: true,
-        animation: 'grow',
-        maxWidth: 200,
-        theme : 'tooltipster-punk',
-        side: "left"
-    });
-});
+// Initialize Tooltips
+$(function () {
+  $('[data-toggle="tooltip"]').tooltip()
+})
 
 // Open Link In Browser
 // This opens link in system default browser.