[LON-CAPA-cvs] cvs: rat /client parameter.html
raeburn
raeburn at source.lon-capa.org
Sat Jan 5 23:02:19 EST 2019
raeburn Sun Jan 6 04:02:19 2019 EDT
Modified files:
/rat/client parameter.html
Log:
- Remove trailing whitespace.
- Add missing ; at end of a line.
Index: rat/client/parameter.html
diff -u rat/client/parameter.html:1.78 rat/client/parameter.html:1.79
--- rat/client/parameter.html:1.78 Tue Nov 13 03:59:12 2018
+++ rat/client/parameter.html Sun Jan 6 04:02:19 2019
@@ -5,7 +5,7 @@
The LearningOnline Network with CAPA
Parameter Input Window
//
-// $Id: parameter.html,v 1.78 2018/11/13 03:59:12 raeburn Exp $
+// $Id: parameter.html,v 1.79 2019/01/06 04:02:19 raeburn Exp $
//
// Copyright Michigan State University Board of Trustees
//
@@ -192,7 +192,7 @@
choicewrite('>'+i+'</option>');
}
choicewrite('</select>');
-}
+}
function date() {
@@ -243,8 +243,8 @@
}
choicewrite('</select>');
}
-
-
+
+
function intminute() {
var thisminutes=cmins;
var i;
@@ -454,7 +454,7 @@
if (items.length > 0) {
for (var j=0; j<items.length; j++) {
if (items[j].type == "text") {
- var possip = items[j].value
+ var possip = items[j].value;
possip = possip.replace(/^\s+|\s+$/g,'');
if (patternIp.test(possip)) {
if (acctypes[i] == 'deny') {
@@ -514,7 +514,7 @@
document.getElementById('lenientweighteddiv').style.display='block';
}
var patternRelWeight = /^\-?[\d.]+$/;
- var sform=choices.document.forms.sch;
+ var sform=choices.document.forms.sch;
if ((sform.lenientrelwt.length != 'undefined') && (sform.lenientrelwt.length) != 'null') {
for (var i=0; i<sform.lenientrelwt.length; i++) {
var relweight = sform.lenientrelwt[i].value;
@@ -549,7 +549,7 @@
function callintervalpmodval() {
return 'onclick="parent.intcalc();parent.toggleSecret()"';
-}
+}
function intervaldis() {
csecs=svalue;
@@ -788,7 +788,7 @@
if (ptype=='float') {
if (pscat=='default') {
tablestart('Default value or none');
- choicewrite('</table>');
+ choicewrite('</table>');
} else {
if (pscat=='pos') {
tablestart('Positive floating point number or zero');
@@ -1057,7 +1057,7 @@
' type="radio" '+callradiostringeval('map_map'));
if (svalue=='map_map') { choicewrite(' checked="checked"'); }
choicewrite(' /> Yes, and the scope of student selected slot is the enclosing map/folder. When checking in, all resources in the map/folder are checked in.</label><br />');
- choicewrite('</td></tr></table>');
+ choicewrite('</td></tr></table>');
}
if (pscat=='deeplink') {
tablestart('Deep-linked items');
@@ -1085,7 +1085,7 @@
choicewrite('</td></tr></table>');
}
}
-
+
if (ptype=='color') {
tablestart('Choose a Color');
choicewrite('<table>');
@@ -1100,7 +1100,7 @@
colorfield(ir,ig,ib);
}
choicewrite('</tr>');
- }
+ }
}
choicewrite('</table></td></table>');
}
@@ -1133,7 +1133,7 @@
if (rform.recurse[i].value == 1) {
colnum++;
}
- pmarker = pmarkerst+'_'+pparm+'&'+colnum;
+ pmarker = pmarkerst+'_'+pparm+'&'+colnum;
}
}
}
@@ -1193,7 +1193,7 @@
var doneproctorRegExp = /_done(|\:[^\:]+\:)_proctor/;
var proctorkeyRegExp = /^(\d+)_(.+)$/;
var donetextRegExp = /\:([^\:]+)\:/;
- var markerRegExp = /^(.+)_([A-Za-z0-9]+)\&(\d+)$/;
+ var markerRegExp = /^(.+)_([A-Za-z0-9]+)\&(\d+)$/;
var namevalue=this.window.location.search.split('&');
namevalue[0]=namevalue[0].substr(1,namevalue[0].length-1);
@@ -1204,10 +1204,10 @@
if (pair[0]=='type') { subs=pair[1].split('_');
ptype=subs[0];
pscat=subs[1];
- if (typeof(subs[2])!="undefined") {
- pscat+='_'+subs[2];
+ if (typeof(subs[2])!="undefined") {
+ pscat+='_'+subs[2];
}
- if ((pscat=='') || (typeof(pscat)=="undefined")) {
+ if ((pscat=='') || (typeof(pscat)=="undefined")) {
pscat='default';
}
}
@@ -1223,21 +1223,21 @@
if (pair[0]=='defsec' && pair[1] >= 0 && pair[1] < 60) { defsec=pair[1]; }
}
- var tablecol = '';
+ var tablecol = '';
var ismap = '';
if (markerRegExp.test(pmarker)) {
var markerinfo = pmarker.match(markerRegExp);
if (markerinfo.length == 4) {
pmarkerst = markerinfo[1];
pparm = markerinfo[2];
- tablecol = markerinfo[3];
+ tablecol = markerinfo[3];
if (tablecol == 17 || tablecol == 16) {
ismap = 1;
if (tablecol == 17) {
precursive = 1;
}
pnonreccol = 16;
- } else if (tablecol == 11 || tablecol == 10) {
+ } else if (tablecol == 11 || tablecol == 10) {
ismap = 1;
if (tablecol == 11) {
precursive = 1;
@@ -1285,7 +1285,7 @@
}
} else {
if (doneRegExp.test(pvalue)) {
- var current = pvalue.match(doneRegExp);
+ var current = pvalue.match(doneRegExp);
if (current.length == 2) {
var textstr = current[1];
if (textstr != '') {
@@ -1303,8 +1303,8 @@
}
svalue=pvalue;
if (((ptype=='float') || (ptype=='string') || (ptype=='int')) &&
- (pscat=='default') &&
- (typeof(svalue)!="undefined") &&
+ (pscat=='default') &&
+ (typeof(svalue)!="undefined") &&
(svalue!=0) && (svalue!='')) { pscat='any'; }
if (ptype=='tolerance') {
@@ -1380,7 +1380,7 @@
months[10]='November';
months[11]='December';
}
-
+
if (ptype=='int') {
sopt('default','Default');
sopt('pos','Positive Integer, Not Zero');
More information about the LON-CAPA-cvs
mailing list