Merge pull request #207 from MindTooth/fix_app_js

Fix issue with using override_url and running a test

resources/assets/js/app.js

@@ -2,10 +2,10 @@ $.when( $.ready ).then(function() {
 
     if($('.message-container').length) {
         setTimeout(
-        function() 
+            function()
-        {
+            {
-            $('.message-container').fadeOut();
+                $('.message-container').fadeOut();
-        }, 3500);
+            }, 3500);
     }
 
     if($('.livestats-container').length) {
@@ -18,21 +18,21 @@ $.when( $.ready ).then(function() {
             var timer = 5000;
             (function worker() {
                 $.ajax({
-                  url: '/get_stats/'+id, 
+                    url: '/get_stats/'+id,
-                  dataType: 'json',
+                    dataType: 'json',
-                  success: function(data) {
+                    success: function(data) {
-                    container.html(data.html);
+                        container.html(data.html);
-                    if(data.status == 'active') timer = increaseby;
+                        if(data.status == 'active') timer = increaseby;
-                    else {
+                        else {
-                        if(timer < max_timer) timer += 2000;
+                            if(timer < max_timer) timer += 2000;
-                    }
+                        }
-                  },
+                    },
-                  complete: function() {
+                    complete: function() {
                     // Schedule the next request when the current one's complete
-                    setTimeout(worker, timer);
+                        setTimeout(worker, timer);
-                  }
+                    }
                 });
-              })();
+            })();
         });
 
     }
@@ -40,20 +40,20 @@ $.when( $.ready ).then(function() {
     function readURL(input) {
 
         if (input.files && input.files[0]) {
-          var reader = new FileReader();
+            var reader = new FileReader();
 
-          reader.onload = function(e) {
+            reader.onload = function(e) {
-            $('#appimage img').attr('src', e.target.result);
+                $('#appimage img').attr('src', e.target.result);
-          }
+            };
 
-          reader.readAsDataURL(input.files[0]);
+            reader.readAsDataURL(input.files[0]);
         }
-      }
+    }
 
-      $("#upload").change(function() {
+    $('#upload').change(function() {
         readURL(this);
-      });
+    });
-      /*$(".droppable").droppable({
+    /*$(".droppable").droppable({
         tolerance: "intersect",
         drop: function( event, ui ) {
             var tag = $( this ).data('id');
@@ -70,9 +70,9 @@ $.when( $.ready ).then(function() {
         }
       });*/
 
-    $( "#sortable" ).sortable({
+    $( '#sortable' ).sortable({
         stop: function (event, ui) {
-            var idsInOrder = $("#sortable").sortable('toArray', {
+            var idsInOrder = $('#sortable').sortable('toArray', {
                 attribute: 'data-id'
             });
             $.post(
@@ -82,7 +82,7 @@ $.when( $.ready ).then(function() {
         }
 
     });
-    $("#sortable").sortable("disable");
+    $('#sortable').sortable('disable');
 
 
 
@@ -95,15 +95,13 @@ $.when( $.ready ).then(function() {
             $('.add-item').hide();
             $('.item-edit').hide();
             $('#app').removeClass('sidebar');
-            $("#sortable").sortable("disable")
+            $('#sortable').sortable('disable');
         } else {
-            $("#sortable").sortable("enable")
+            $('#sortable').sortable('enable');
-            setTimeout(
+            setTimeout(function() {
-                function() 
+                $('.add-item').fadeIn();
-                {
+                $('.item-edit').fadeIn();
-                  $('.add-item').fadeIn();
+            }, 350);
-                  $('.item-edit').fadeIn();
-                }, 350);
 
         }
     }).on('click', '#add-item, #pin-item', function(e) {
@@ -121,24 +119,21 @@ $.when( $.ready ).then(function() {
         e.preventDefault();
         var apiurl = $('#create input[name=url]').val();
 
-        
+        var override_url = $('#create input[name="config[override_url]"').val();
-        var override_url = $('#override_url');
+        if(override_url.length && override_url != '') {
-        if(override_url.length && override_url.val() != '') {
             apiurl = override_url;
         }
+
         var data = {};
         data['url'] = apiurl;
         $('input.config-item').each(function(index){
             var config = $(this).data('config');
             data[config] = $(this).val();
-        })
+        });
-
+
-        $.post(
+        $.post('/test_config', { data }, function(data) {
-            '/test_config',
+            alert(data);
-            { data }, function(data) {
+        });
-                alert(data);
-            }
-        );
 
     });
     $('#pinlist').on('click', 'a', function(e) {