[richfaces-svn-commits] JBoss Rich Faces SVN: r23281 - in branches/enterprise/3.3.1.SP4: ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid and 1 other directory.
Author: ivassile
Date: 2014-01-16 08:47:42 -0500 (Thu, 16 Jan 2014)
New Revision: 23281
Modified:
branches/enterprise/3.3.1.SP4/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
branches/enterprise/3.3.1.SP4/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
Log:
Submitting fix for RF-13446
Modified:
branches/enterprise/3.3.1.SP4/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
---
branches/enterprise/3.3.1.SP4/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2014-01-16
02:39:29 UTC (rev 23280)
+++
branches/enterprise/3.3.1.SP4/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2014-01-16
13:47:42 UTC (rev 23281)
@@ -1029,7 +1029,7 @@
}
// Replace client-side hidden inputs for JSF View state.
var idsSpan = req.getElementById("ajax-view-state");
- LOG.debug("Hidden JSF state fields: "+idsSpan);
+ LOG.debug("Hidden JSF state fields: "+idsSpan.xml);
if(idsSpan != null){
// For a portal case, replace content in the current window only.
var namespace = options.parameters['org.ajax4jsf.portlet.NAMESPACE'];
Modified:
branches/enterprise/3.3.1.SP4/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
---
branches/enterprise/3.3.1.SP4/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2014-01-16
02:39:29 UTC (rev 23280)
+++
branches/enterprise/3.3.1.SP4/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2014-01-16
13:47:42 UTC (rev 23281)
@@ -140,11 +140,19 @@
return result;
},
setScrollPos: function(pos) {
- this.contentBox.getElement().scrollTop = pos;
- this.frozenContentBox.getElement().scrollTop = pos;
+ var contentBoxElement, frozenContentBoxElement;
+ if (ClientUILib.isIE7 || ClientUILib.isIE8) {
+ contentBoxElement = document.getElementById(this.contentBox.getElement().id);
+ frozenContentBoxElement =
document.getElementById(this.frozenContentBox.getElement().id);
+ } else {
+ contentBoxElement = this.contentBox.getElement();
+ frozenContentBoxElement = this.frozenContentBox.getElement();
+ }
+ contentBoxElement.scrollTop = pos;
+ frozenContentBoxElement.scrollTop = pos;
if(ClientUILib.isIE && !ClientUILib.isIE7) {
- this.contentBox.getElement().scrollTop = pos;
- this.frozenContentBox.getElement().scrollTop = pos;
+ contentBoxElement.scrollTop = pos;
+ frozenContentBoxElement.scrollTop = pos;
}
},
updateSize: function() {
@@ -214,10 +222,14 @@
this.adjustDataPosition(this.currentPos);
}
this.scrollBox.show();
- this.scrollBox.element.scrollTop = scrollTop;
+ // SCRIPT16389: Unspecified error (in IE 8)
+ var scrollBoxElement = (ClientUILib.isIE7 || ClientUILib.isIE8)
+ ? document.getElementById(this.scrollBox.element.id)
+ : this.scrollBox.element;
+ scrollBoxElement.scrollTop = scrollTop;
var viewWidth = this.scrollBox.getViewportWidth();
this.container.setWidth(viewWidth);
-
+
if(ClientUILib.isIE) {
this.contentBox.setWidth(viewWidth - frozenContentWidth);
}