Conflicts: build.properties Change-Id: Ie3cf9bd0af8aba7debf4626d2db77afea37e7cb3tags/7.2.0
javadoc.doctitle=<h1>Vaadin</h1> | javadoc.doctitle=<h1>Vaadin</h1> | ||||
javadoc.bottom=<i>Copyright © 2000-2011 Vaadin Ltd. All Rights Reserved.</i> | |||||
javadoc.bottom=<i>Copyright © 2000-2014 Vaadin Ltd. All Rights Reserved.</i> | |||||
ivy.organisation=com.vaadin | ivy.organisation=com.vaadin | ||||
vaadin.vendor=Vaadin Ltd | vaadin.vendor=Vaadin Ltd | ||||
vaadin.url=http://vaadin.com | vaadin.url=http://vaadin.com | ||||
vaadin.java.version=1.6 | vaadin.java.version=1.6 | ||||
vaadin.version=0.0.0.unversioned-development-build | vaadin.version=0.0.0.unversioned-development-build | ||||
vaadin.sass.version=0.9.0 | vaadin.sass.version=0.9.0 | ||||
commons-io.version=2.4 | |||||
commons-io.version=2.4 |
// cell to accomodate for the size of the sort arrow. | // cell to accomodate for the size of the sort arrow. | ||||
HeaderCell sortedHeader = tHead.getHeaderCell(sortColumn); | HeaderCell sortedHeader = tHead.getHeaderCell(sortColumn); | ||||
if (sortedHeader != null) { | if (sortedHeader != null) { | ||||
// Mark header as sorted now. Any earlier marking would lead to | |||||
// columns with wrong sizes | |||||
sortedHeader.setSorted(true); | |||||
tHead.resizeCaptionContainer(sortedHeader); | tHead.resizeCaptionContainer(sortedHeader); | ||||
} | } | ||||
// Also recalculate the width of the captionContainer element in the | // Also recalculate the width of the captionContainer element in the | ||||
if (col.hasAttribute("sortable")) { | if (col.hasAttribute("sortable")) { | ||||
c.setSortable(true); | c.setSortable(true); | ||||
if (cid.equals(sortColumn)) { | |||||
c.setSorted(true); | |||||
} else { | |||||
c.setSorted(false); | |||||
} | |||||
c.setSorted(false); | |||||
} else { | } else { | ||||
c.setSortable(false); | c.setSortable(false); | ||||
} | } |
getWidget().tabIndex = getState().tabIndex; | getWidget().tabIndex = getState().tabIndex; | ||||
getWidget().setProperTabIndex(); | getWidget().setProperTabIndex(); | ||||
if (getWidget().initializedAndAttached) { | |||||
getWidget().resizeSortedColumnForSortIndicator(); | |||||
} | |||||
Scheduler.get().scheduleFinally(new ScheduledCommand() { | |||||
@Override | |||||
public void execute() { | |||||
getWidget().resizeSortedColumnForSortIndicator(); | |||||
} | |||||
}); | |||||
// Remember this to detect situations where overflow hack might be | // Remember this to detect situations where overflow hack might be | ||||
// needed during scrolling | // needed during scrolling |
for (File referenceFile : referenceFiles) { | for (File referenceFile : referenceFiles) { | ||||
if (testBench(driver).compareScreen(referenceFile)) { | if (testBench(driver).compareScreen(referenceFile)) { | ||||
// There might be failure files because of retries in TestBench. | // There might be failure files because of retries in TestBench. | ||||
deleteFailureFiles(referenceFile); | |||||
deleteFailureFiles(getErrorFileFromReference(referenceFile)); | |||||
break; | break; | ||||
} else { | } else { | ||||
failedReferenceFiles.add(referenceFile); | failedReferenceFiles.add(referenceFile); |