10:48 a.m.
Author: konstantin.mishin
Date: 2007-07-24 11:48:57 -0400 (Tue, 24 Jul 2007)
New Revision: 1825
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml
trunk/sandbox/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js
trunk/sandbox/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js
trunk/sandbox/ui/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx
Log:
RF-463
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-07-24 13:17:18 UTC
(rev 1824)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-07-24 15:48:57 UTC
(rev 1825)
@@ -811,16 +811,19 @@
*/
A4J.AJAX.finishRequest = function(req){
var options = req.options;
- // mark status object ( if any ) for complete request ;
- A4J.AJAX.status(req.containerId,options.status,false);
// we can set listener for complete request - for example,
// it can shedule next request for update page.
if(options.oncomplete){
LOG.debug( "Call request oncomplete function after processing updates"
);
window.setTimeout(function(){
- options.oncomplete(req,req.domEvt,req.getJSON('_ajax:data'));},
+ options.oncomplete(req,req.domEvt,req.getJSON('_ajax:data'));
+ // mark status object ( if any ) for complete request ;
+ A4J.AJAX.status(req.containerId,options.status,false);},
50);
+ } else {
+ // mark status object ( if any ) for complete request ;
+ A4J.AJAX.status(req.containerId,options.status,false);
}
// If we have events in queue - send next request.
if(options.eventsQueue){
Modified: trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml
===================================================================
--- trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml 2007-07-24
13:17:18 UTC (rev 1824)
+++ trunk/sandbox/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml 2007-07-24
15:48:57 UTC (rev 1825)
@@ -4,10 +4,11 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid...
- xmlns:a4j="https://ajax4jsf.dev.java.net/ajax">
+ xmlns:a4j="http://richfaces.org/ajax">
<body>
<f:view>
<h:form>
+ <a4j:status startText="loading..."/>
<h:selectOneMenu value="#{modelBuilder.grid}">
<f:selectItems value="#{modelBuilder.grids}" />
</h:selectOneMenu>
Modified:
trunk/sandbox/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js
===================================================================
---
trunk/sandbox/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js 2007-07-24
13:17:18 UTC (rev 1824)
+++
trunk/sandbox/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js 2007-07-24
15:48:57 UTC (rev 1825)
@@ -171,9 +171,6 @@
this.adjustColumnWidth(i, columns[i].width);
}
},
- setProgressCtrl: function(ctrl) {
- this.getBody().setProgressCtrl(ctrl);
- },
quickFind: function(column, text, startRow) {
var start = startRow || 0;
var searchText = "*" + text + "*";
Modified:
trunk/sandbox/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
---
trunk/sandbox/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-07-24
13:17:18 UTC (rev 1824)
+++
trunk/sandbox/ui/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-07-24
15:48:57 UTC (rev 1825)
@@ -6,7 +6,6 @@
ClientUILib.declarePackage("ClientUI.controls.grid.GridBody");
ClientUILib.requireClass("ClientUI.common.box.Box");
-ClientUILib.requireClass("ClientUI.common.box.SplashBox");
//ClientUILib.requireClass("ClientUI.controls.grid.DataCash");
/*
@@ -426,7 +425,6 @@
this.currRange = range;
this.currentPos = task.pos;
- this.showSplash();
this.container.hide();
var options = {
@@ -462,21 +460,6 @@
this.updateStarted = false;
}
},
-
- setProgressCtrl: function(ctrl) {
- this.splash = ctrl;
- this.splash.setParent(this.getElement());
- this.splash.moveTo(0, 0);
- },
- showSplash: function () {
- if(!this.splash) {
- this.setProgressCtrl(new ClientUI.common.box.SplashBox(null, this.getElement(),
300));
- }
- this.splash.setSize(this.scrollBox.getViewportWidth(),
this.scrollBox.getViewportHeight());
- this.splash.updateLayout();
- this.splash.show();
- this.splash.updateLayout();
- },
forceReRender: function() {
if(ClientUILib.isIE && !ClientUILib.isIE7) {
var frozenTbl = this.templFrozen.getElement();
@@ -608,15 +591,9 @@
*/
invalidate: function(options) {
screen.updateInterval = this.updateInterval;
-
- setTimeout(function () {
- this.rearrangeRows(options, true, true);
- this.container.show();
- if(this.splash) this.splash.hide();
- this.updateStarted = false;
-
- }.bind(this), 10);
-
+ this.rearrangeRows(options, true, true);
+ this.container.show();
+ this.updateStarted = false;
/*if(this.processedPos != this.currentPos) {
this.currentPos = this.processedPos;
setTimeout(function (){
Modified:
trunk/sandbox/ui/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx
===================================================================
---
trunk/sandbox/ui/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-07-24
13:17:18 UTC (rev 1824)
+++
trunk/sandbox/ui/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-07-24
15:48:57 UTC (rev 1825)
@@ -224,17 +224,6 @@
<f:call name="contributorsEncodeHere"/>
</div>
-
- <jsp:scriptlet>
- if(component.getFacets().containsKey("splash")){
- UIComponent splash = component.getFacet("splash");
- String splash_id = splash.getClientId(context);
- variables.setVariable("splash_id",splash_id);
- renderChild(context, splash);
- }
- </jsp:scriptlet>
-
-
<script id="#{clientId}_grid_create_scripts"
type="text/javascript">
//<![CDATA[