You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2018/08/14 13:26:33 UTC
svn commit: r1838023 [1/4] - in
/uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js: ducc.js
ducc.js.2.2.2 ducc.js.2.2.2.patch
Author: degenaro
Date: Tue Aug 14 13:26:33 2018
New Revision: 1838023
URL: http://svn.apache.org/viewvc?rev=1838023&view=rev
Log: (empty)
Added:
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js.2.2.2
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js.2.2.2.patch (with props)
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js?rev=1838023&r1=1838022&r2=1838023&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js Tue Aug 14 13:26:33 2018
@@ -51,6 +51,10 @@ $(window).resize(function() {
}
});
+function textify(input) {
+ return $('<span>').text(input).html();
+}
+
function ducc_console_warn(text) {
var date = new Date();
console.warn(date.toLocaleString() + " " + text);
@@ -569,7 +573,7 @@ function ducc_update_uid() {
var fname = "ducc_update_uid";
try {
var uid = ducc_appl("uid");
- var d_value = document.getElementById('userid').value
+ var d_value = textify(document.getElementById('userid').value)
//alert("d_value:"+d_value)
if (d_value != null) {
if (d_value != "") {
@@ -2931,7 +2935,7 @@ function ducc_jobs_max_records() {
var jobsmax = ducc_appl("jobsmax");
//
var c_value = ducc_get_cookie(jobsmax);
- var r_value = document.form_selectors.maxrecs_input.value;
+ var r_value = textify(document.form_selectors.maxrecs_input.value);
if (c_value == null) {
c_value = d_value;
ducc_put_cookie(jobsmax, c_value);
@@ -2982,7 +2986,7 @@ function ducc_jobs_users() {
var jobsusers = ducc_appl("jobsusers");
var d_value = "";
var c_value = ducc_get_cookie(jobsusers);
- var r_value = document.form_selectors.users_input.value;
+ var r_value = textify(document.form_selectors.users_input.value);
if (c_value == null) {
c_value = d_value;
ducc_put_cookie(jobsusers, c_value);
@@ -3015,7 +3019,7 @@ function ducc_services_max_records() {
var servicesmax = ducc_appl("servicesmax");
//
var c_value = ducc_get_cookie(servicesmax);
- var r_value = document.form_selectors.maxrecs_input.value;
+ var r_value = textify(document.form_selectors.maxrecs_input.value);
if (c_value == null) {
c_value = d_value;
ducc_put_cookie(servicesmax, c_value);
@@ -3066,7 +3070,7 @@ function ducc_services_users() {
var servicesusers = ducc_appl("servicesusers");
var d_value = "";
var c_value = ducc_get_cookie(servicesusers);
- var r_value = document.form_selectors.users_input.value;
+ var r_value = textify(document.form_selectors.users_input.value);
if (c_value == null) {
c_value = d_value;
ducc_put_cookie(servicesusers, c_value);
@@ -3099,7 +3103,7 @@ function ducc_reservations_max_records()
var reservationsmax = ducc_appl("reservationsmax");
//
var c_value = ducc_get_cookie(reservationsmax);
- var r_value = document.form_selectors.maxrecs_input.value;
+ var r_value = textify(document.form_selectors.maxrecs_input.value);
if (c_value == null) {
c_value = d_value;
ducc_put_cookie(reservationsmax, c_value);
@@ -3150,7 +3154,7 @@ function ducc_reservations_users() {
var reservationsusers = ducc_appl("reservationsusers");
var d_value = "";
var c_value = ducc_get_cookie(reservationsusers);
- var r_value = document.form_selectors.users_input.value;
+ var r_value = textify(document.form_selectors.users_input.value);
if (c_value == null) {
c_value = d_value;
ducc_put_cookie(reservationsusers, c_value);
@@ -3719,7 +3723,7 @@ function ducc_submit_login() {
var fname = "ducc_submit_login";
try {
var url = document.forms[1].action;
- var userid = document.forms[1].userid.value
+ var userid = textify(document.forms[1].userid.value)
ducc_update_uid()
var password = document.forms[1].password.value
$.jGrowl(" Pending login...");
@@ -3781,15 +3785,15 @@ function ducc_submit_reservation() {
var fname = "ducc_submit_reservation";
try {
var e = document.getElementById("scheduling_class");
- var scheduling_class = e.options[e.selectedIndex].value;
+ var scheduling_class = textify(e.options[e.selectedIndex].value);
var e = document.getElementById("memory_size");
- var memory_size = e.value;
+ var memory_size = textify(e.value);
var e = document.getElementById("memory_units");
- var memory_units = e.options[e.selectedIndex].value;
+ var memory_units = textify(e.options[e.selectedIndex].value);
var e = document.getElementById("description");
- var description = e.value;
+ var description = textify(e.value);
var e = document.getElementById("wait_for_result_yes");
- var wait_for_result = e.checked;
+ var wait_for_result = textify(e.checked);
if (wait_for_result) {
document.getElementById("working_area").style.display = 'block';
document.getElementById("submit_button").disabled = 'disabled';
@@ -3852,9 +3856,9 @@ function ducc_update_service(name) {
var fname = "ducc_update_service";
try {
var e = document.getElementById("autostart");
- var autostart = e.options[e.selectedIndex].value;
+ var autostart = textify(e.options[e.selectedIndex].value);
var e = document.getElementById("instances");
- var instances = e.value;
+ var instances = textify(e.value);
document.getElementById("update_button").disabled = 'disabled';
$.ajax({
type: 'POST',