From b1de42b297157704af46c4dfd07f6fe5af7f7f15 Mon Sep 17 00:00:00 2001
From: Dave C-J <dave@conway-jones.co.uk>
Date: Tue, 4 Feb 2014 21:50:35 +0000
Subject: [PATCH] Tweak Inject Fire at Once options as per Issue #145

---
 nodes/core/core/20-inject.html | 21 +++++++++++----------
 nodes/core/core/20-inject.js   |  3 +++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/nodes/core/core/20-inject.html b/nodes/core/core/20-inject.html
index 13de668b5..1cb551d40 100644
--- a/nodes/core/core/20-inject.html
+++ b/nodes/core/core/20-inject.html
@@ -23,6 +23,7 @@
           <option value="string">string</option>
         </select>
     </div>
+
     <div class="form-row" id="node-input-row-payload">
         <label for="node-input-payload"></label>
         <input type="text" id="node-input-payload" placeholder="Payload">
@@ -33,9 +34,9 @@
         <input type="text" id="node-input-topic" placeholder="Topic">
     </div>
 
-    <div class="form-row">
+    <div class="form-row" id="node-once">
         <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-once" placeholder="once" style="display: inline-block; width: auto; vertical-align: top;">
+        <input type="checkbox" id="node-input-once" style="display: inline-block; width: auto; vertical-align: top;">
         <label for="node-input-once" style="width: 70%;">Fire once at start ?</label>
     </div>
 
@@ -71,11 +72,15 @@
 
     <script>
     {
-
         $("#inject-time-type-select").change(function() {
+            $("#node-input-crontab").val('');
             var id = $("#inject-time-type-select option:selected").val();
             $(".inject-time-row").hide();
             $("#inject-time-row-"+id).show();
+            if ((id == "none") || (id == "interval")) {
+                $("#node-once").show();
+            }
+            else { $("#node-once").hide(); }
         });
 
         var days = [
@@ -90,6 +95,7 @@
             {v:"6",t:"Saturdays"},
             {v:"7",t:"Sundays"}
         ];
+
         $(".inject-time-days").each(function() {
             for (var d in days) {
                 $(this).append($("<option></option>").val(days[d].v).text(days[d].t));
@@ -102,6 +108,7 @@
                 $(this).append($("<option></option>").val(i).text(l));
             }
         });
+
         $(".inject-time-count").spinner({
             min:1,
             max:60
@@ -111,10 +118,8 @@
             var units = $("#inject-time-interval-units option:selected").val();
             $("#inject-time-interval-days").prop("disabled",(units == "s")?"disabled":false);
             $(".inject-time-count").spinner("option","max",(units == "h")?24:60);
-
         });
 
-
         $.widget( "ui.injecttimespinner", $.ui.spinner, {
             options: {
                 // seconds
@@ -139,16 +144,13 @@
                 var d = new Date(value);
                 var h = d.getHours();
                 var m = d.getMinutes();
-
                 return ((h<10)?"0":"")+h+":"+((m<10)?"0":"")+m;
             }
         });
 
-
         $("#inject-time-time").injecttimespinner();
     };
 
-
     </script>
 </script>
 <style>
@@ -176,8 +178,6 @@
     .inject-time-count {
         width: 30px !important;
     }
-    .
-
 </style>
 <script type="text/x-red" data-help-name="inject">
     <p>Pressing the button on the left side of the node allows a message on a topic to be injected into the flow. This is mainly for test purposes.</p>
@@ -307,6 +307,7 @@
             });
             $("#node-input-payloadType").val(this.payloadType);
             $("#node-input-payloadType").change();
+            $("#inject-time-type-select").change();
 
         },
         oneditsave: function() {
diff --git a/nodes/core/core/20-inject.js b/nodes/core/core/20-inject.js
index ee6100b71..59e2ee0ac 100644
--- a/nodes/core/core/20-inject.js
+++ b/nodes/core/core/20-inject.js
@@ -32,6 +32,9 @@ function InjectNode(n) {
     var node = this;
     this.interval_id = null;
     this.cronjob = null;
+    if (this.crontab) {
+        if (this.crontab.split(" ")[4] != "*") { this.once = false; }
+    }
 
     if (this.repeat && !isNaN(this.repeat) && this.repeat > 0) {
         this.repeat = this.repeat * 1000;