test_server 0.2.1 → 0.2.2

data/app/assets/javascripts/application.js

@@ -23,6 +23,8 @@ function result(url, timeout, start_time, result) {
 $(document).ready(function(){
   $("#clone").click(function () {
 
+    set_repeat();
+
     var open_time = new Date().getTime();
     window.open(window.location.pathname + '?' + $('form').serialize(), '_blank');
   });
@@ -36,27 +38,44 @@ $(document).ready(function(){
   });
 });
 
+function set_repeat() {
+  var repeat  = $('#repeat').is(":checked");
+
+  if (repeat == true) {
+    $('#hidden_repeat').val('true');
+  } else {
+    $('#hidden_repeat').val('false');
+  }
+}
+
 $(document).ready(function(){
-  $("#submit").click(function (e) {
+  $("#stop").click(function (e) {
     e.preventDefault();
+    $('#hidden_repeat').val('false');
+  });
+});
 
-    var url     = escapeHTML($('#url').val());
-    var timeout = escapeHTML($('#timeout').val() * 1000);
-    var count   = escapeHTML($('#count').val());
-
-    repeat_requests(url, count, timeout);
+$(document).ready(function(){
+  $("#start").click(function (e) {
+    e.preventDefault();
+    set_repeat();
+    repeat_requests();
   });
 });
 
-function repeat_requests(url, count, timeout) {
-  var repeat  = $('#repeat').is(":checked");
+function repeat_requests() {
+  var url     = escapeHTML($('#url').val());
+  var timeout = escapeHTML($('#timeout').val() * 1000);
+  var count   = escapeHTML($('#count').val());
+  var repeat  = escapeHTML($('#hidden_repeat').val());
+
   var requests = [];
 
   var success_callback = function() {
     $('#request-spinner').toggle(false);
 
-    if (repeat == true) {
-      setTimeout(repeat_requests(url, count, timeout), 1000);
+    if (repeat == 'true') {
+      setTimeout(repeat_requests(), 1000);
     }
   };
 

data/app/assets/stylesheets/application.scss

@@ -68,11 +68,17 @@ h1 {
   margin: 0px auto;
 }
 
-.ts-button-submit {
+.ts-button-start {
   @extend .btn;
   @extend .btn-primary;
 }
 
+.ts-button-stop {
+  @extend .btn;
+  @extend .btn-default;
+  margin-left: 10px;
+}
+
 .ts-button-close-headline {
   @extend .close;
 }

data/app/views/xhr/show.haml

@@ -11,16 +11,19 @@
     %label{ for: :url}
       = t('views.javascript.xhr.fields.url')
     %input#url.ts-field-url{ type: :url, name: :url, value: @url, placeholder: 'http://www.example.org' }
+    %input#hidden_repeat{ type: :hidden, name: :hidden_repeat }
     .ts-field-repeat
       %label
         - if @repeat
-          %input#repeat{ type: :checkbox, checked: 'checked', value: true, name: :repeat }
+          %input#repeat{ type: :checkbox, checked: 'checked', value: 'on', name: :repeat }
             = t('views.javascript.xhr.fields.repeat')
         - else
           %input#repeat{ type: :checkbox, name: :repeat }
             = t('views.javascript.xhr.fields.repeat')
-  %button#submit.ts-button-submit{type: 'submit', name: 'submit', value: t('views.application.buttons.submit'), 'data-toggle' => 'modal', 'data-target' => '#notification'}
-    = t('views.application.buttons.submit')
+  %button#start.ts-button-start{type: 'submit', name: 'start', value: t('views.application.buttons.start') }
+    = t('views.application.buttons.start')
+  %button#stop.ts-button-stop{type: 'submit', name: 'stop', value: t('views.application.buttons.stop') }
+    = t('views.application.buttons.stop')
   %a#reset.ts-button-reset{href: '#', name: 'reset'}
     = t('views.application.buttons.reset')
   %a#clone.ts-button-clone{href: '#', name: 'clone'}

data/lib/test_server/locales/en.yml

@@ -44,7 +44,8 @@ en:
     application:
       title: Test Server
       buttons:
-        submit: 'Start'
+        start: 'Start'
+        stop: 'Stop'
         reset: 'Reset'
         close: 'Close'
         clone: 'Clone'

data/lib/test_server/version.rb

@@ -1,4 +1,4 @@
 #main TestServer
 module TestServer
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test_server
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: