Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Ben Hardill
2013-10-13 17:33:19 +01:00
30 changed files with 560 additions and 193 deletions

View File

@@ -202,7 +202,7 @@
},
oneditprepare: function() {
var repeattype = "none";
if (Number(this.repeat) != 0) {
if (this.repeat != "") {
repeattype = "interval";
$("#inject-time-interval-units option").filter(function() {return $(this).val() == "s";}).attr('selected',true);
$("#inject-time-interval-count").val(this.repeat);
@@ -210,7 +210,7 @@
} else if (this.crontab) {
var cronparts = this.crontab.split(" ");
var days = cronparts[4];
if (Number(cronparts[0]) && Number(cronparts[1])) {
if (!isNaN(cronparts[0]) && !isNaN(cronparts[1])) {
repeattype = "time";
// Fixed time
var time = cronparts[1]+":"+cronparts[0];

View File

@@ -21,7 +21,7 @@
</div>
<div class="form-row">
<label for="node-input-func"><i class="icon-wrench"></i> Function</label>
<input type="hidden" id="node-input-func">
<input type="hidden" id="node-input-func" autofocus="autofocus">
<div style="height: 250px;" class="node-text-editor" id="node-input-func-editor" ></div>
</div>
<div class="form-row">
@@ -85,6 +85,7 @@
editor:that.editor, // the field name the main text body goes to
fields:['name','outputs']
});
$("#node-input-name").focus();
});
},

View File

@@ -22,7 +22,7 @@
<div class="form-row">
<label for="node-input-template"><i class="icon-wrench"></i> Template</label>
<input type="hidden" id="node-input-template">
<input type="hidden" id="node-input-template" autofocus="autofocus">
<div style="height: 250px;" class="node-text-editor" id="node-input-template-editor" ></div>
</div>
@@ -79,7 +79,7 @@
editor:that.editor, // the field name the main text body goes to
fields:['name']
});
$("#node-input-name").focus();
});
},
oneditsave: function() {

View File

@@ -21,7 +21,7 @@
</div>
<div class="form-row">
<label for="node-input-info" style="width: 100% !important;"><i class="icon-file"></i> More</label>
<input type="hidden" id="node-input-info">
<input type="hidden" id="node-input-info" autofocus="autofocus">
<div style="height: 250px;" class="node-text-editor" id="node-input-info-editor" ></div>
</div>
<div class="form-tips">Tip: this isn't meant for War and Peace - but useful notes can be kept here.</div>
@@ -75,6 +75,7 @@
showFoldingRuler:false,
contents: $("#node-input-info").val()
});
$("#node-input-name").focus();
});
},
oneditsave: function() {