Skip to content
This repository was archived by the owner on Jan 7, 2022. It is now read-only.

Commit 133974e

Browse files
authored
Scroll-height updating on grouping changes (#56)
* scroll height works on different combinations of expanded, collapsed, non-existant grouping * +release build * missing popover, menu angular imports * +release build for angular imports * package.json update, version patch update
1 parent 8483071 commit 133974e

7 files changed

Lines changed: 24 additions & 23 deletions

File tree

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"name": "angular-data-table",
33
"title": "AngularJS Data-Table",
44
"description": "A feature-rich but lightweight ES6 AngularJS Data Table crafted for large data sets!",
5-
"version": "0.7.3",
5+
"version": "0.7.4",
66
"repository": {
77
"type": "git",
8-
"url": "git@github.com:Swimlane/angular-data-table.git",
9-
"github": "http://github.com/swimlane/angular-data-table.git"
8+
"url": "git@github.com:jonshaffer/angular-data-table.git",
9+
"github": "https://github.com/jonshaffer/angular-data-table.git"
1010
},
1111
"main": "./release/dataTable.js",
1212
"files": [
1313
"release/"
1414
],
15-
"homepage": "http://swimlane.com/",
15+
"homepage": "https://github.com/jonshaffer/angular-data-table",
1616
"author": {
1717
"name": "Swimlane",
1818
"email": "austin@swimlane.com",

release/dataTable.cjs.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/dataTable.es6.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2437,10 +2437,9 @@ function ScrollerDirective() {
24372437
ctrl.updatePage();
24382438

24392439
if (ctrl.options.scrollbarV) {
2440-
ctrl.getRows();
2440+
ctrl.getRows(true);
24412441
}
24422442

2443-
// https://github.com/Swimlane/angular-data-table/pull/74
24442443
ctrl.options.$outer.$digest();
24452444

24462445
ticking = false;
@@ -2464,7 +2463,7 @@ function ScrollerDirective() {
24642463
parent.off('scroll');
24652464
});
24662465

2467-
$scope.scrollerStyles = function scrollerStyles() {
2466+
$scope.scrollerStyles = () => {
24682467
if (ctrl.options.scrollbarV) {
24692468
return {
24702469
height: `${ctrl.count * ctrl.options.rowHeight}px`,
@@ -3832,7 +3831,7 @@ var dropdown = angular
38323831
.directive('dropdownToggle', DropdownToggleDirective)
38333832
.directive('dropdownMenu', DropdownMenuDirective);
38343833

3835-
var menu = angular
3834+
var menu = angular$1
38363835
.module('dt.menu', [dropdown.name])
38373836
.controller('MenuController', MenuController)
38383837
.directive('dtm', MenuDirective);

release/dataTable.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/dataTable.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/body/ScrollerDirective.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@ export default function ScrollerDirective() {
2828
ctrl.updatePage();
2929

3030
if (ctrl.options.scrollbarV) {
31-
ctrl.getRows();
31+
ctrl.getRows(true);
3232
}
3333

34-
// https://github.com/Swimlane/angular-data-table/pull/74
3534
ctrl.options.$outer.$digest();
3635

3736
ticking = false;
@@ -55,7 +54,7 @@ export default function ScrollerDirective() {
5554
parent.off('scroll');
5655
});
5756

58-
$scope.scrollerStyles = function scrollerStyles() {
57+
$scope.scrollerStyles = () => {
5958
if (ctrl.options.scrollbarV) {
6059
return {
6160
height: `${ctrl.count * ctrl.options.rowHeight}px`,

src/components/menu/menu.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
import angular from 'angular';
2+
13
import MenuController from './MenuController';
24
import MenuDirective from './MenuDirective';
5+
36
import dropdown from './dropdown/dropdown';
47

58
export default angular

0 commit comments

Comments
 (0)