From: Mike G. v. a. <we...@ma...> - 2008-03-25 22:13:11
|
Log Message: ----------- cosmetic changes some corrections on typos for setState subroutines. Modified Files: -------------- pg/lib: Applet.pm Revision Data ------------- Index: Applet.pm =================================================================== RCS file: /webwork/cvs/system/pg/lib/Applet.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -Llib/Applet.pm -Llib/Applet.pm -u -r1.5 -r1.6 --- lib/Applet.pm +++ lib/Applet.pm @@ -341,21 +341,22 @@ sub insertHeader { my $self = shift; - my $codebase = $self->codebase; - my $appletId = $self->appletId; - my $appletName = $self->appletName; + my $codebase = $self->codebase; + my $appletId = $self->appletId; + my $appletName = $self->appletName; my $base64_initialState = $self->base64_state; - my $initializeAction = $self->initializeActionAlias; - my $submitAction = $self->submitActionAlias; + my $initializeAction = $self->initializeActionAlias; + my $submitAction = $self->submitActionAlias; my $setState = $self->setStateAlias; my $getState = $self->getStateAlias; my $config = $self->configAlias; my $base64_config = $self->base64_config; my $debugMode = ($self->debug) ? "1": "0"; - my $returnFieldName = $self->{returnFieldName}; -# my $encodeStateQ = ($self->debug)?'' : "state = Base64.encode(state);"; # in debug mode base64 encoding is not used. -# my $decodeStateQ = "if (!state.match(/<XML>*/i) ) {state = Base64.decode(state)}"; # decode if <XML> is not present - my $headerText = $self->header(); + my $returnFieldName = $self->{returnFieldName}; +# my $encodeStateQ = ($self->debug)?'' : "state = Base64.encode(state);"; # in debug mode base64 encoding is not used. +# my $decodeStateQ = "if (!state.match(/<XML>*/i) ) {state = Base64.decode(state)}"; # decode if <XML> is not present + my $headerText = $self->header(); + $headerText =~ s/(\$\w+)/$1/gee; # interpolate variables p17 of Cookbook return $headerText; @@ -419,16 +420,20 @@ // // state can vary as the applet is manipulated. applet_setState_list["$appletName"] = function(state) { - state = state || getQE("$appletName"+"_state").value || "<xml></xml>"; - if ( base64Q(state) ) { state=Base64.decode(state);} - if (debug) { alert("set state for $appletName to " + state);} - try { - if (debug || !( typeof(getApplet("$appletName").$setState) =="undefined" ) ) { - getApplet("$appletName").$setState( state ); - } - } catch(e) { - alert("Error in setting state of $appletName: " + e ); - } + state = state || getQE("$appletName"+"_state").value + if (state.match("\S") ) { // if state is not all white space + if ( base64Q(state) ) { + state=Base64.decode(state); + } + if (debug) { alert("set state for $appletName to " + state);} + try { + if (debug || !( typeof(getApplet("$appletName").$setState) =="undefined" ) ) { + getApplet("$appletName").$setState( state ); + } + } catch(e) { + alert("Error in setting state of $appletName using command $setState : " + e ); + } + } }; applet_getState_list["$appletName"] = function () { if (debug) { alert("getState for applet $appletName");} |