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

Commit

Permalink
Scroll-height updating on grouping changes (#56)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
jonshaffer authored Jan 9, 2017
1 parent 8483071 commit 133974e
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 23 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"name": "angular-data-table",
"title": "AngularJS Data-Table",
"description": "A feature-rich but lightweight ES6 AngularJS Data Table crafted for large data sets!",
"version": "0.7.3",
"version": "0.7.4",
"repository": {
"type": "git",
"url": "[email protected]:Swimlane/angular-data-table.git",
"github": "http://github.com/swimlane/angular-data-table.git"
"url": "[email protected]:jonshaffer/angular-data-table.git",
"github": "https://github.com/jonshaffer/angular-data-table.git"
},
"main": "./release/dataTable.js",
"files": [
"release/"
],
"homepage": "http://swimlane.com/",
"homepage": "https://github.com/jonshaffer/angular-data-table",
"author": {
"name": "Swimlane",
"email": "[email protected]",
Expand Down
8 changes: 4 additions & 4 deletions release/dataTable.cjs.js

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions release/dataTable.es6.js
Original file line number Diff line number Diff line change
Expand Up @@ -2437,10 +2437,9 @@ function ScrollerDirective() {
ctrl.updatePage();

if (ctrl.options.scrollbarV) {
ctrl.getRows();
ctrl.getRows(true);
}

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

ticking = false;
Expand All @@ -2464,7 +2463,7 @@ function ScrollerDirective() {
parent.off('scroll');
});

$scope.scrollerStyles = function scrollerStyles() {
$scope.scrollerStyles = () => {
if (ctrl.options.scrollbarV) {
return {
height: `${ctrl.count * ctrl.options.rowHeight}px`,
Expand Down Expand Up @@ -3832,7 +3831,7 @@ var dropdown = angular
.directive('dropdownToggle', DropdownToggleDirective)
.directive('dropdownMenu', DropdownMenuDirective);

var menu = angular
var menu = angular$1
.module('dt.menu', [dropdown.name])
.controller('MenuController', MenuController)
.directive('dtm', MenuDirective);
Expand Down
8 changes: 4 additions & 4 deletions release/dataTable.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions release/dataTable.min.js

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions src/components/body/ScrollerDirective.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@ export default function ScrollerDirective() {
ctrl.updatePage();

if (ctrl.options.scrollbarV) {
ctrl.getRows();
ctrl.getRows(true);
}

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

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

$scope.scrollerStyles = function scrollerStyles() {
$scope.scrollerStyles = () => {
if (ctrl.options.scrollbarV) {
return {
height: `${ctrl.count * ctrl.options.rowHeight}px`,
Expand Down
3 changes: 3 additions & 0 deletions src/components/menu/menu.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import angular from 'angular';

import MenuController from './MenuController';
import MenuDirective from './MenuDirective';

import dropdown from './dropdown/dropdown';

export default angular
Expand Down

0 comments on commit 133974e

Please sign in to comment.