projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allowed optional long timeout on defualt/cancel/selector buttons.
[fa-stable.git]
/
js
/
inserts.js
diff --git
a/js/inserts.js
b/js/inserts.js
index d7fa75353de37f0865a5dfaf3e9a627b1f03552e..6d8b1ff71caad6a1284010a4d3941f02686edd27 100644
(file)
--- a/
js/inserts.js
+++ b/
js/inserts.js
@@
-213,10
+213,11
@@
var inserts = {
function(e) {
e.onclick = function() {
save_focus(e);
function(e) {
e.onclick = function() {
save_focus(e);
- if (e.getAttribute('aspect') == 'process')
- JsHttpRequest.request(this, null, 60000);
- else
- JsHttpRequest.request(this);
+ var asp = e.getAttribute('aspect')
+ if (asp && asp.indexOf('process') !== -1)
+ JsHttpRequest.request(this, null, 60000);
+ else
+ JsHttpRequest.request(this);
return false;
}
},
return false;
}
},
@@
-258,7
+259,7
@@
var inserts = {
}
}
},
}
}
},
- 'button[aspect
=selector], input[aspect=
selector]': function(e) {
+ 'button[aspect
*selector], input[aspect*
selector]': function(e) {
e.onclick = function() {
passBack(this.getAttribute('rel'));
return false;
e.onclick = function() {
passBack(this.getAttribute('rel'));
return false;
@@
-277,7
+278,7
@@
var inserts = {
'a.printlink': function(l) {
l.onclick = function() {
save_focus(this);
'a.printlink': function(l) {
l.onclick = function() {
save_focus(this);
- JsHttpRequest.request(this);
+ JsHttpRequest.request(this
, null, 60000
);
return false;
}
},
return false;
}
},
@@
-386,13
+387,19
@@
function setHotKeys() {
for (var i=0; i<form.elements.length; i++){
var el = form.elements[i];
var asp = el.getAttribute('aspect');
for (var i=0; i<form.elements.length; i++){
var el = form.elements[i];
var asp = el.getAttribute('aspect');
- if (el.className!='editbutton' && asp=='selector' && (key==13 || key==27)) {
+
+
+ if (el.className!='editbutton' && (asp && asp.indexOf('selector') !== -1) && (key==13 || key==27)) {
passBack(key==13 ? el.getAttribute('rel') : false);
ev.returnValue = false;
return false;
}
passBack(key==13 ? el.getAttribute('rel') : false);
ev.returnValue = false;
return false;
}
- if ((asp=='default' && key==13)||(asp=='cancel' && key==27)) {
- JsHttpRequest.request(el);
+ if (((asp && asp.indexOf('default') !== -1) && key==13)||((asp && asp.indexOf('cancel') !== -1) && key==27)) {
+
+ if (asp.indexOf('process') !== -1)
+ JsHttpRequest.request(el, null, 60000);
+ else
+ JsHttpRequest.request(el);
ev.returnValue = false;
return false;
}
ev.returnValue = false;
return false;
}