diff options
| author | wei <> | 2007-01-06 03:36:40 +0000 |
|---|---|---|
| committer | wei <> | 2007-01-06 03:36:40 +0000 |
| commit | b8779f4a6a581cb378368eac398a262047397472 (patch) | |
| tree | ec9949b1f2ebe9a1f9972e595b4d6a4b925103b9 /framework/Web/Javascripts/js/compressed | |
| parent | bde6488e19b9852011a657fda8aa39680d9c4a62 (diff) | |
Fixed #485.
Diffstat (limited to 'framework/Web/Javascripts/js/compressed')
| -rw-r--r-- | framework/Web/Javascripts/js/compressed/ajax.js | 5 | ||||
| -rw-r--r-- | framework/Web/Javascripts/js/compressed/prado.js | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/framework/Web/Javascripts/js/compressed/ajax.js b/framework/Web/Javascripts/js/compressed/ajax.js index d1698aa5..ffc57483 100644 --- a/framework/Web/Javascripts/js/compressed/ajax.js +++ b/framework/Web/Javascripts/js/compressed/ajax.js @@ -99,8 +99,9 @@ Ajax.Responders.register({onComplete:function(request) Prado.CallbackRequest.tryNextRequest();}});Event.OnLoad(function() {if(typeof Logger!="undefined") Ajax.Responders.register(Prado.CallbackRequest.Exception);});Prado.CallbackRequest.prototype={initialize:function(id,options) -{this.url=window.location.href;this.request=null;this.Enabled=true;this.id=id;if(typeof(id)=="string") -Prado.CallbackRequest.requests[id]=this;this.options=Object.extend({RequestTimeOut:30000,EnablePageStateUpdate:true,HasPriority:true,CausesValidation:true,ValidationGroup:null,PostInputs:true},options||{});},setCallbackParameter:function(value) +{this.url=this.getCallbackUrl();this.request=null;this.Enabled=true;this.id=id;if(typeof(id)=="string") +Prado.CallbackRequest.requests[id]=this;this.options=Object.extend({RequestTimeOut:30000,EnablePageStateUpdate:true,HasPriority:true,CausesValidation:true,ValidationGroup:null,PostInputs:true},options||{});},getCallbackUrl:function() +{return $('PRADO_PAGESTATE').form.action;},setCallbackParameter:function(value) {this.options['params']=value;},getCallbackParameter:function() {return this.options['params'];},setRequestTimeOut:function(timeout) {this.options['RequestTimeOut']=timeout;},getRequestTimeOut:function() diff --git a/framework/Web/Javascripts/js/compressed/prado.js b/framework/Web/Javascripts/js/compressed/prado.js index e2df8e08..a1da1efb 100644 --- a/framework/Web/Javascripts/js/compressed/prado.js +++ b/framework/Web/Javascripts/js/compressed/prado.js @@ -284,7 +284,7 @@ if(typeof(element)=="string") method.toFunction().apply(this,[element,""+content]);} else {method.toFunction().apply(this,[""+content]);}},extractContent:function(text,boundary) -{f=RegExp('(<!--'+boundary+'-->)([\\s\\S\\w\\W]*)(<!--//'+boundary+'-->)',"m");result=text.match(f);if(result&&result.length>=2) +{var f=RegExp('(<!--'+boundary+'-->)([\\s\\S\\w\\W]*)(<!--//'+boundary+'-->)',"m");var result=text.match(f);if(result&&result.length>=2) return result[2];else return null;},evaluateScript:function(content) {content.evalScripts();}} |