Skip to content

Commit 887a507

Browse files
AndreyChaykoAndreyChayko
committed
Fix #29: Code refactoring
1 parent dabe104 commit 887a507

File tree

9 files changed

+48
-48
lines changed

9 files changed

+48
-48
lines changed

‎demo/fixed-header/css/angular-data-grid.bootstrap.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
content: "\f0dd";
2323
vertical-align: top; }
2424

25-
.fixed {
25+
.fixed-header {
2626
border: none; }

‎demo/fixed-header/css/angular-data-grid.material.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,5 @@ th md-select {
8282
.sortable.sort-descent span:after {
8383
display: none; }
8484

85-
.fixed {
85+
.fixed-header {
8686
border: 1px solid rgba(0, 0, 0, 0.12); }

‎demo/fixed-header/css/fixed-header.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
.fixed {
1+
.fixed-header {
22
top: 0;
33
position: fixed;
44
width: auto;
55
display: table;
66
z-index: 99; }
7-
.fixed tr {
7+
.fixed-header tr {
88
background-color: #fff; }
99

1010
.tbody-offset:before {

‎demo/fixed-header/scss/bootstrap/angular-data-grid.bootstrap.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
}
3030
}
3131

32-
.fixed {
32+
.fixed-header {
3333
border: none;
3434
}

‎demo/fixed-header/scss/fixed-header.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.fixed {
1+
.fixed-header {
22
top: 0;
33
position: fixed;
44
width: auto;

‎demo/fixed-header/scss/material-design/angular-data-grid.material.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,6 @@ th md-select {
106106
}
107107
}
108108

109-
.fixed {
109+
.fixed-header {
110110
border: 1px solid $borderColor;
111111
}

‎dist/dataGridUtils.js‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
};
1515

1616
function link(scope, element, attrs) {
17-
var elementOffsetFrom = attrs.offsetFromElementId ?
18-
angular.element(document.querySelector('#' + attrs.offsetFromElementId))[0] :
19-
window;
17+
var elementOffsetFrom = attrs.offsetFromElement ?
18+
document.querySelector(attrs.offsetFromElement) :
19+
window;
2020

2121
function resizeFixed() {
2222
var thElements = element.find("th");
@@ -26,53 +26,53 @@
2626
return;
2727
}
2828
var tdElementWidth = tdElement.offsetWidth;
29-
angular.element(thElements[i]).css({ 'width': tdElementWidth + 'px' });
29+
angular.element(thElements[i]).css({'width': tdElementWidth + 'px'});
3030
}
3131
}
3232

3333
function bindFixedToHeader() {
34-
var thead = angular.element(element.find("thead")),
34+
var thead = element.find("thead"),
3535
tbody = element.find("tbody"),
3636
tbodyLeftPos = tbody[0].getBoundingClientRect().left;
37-
thead.addClass('fixed');
38-
if (attrs.offsetFromElementId) {
39-
var topElement = angular.element(document.querySelector(attrs.offsetFromElementId))[0];
37+
thead.addClass('fixed-header');
38+
if (attrs.offsetFromElement) {
39+
var topElement = document.querySelector(attrs.offsetFromElement);
4040
var offset = topElement.getBoundingClientRect().top + topElement.offsetHeight;
41-
angular.element(thead[0]).css({ "top": offset });
41+
thead.css({"top": offset});
4242
}
43-
angular.element(thead[0]).css({"left": tbodyLeftPos});
43+
thead.css({"left": tbodyLeftPos});
4444
tbody.addClass("tbody-offset");
4545
}
4646

4747
function unBindFixedToHeader() {
48-
var thead = angular.element(element.find("thead")),
48+
var thead = element.find("thead"),
4949
tbody = element.find("tbody");
50-
thead.removeClass('fixed');
51-
angular.element(thead[0]).css({"left": ""});
52-
angular.element(thead[0]).css({"top": ""});
50+
thead.removeClass('fixed-header');
51+
thead.css({"left": ""});
52+
thead.css({"top": ""});
5353
tbody.removeClass("tbody-offset");
5454
}
5555

5656
function scrollFixed() {
57-
var offset = attrs.offsetFromElementId ?
57+
var offset = attrs.offsetFromElement ?
5858
elementOffsetFrom.getBoundingClientRect().top + elementOffsetFrom.offsetHeight :
5959
$window.pageYOffset,
60-
tableOffsetTop = attrs.offsetFromElementId ?
60+
tableOffsetTop = attrs.offsetFromElement ?
6161
element[0].getBoundingClientRect().top :
6262
element[0].getBoundingClientRect().top + offset,
6363
tableOffsetBottom = tableOffsetTop + element[0].offsetHeight - element.find("thead")[0].offsetHeight;
6464

65-
if(offset < tableOffsetTop || offset > tableOffsetBottom) {
65+
if (offset < tableOffsetTop || offset > tableOffsetBottom) {
6666
unBindFixedToHeader();
6767
}
68-
else if(offset >= tableOffsetTop && offset <= tableOffsetBottom) {
68+
else if (offset >= tableOffsetTop && offset <= tableOffsetBottom) {
6969
bindFixedToHeader();
7070
}
7171
resizeFixed();
7272
}
7373

74-
scope.$on('gridReloaded', function() {
75-
$timeout(function(){
74+
scope.$on('gridReloaded', function () {
75+
$timeout(function () {
7676
resizeFixed();
7777
scrollFixed();
7878
}, 0);

‎dist/dataGridUtils.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/js/dataGridUtils.js‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
};
1515

1616
function link(scope, element, attrs) {
17-
var elementOffsetFrom = attrs.offsetFromElementId ?
18-
angular.element(document.querySelector('#' + attrs.offsetFromElementId))[0] :
19-
window;
17+
var elementOffsetFrom = attrs.offsetFromElement ?
18+
document.querySelector(attrs.offsetFromElement) :
19+
window;
2020

2121
function resizeFixed() {
2222
var thElements = element.find("th");
@@ -26,53 +26,53 @@
2626
return;
2727
}
2828
var tdElementWidth = tdElement.offsetWidth;
29-
angular.element(thElements[i]).css({ 'width': tdElementWidth + 'px' });
29+
angular.element(thElements[i]).css({'width': tdElementWidth + 'px'});
3030
}
3131
}
3232

3333
function bindFixedToHeader() {
34-
var thead = angular.element(element.find("thead")),
34+
var thead = element.find("thead"),
3535
tbody = element.find("tbody"),
3636
tbodyLeftPos = tbody[0].getBoundingClientRect().left;
37-
thead.addClass('fixed');
38-
if (attrs.offsetFromElementId) {
39-
var topElement = angular.element(document.querySelector(attrs.offsetFromElementId))[0];
37+
thead.addClass('fixed-header');
38+
if (attrs.offsetFromElement) {
39+
var topElement = document.querySelector(attrs.offsetFromElement);
4040
var offset = topElement.getBoundingClientRect().top + topElement.offsetHeight;
41-
angular.element(thead[0]).css({ "top": offset });
41+
thead.css({"top": offset});
4242
}
43-
angular.element(thead[0]).css({"left": tbodyLeftPos});
43+
thead.css({"left": tbodyLeftPos});
4444
tbody.addClass("tbody-offset");
4545
}
4646

4747
function unBindFixedToHeader() {
48-
var thead = angular.element(element.find("thead")),
48+
var thead = element.find("thead"),
4949
tbody = element.find("tbody");
50-
thead.removeClass('fixed');
51-
angular.element(thead[0]).css({"left": ""});
52-
angular.element(thead[0]).css({"top": ""});
50+
thead.removeClass('fixed-header');
51+
thead.css({"left": ""});
52+
thead.css({"top": ""});
5353
tbody.removeClass("tbody-offset");
5454
}
5555

5656
function scrollFixed() {
57-
var offset = attrs.offsetFromElementId ?
57+
var offset = attrs.offsetFromElement ?
5858
elementOffsetFrom.getBoundingClientRect().top + elementOffsetFrom.offsetHeight :
5959
$window.pageYOffset,
60-
tableOffsetTop = attrs.offsetFromElementId ?
60+
tableOffsetTop = attrs.offsetFromElement ?
6161
element[0].getBoundingClientRect().top :
6262
element[0].getBoundingClientRect().top + offset,
6363
tableOffsetBottom = tableOffsetTop + element[0].offsetHeight - element.find("thead")[0].offsetHeight;
6464

65-
if(offset < tableOffsetTop || offset > tableOffsetBottom) {
65+
if (offset < tableOffsetTop || offset > tableOffsetBottom) {
6666
unBindFixedToHeader();
6767
}
68-
else if(offset >= tableOffsetTop && offset <= tableOffsetBottom) {
68+
else if (offset >= tableOffsetTop && offset <= tableOffsetBottom) {
6969
bindFixedToHeader();
7070
}
7171
resizeFixed();
7272
}
7373

74-
scope.$on('gridReloaded', function() {
75-
$timeout(function(){
74+
scope.$on('gridReloaded', function () {
75+
$timeout(function () {
7676
resizeFixed();
7777
scrollFixed();
7878
}, 0);

0 commit comments

Comments
 (0)