Skip to content

Commit d581e46

Browse files
committed
Merge branch '3.0-horizontal-scrolling' into 3.0
2 parents 47ce695 + 553abea commit d581e46

27 files changed

+135800
-217
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#################
1+
c#################
22
## Vim
33
#################
44

Gruntfile.js

+1
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ module.exports = function(grunt) {
357357
}
358358
},
359359
scripts: [
360+
'//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js', // TODO(c0bra): REMOVE!
360361
'//ajax.googleapis.com/ajax/libs/angularjs/1.2.7/angular.js',
361362
'//ajax.googleapis.com/ajax/libs/angularjs/1.2.7/angular-touch.js',
362363
],

TODO.md

+19-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,25 @@
2727
- Invalidate row heights on data changes
2828
1. Add jade processing for misc/site directory
2929
- Don't `copy` .jade files with the copy task.
30-
1. Make scrollbar look like chrome's?
30+
1. Naming inconsistencies - uiGridConstants vs gridUtil, etc.
3131

32+
1. Horizontal scrolling
33+
- [DONE] - [NOTE] - The header will need to be able to scroll as well. It will need to be able to overflow
34+
- [IDEA] - We'll need to iterate through the columnDefs in the style computation, and calculate the minimum number of rows to render.
35+
- Basically find the set of smallest columns, according to their width, that still cover the viewport, and figure out how many are in the set, then set minCols to that
36+
- Starting with the first column, add up the column widths until they are greater than the viewport width, then save that number of columns as the minimum. Continue going through the
37+
column widths, subtracting the previous column's width and adding the next column's width. If at any point the total width is less than the viewport, increment the minimum number of columns.
38+
- [IDEA] - Might need to dynamically set 'excessColumns'. With a 'scrollThreshold' of 4 and 'excessColumns' of 4, it was not rendering enough columns to the left of the viewport
39+
- [TODO] - Figure out how to calculate the margin-left property on the columns when the columns have variable sizes. Might need to calc the widths of the rendered columns in order to get the offset adjustments
40+
41+
42+
43+
1. [IDEA] - Bind to 'resize' event and refresh grid on that
44+
1. Scrollbar not hiding on Mac OS?
45+
1. Border of scrollbar on hover doesn't appear darker than background
3246
1. Make a custom branch that adds requestAnimationFrame wrappers around anywhere we retrieve/modify reflow-triggering DOM values.
47+
1. [IDEA] - From s3shs on irc: add bootstrap2/3 less/css shims that will style the grid the same was a bootstrap table (similar to selectize: http://brianreavis.github.io/selectize.js/)
48+
3349

3450
# Done!
3551

@@ -55,4 +71,5 @@
5571
1. [DONE] Mouse wheel should work in viewport (almost done)
5672
1. [DONE] - [BUG] - Hidden grid doesn't calculate height of header correctly
5773
1. [DONE] - [BUG] - Viewport is calcuating too small on customizer page on ui-grid.info ONLY.
58-
- Was including wrong ui-grid.css file
74+
- Was including wrong ui-grid.css file
75+
1. [DONE] - Make scrollbar look like chrome's?

0 commit comments

Comments
 (0)