+ <ui:insert name=3D"title"/> +

From richfaces-svn-commits at lists.jboss.org Thu Jul 18 23:04:34 2013 Content-Type: multipart/mixed; boundary="===============7852396705449409024==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r23265 - in branches/enterprise/3.3.1.SP3_test_patch: samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples and 1 other directories. Date: Thu, 18 Jul 2013 23:04:34 -0400 Message-ID: <201307190304.r6J34Y4B002658@svn01.web.mwc.hst.phx2.redhat.com> --===============7852396705449409024== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bleathem Date: 2013-07-18 23:04:33 -0400 (Thu, 18 Jul 2013) New Revision: 23265 Modified: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main= /webapp/WEB-INF/web.xml branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main= /webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf1107.x= html branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main= /javascript/ClientUI/controls/grid/GridBody.js Log: RF-1107: Fixed tabbing in scrollableDataTable header cells Modified: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/s= rc/main/webapp/WEB-INF/web.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/mai= n/webapp/WEB-INF/web.xml 2013-07-18 19:51:47 UTC (rev 23264) +++ branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/mai= n/webapp/WEB-INF/web.xml 2013-07-19 03:04:33 UTC (rev 23265) @@ -38,11 +38,11 @@ org.ajax4jsf.COMPRESS_SCRIPT - true + false

org.ajax4jsf.COMPRESS_STYLE - true + false

org.ajax4jsf.xmlparser.ORDER @@ -58,11 +58,11 @@

org.richfaces.LoadStyleStrategy - ALL + DEFAULT

org.richfaces.LoadScriptStrategy - ALL + DEFAULT = Modified: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/s= rc/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_r= f1107.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/mai= n/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf1107.= xhtml 2013-07-18 19:51:47 UTC (rev 23264) +++ branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/mai= n/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf1107.= xhtml 2013-07-19 03:04:33 UTC (rev 23265) @@ -1,34 +1,43 @@ - = + = - = - + + + + + <ui:insert name=3D"title"/> + + + + + = - + - + - + @@ -43,46 +52,47 @@ - + - + - - - + + + - - - - - - X - + + + + + + X + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - + + \ No newline at end of file Modified: branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/s= rc/main/javascript/ClientUI/controls/grid/GridBody.js =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/mai= n/javascript/ClientUI/controls/grid/GridBody.js 2013-07-18 19:51:47 UTC (re= v 23264) +++ branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/mai= n/javascript/ClientUI/controls/grid/GridBody.js 2013-07-19 03:04:33 UTC (re= v 23265) @@ -101,8 +101,13 @@ Event.observe(this.frozenContentBox.getElement(), "keyup", this.synchron= izeKeyUp.bindAsEventListener(this)); Event.observe(this.frozenContentBox.getElement(), "keydown", this.synchr= onizeKeyDown.bindAsEventListener(this)); Event.observe(this.frozenContentBox.getElement(), "scroll", this.synchro= nizeScroll.bindAsEventListener(this)); + + var gridHeader =3D this.grid.getHeader(); + Event.observe(gridHeader.contentBox.getElement(), "keyup", this.sy= nchronizeHeaderKeyUp.bindAsEventListener(gridHeader)); + Event.observe(gridHeader.contentBox.getElement(), "keydown", this.= synchronizeKeyDown.bindAsEventListener(gridHeader)); + Event.observe(gridHeader.frozenContentBox.getElement(), "keyup", t= his.synchronizeHeaderKeyUp.bindAsEventListener(gridHeader)); + Event.observe(gridHeader.frozenContentBox.getElement(), "keydown",= this.synchronizeKeyDown.bindAsEventListener(gridHeader)); = - = this.helpObject1 =3D new ClientUI.common.box.Box(this.gridId + ":nho", t= his.contentBox.getElement()); this.helpObject2 =3D new ClientUI.common.box.Box(this.gridId + ":fho", t= his.frozenContentBox.getElement()); = @@ -686,8 +691,11 @@ }, = synchronizeKeyUp: function (event) { - if (Event.KEY_TAB =3D=3D event.keyCode || Event.KEY_TAB =3D=3D event.cha= rCode) { = - var k =3D 0; + if (Event.KEY_TAB =3D=3D event.keyCode || Event.KEY_TAB =3D=3D event.cha= rCode) { + if (ClientUILib.isIE7 || ClientUILib.isIE8) { + this.grid.getBody().frozenContentBox.element.scrollTop =3D= this.grid.getBody().contentBox.element.scrollTop; + } + var k =3D 0; var el =3D document.activeElement; if (el) { k +=3D el.offsetLeft; @@ -705,7 +713,27 @@ } } } - } + }, + = + synchronizeHeaderKeyUp: function (event) { + if (Event.KEY_TAB =3D=3D event.keyCode || Event.KEY_TAB =3D=3D eve= nt.charCode) { + var k =3D 0; + var el =3D document.activeElement; + if (el) { + k +=3D el.offsetLeft; + while (el.parentElement.id.indexOf("NormalBox")<0) { + el =3D el.parentElement; + k +=3D el.offsetLeft; + if (el.parentElement.id.indexOf("FrozenBox")>=3D0) { + k =3D 0; + this.grid.getBody().scrollBox.element.scrollLeft = =3D 0; + return; + } + } + this.grid.getBody().scrollBox.element.scrollLeft =3D k; + } + } + } }); = Object.extend(ClientUI.controls.grid.GridBody.prototype, { --===============7852396705449409024==--