Author: musachy
Date: Tue Apr 3 18:25:18 2007
New Revision: 525345
URL: http://svn.apache.org/viewvc?view=rev&rev=525345
Log:
WW-1793 Showcase Example 4 for Remote div does not work (something is broken on
the div tag)
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js?view=diff&rev=525345&r1=525344&r2=525345
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
Tue Apr 3 18:25:18 2007
@@ -144,15 +144,15 @@
};
if(this.updateFreq > 0) {
+ //there is a timer
this.timer = new dojo.lang.timing.Timer(this.updateFreq);
this.timer.onTick = hitchedRefresh;
- //start the timer
if(this.autoStart) {
- //start after delay
+ //start the timer
if(this.delay > 0) {
//start time after delay
- dojo.lang.setTimeout(this.delay, hitchedStartTimer);
+ dojo.lang.setTimeout(hitchedStartTimer, this.delay);
} else {
//start timer now
this.startTimer();
@@ -162,21 +162,7 @@
//no timer
if(this.delay > 0) {
//load after delay
- dojo.lang.setTimeout(this.delay, hitchedRefresh);
- }
- }
-
- //start the timer
- if(this.autoStart) {
- //start after delay
- if(this.delay > 0) {
- if(this.updateFreq > 0) {
- //start time after delay
- dojo.lang.setTimeout(this.delay, hitchedStartTimer);
- } else {
- //load after delay
- dojo.lang.setTimeout(this.delay, hitchedRefresh);
- }
+ dojo.lang.setTimeout(hitchedRefresh, this.delay);
}
}
@@ -232,7 +218,7 @@
}
if(this.isShowing() && this.preload && this.updateFreq <= 0 &&
this.delay <= 0) {
- this.loadContents();
+ this.refresh();
}
},
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js?view=diff&rev=525345&r1=525344&r2=525345
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
Tue Apr 3 18:25:18 2007
@@ -13904,23 +13904,14 @@
this.timer.onTick=_bb5;
if(this.autoStart){
if(this.delay>0){
-dojo.lang.setTimeout(this.delay,_bb6);
+dojo.lang.setTimeout(_bb6,this.delay);
}else{
this.startTimer();
}
}
}else{
if(this.delay>0){
-dojo.lang.setTimeout(this.delay,_bb5);
-}
-}
-if(this.autoStart){
-if(this.delay>0){
-if(this.updateFreq>0){
-dojo.lang.setTimeout(this.delay,_bb6);
-}else{
-dojo.lang.setTimeout(this.delay,_bb5);
-}
+dojo.lang.setTimeout(_bb5,this.delay);
}
}
if(!dojo.string.isBlank(this.listenTopics)){
@@ -13963,7 +13954,7 @@
this.errorNotifyTopicsArray=this.errorNotifyTopics.split(",");
}
if(this.isShowing()&&this.preload&&this.updateFreq<=0&&this.delay<=0){
-this.loadContents();
+this.refresh();
}
},_downloadExternalContent:function(url,_bbe){
var _bbf={cancel:false};
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js?view=diff&rev=525345&r1=525344&r2=525345
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
Tue Apr 3 18:25:18 2007
@@ -22564,15 +22564,15 @@
};
if(this.updateFreq > 0) {
+ //there is a timer
this.timer = new dojo.lang.timing.Timer(this.updateFreq);
this.timer.onTick = hitchedRefresh;
- //start the timer
if(this.autoStart) {
- //start after delay
+ //start the timer
if(this.delay > 0) {
//start time after delay
- dojo.lang.setTimeout(this.delay, hitchedStartTimer);
+ dojo.lang.setTimeout(hitchedStartTimer, this.delay);
} else {
//start timer now
this.startTimer();
@@ -22582,21 +22582,7 @@
//no timer
if(this.delay > 0) {
//load after delay
- dojo.lang.setTimeout(this.delay, hitchedRefresh);
- }
- }
-
- //start the timer
- if(this.autoStart) {
- //start after delay
- if(this.delay > 0) {
- if(this.updateFreq > 0) {
- //start time after delay
- dojo.lang.setTimeout(this.delay, hitchedStartTimer);
- } else {
- //load after delay
- dojo.lang.setTimeout(this.delay, hitchedRefresh);
- }
+ dojo.lang.setTimeout(hitchedRefresh, this.delay);
}
}
@@ -22652,7 +22638,7 @@
}
if(this.isShowing() && this.preload && this.updateFreq <= 0 &&
this.delay <= 0) {
- this.loadContents();
+ this.refresh();
}
},
@@ -22704,8 +22690,6 @@
}
},
- //from Dojo's ContentPane
- //TODO: remove when fixed on Dojo
startTimer : function() {
if(this.timer && !this.timer.isRunning) {
this.log("starting timer with update interval " + this.updateFreq);
@@ -22713,6 +22697,8 @@
}
},
+ //from Dojo's ContentPane
+ //TODO: remove when fixed on Dojo
splitAndFixPaths:function (s, url) {
var titles = [], scripts = [], tmp = [];
var match = [], requires = [], attr = [], styles = [];
