@@ -2237,7 +2270,7 @@ function BodyDirective($timeout){
-
-
@@ -2922,10 +2955,27 @@ class FooterController {
* @param {scope}
* @return {[type]}
*/
+
/*@ngInject*/
- constructor($scope){
+ constructor($scope) {
+ Object.assign(this, {
+ $scope
+ });
+
+ // if preAssignBindingsEnabled === true and no $onInit
+ if (angular.version.major === 1 && angular.version.minor < 5) {
+ this.init();
+ }
+ }
+
+ $onInit() {
+ this.init();
+ }
+
+ init() {
this.page = this.paging.offset + 1;
- $scope.$watch('footer.paging.offset', (newVal) => {
+
+ this.$scope.$watch('footer.paging.offset', (newVal) => {
this.offsetChanged(newVal);
});
}
@@ -2980,26 +3030,42 @@ class PagerController {
/**
* Creates an instance of the Pager Controller
- * @param {object} $scope
+ * @param {object} $scope
*/
+
/*@ngInject*/
constructor($scope){
- $scope.$watch('pager.count', (newVal) => {
+ Object.assign(this, {
+ $scope
+ });
+
+ // if preAssignBindingsEnabled === true and no $onInit
+ if (angular.version.major === 1 && angular.version.minor < 5) {
+ this.init();
+ }
+ }
+
+ $onInit() {
+ this.init();
+ }
+
+ init() {
+ this.$scope.$watch('pager.count', (newVal) => {
this.calcTotalPages(this.size, this.count);
this.getPages(this.page || 1);
});
- $scope.$watch('pager.size', (newVal) => {
+ this.$scope.$watch('pager.size', (newVal) => {
this.calcTotalPages(this.size, this.count);
this.getPages(this.page || 1);
});
- $scope.$watch('pager.page', (newVal) => {
+ this.$scope.$watch('pager.page', (newVal) => {
if (newVal !== 0 && newVal <= this.totalPages) {
this.getPages(newVal);
}
});
-
+
this.getPages(this.page || 1);
}
@@ -3014,7 +3080,7 @@ class PagerController {
/**
* Select a page
- * @param {int} num
+ * @param {int} num
*/
selectPage(num){
if (num > 0 && num <= this.totalPages) {
@@ -3051,7 +3117,7 @@ class PagerController {
/**
* Determines if the pager can go forward
- * @return {boolean}
+ * @return {boolean}
*/
canNext(){
return this.page < this.totalPages;
@@ -3059,11 +3125,11 @@ class PagerController {
/**
* Gets the page set given the current page
- * @param {int} page
+ * @param {int} page
*/
getPages(page) {
var pages = [],
- startPage = 1,
+ startPage = 1,
endPage = this.totalPages,
maxSize = 5,
isMaxSized = maxSize < this.totalPages;
@@ -3488,10 +3554,10 @@ var popover = angular$1
.factory('PositionHelper', PositionHelper)
.directive('popover', PopoverDirective);
-class MenuController{
+class MenuController {
/*@ngInject*/
- constructor($scope, $timeout){
+ constructor($scope){
this.$scope = $scope;
}
@@ -3513,7 +3579,7 @@ class MenuController{
this.$scope.current.splice(idx, 1);
}
}
-
+
}
function MenuDirective(){
diff --git a/release/dataTable.js b/release/dataTable.js
index fde4a1c..d046360 100644
--- a/release/dataTable.js
+++ b/release/dataTable.js
@@ -775,49 +775,57 @@
* @param {scope}
* @param {filter}
*/
- /*@ngInject*/
- DataTableController.$inject = ["$scope", "$filter", "$log", "$transclude"];
- function DataTableController($scope, $filter, $log, $transclude) {
- var _this = this;
+ /* @ngInject */
+ DataTableController.$inject = ["$scope", "$filter"];
+ function DataTableController($scope, $filter) {
_classCallCheck(this, DataTableController);
_extends(this, {
$scope: $scope,
- $filter: $filter,
- $log: $log
+ $filter: $filter
});
- this.defaults();
-
- // set scope to the parent
- this.options.$outer = $scope.$parent;
+ // if preAssignBindingsEnabled === true and no $onInit
+ if (_angular2.default.version.major === 1 && _angular2.default.version.minor < 5) {
+ this.init();
+ }
+ }
- $scope.$watch('dt.options.columns', function (newVal, oldVal) {
- _this.transposeColumnDefaults();
+ _createClass(DataTableController, [{
+ key: '$onInit',
+ value: function $onInit() {
+ this.init();
+ }
+ }, {
+ key: 'init',
+ value: function init() {
+ var _this = this;
- if (newVal.length !== oldVal.length) {
- _this.adjustColumns();
- }
+ this.defaults();
- _this.calculateColumns();
- }, true);
+ // set scope to the parent
+ this.options.$outer = this.$scope.$parent;
- // default sort
- var watch = $scope.$watch('dt.rows', function (newVal) {
- if (newVal) {
- watch();
- _this.onSorted();
- }
- });
- }
+ this.$scope.$watch('dt.options.columns', function (newVal, oldVal) {
+ _this.transposeColumnDefaults();
- /**
- * Creates and extends default options for the grid control
- */
+ if (newVal.length !== oldVal.length) {
+ _this.adjustColumns();
+ }
+ _this.calculateColumns();
+ }, true);
- _createClass(DataTableController, [{
+ // default sort
+ var watch = this.$scope.$watch('dt.rows', function (newVal) {
+ if (newVal) {
+ watch();
+ _this.onSorted();
+ }
+ });
+ }
+ }, {
key: 'defaults',
value: function defaults() {
var _this2 = this;
@@ -1451,23 +1459,33 @@
function HeaderCellController($scope) {
_classCallCheck(this, HeaderCellController);
- this.$scope = $scope;
-
- if (this.$scope.$parent.$parent.$parent.$parent.dt) {
- this.dt = this.$scope.$parent.$parent.$parent.$parent.dt;
- }
+ _extends(this, {
+ $scope: $scope
+ });
- if (this.column.headerCheckbox) {
- this.column.headerCheckboxCallback = this.rowSelected;
+ // if preAssignBindingsEnabled === true and no $onInit
+ if (angular.version.major === 1 && angular.version.minor < 5) {
+ this.init();
}
}
- /**
- * Calculates the styles for the header cell directive
- * @return {styles}
- */
-
_createClass(HeaderCellController, [{
+ key: '$onInit',
+ value: function $onInit() {
+ this.init();
+ }
+ }, {
+ key: 'init',
+ value: function init() {
+ if (this.column.headerCheckbox) {
+ this.column.headerCheckboxCallback = this.rowSelected;
+ }
+
+ if (this.$scope.$parent.$parent.$parent.$parent.dt) {
+ this.dt = this.$scope.$parent.$parent.$parent.$parent.dt;
+ }
+ }
+ }, {
key: 'styles',
value: function styles() {
return {
@@ -1586,54 +1604,67 @@
}
var BodyController = function () {
-
/**
- * A tale body controller
+ * A body controller
* @param {$scope}
* @return {BodyController}
*/
+
/*@ngInject*/
BodyController.$inject = ["$scope"];
function BodyController($scope) {
- var _this4 = this;
-
_classCallCheck(this, BodyController);
- this.$scope = $scope;
+ _extends(this, {
+ $scope: $scope
+ });
this.tempRows = [];
this.watchListeners = [];
- if (this.options) {
+ // if preAssignBindingsEnabled === true and no $onInit
+ if (angular.version.major === 1 && angular.version.minor < 5) {
+ this.init();
+ }
+ }
+
+ _createClass(BodyController, [{
+ key: '$onInit',
+ value: function $onInit() {
+ this.init();
+ }
+ }, {
+ key: 'init',
+ value: function init() {
+ var _this4 = this;
+
this.setTreeAndGroupColumns();
this.setConditionalWatches();
- }
- $scope.$watch('body.options.columns', function (newVal, oldVal) {
- if (newVal) {
- var origTreeColumn = _this4.treeColumn,
- origGroupColumn = _this4.groupColumn;
+ this.$scope.$watch('body.options.columns', function (newVal, oldVal) {
+ if (newVal) {
+ var origTreeColumn = _this4.treeColumn,
+ origGroupColumn = _this4.groupColumn;
- _this4.setTreeAndGroupColumns();
+ _this4.setTreeAndGroupColumns();
- _this4.setConditionalWatches();
+ _this4.setConditionalWatches();
- if (_this4.treeColumn && origGroupColumn !== _this4.treeColumn || _this4.groupColumn && origGroupColumn !== _this4.groupColumn) {
- _this4.rowsUpdated(_this4.rows);
+ if (_this4.treeColumn && origGroupColumn !== _this4.treeColumn || _this4.groupColumn && origGroupColumn !== _this4.groupColumn) {
+ _this4.rowsUpdated(_this4.rows);
- if (_this4.treeColumn) {
- _this4.refreshTree();
- } else if (_this4.groupColumn) {
- _this4.refreshGroups();
+ if (_this4.treeColumn) {
+ _this4.refreshTree();
+ } else if (_this4.groupColumn) {
+ _this4.refreshGroups();
+ }
}
}
- }
- }, true);
-
- $scope.$watchCollection('body.rows', this.rowsUpdated.bind(this));
- }
+ }, true);
- _createClass(BodyController, [{
+ this.$scope.$watchCollection('body.rows', this.rowsUpdated.bind(this));
+ }
+ }, {
key: 'setTreeAndGroupColumns',
value: function setTreeAndGroupColumns() {
this.treeColumn = this.options.columns.find(function (c) {
@@ -1864,8 +1895,6 @@
var temp = [];
angular.forEach(this.rowsByGroup, function (v, k) {
- console.log('buildGroups', _this6.rowsByGroup, v, k);
-
temp.push({
name: k,
group: true
@@ -2122,7 +2151,7 @@
onRowDblClick: '&'
},
scope: true,
- template: '\n
\n
\n
\n \n \n \n \n \n
\n
\n
\n
\n
'
+ template: '\n
\n \n '
};
}
@@ -2682,26 +2711,39 @@
* @param {scope}
* @return {[type]}
*/
+
/*@ngInject*/
FooterController.$inject = ["$scope"];
function FooterController($scope) {
- var _this7 = this;
-
_classCallCheck(this, FooterController);
- this.page = this.paging.offset + 1;
- $scope.$watch('footer.paging.offset', function (newVal) {
- _this7.offsetChanged(newVal);
+ _extends(this, {
+ $scope: $scope
});
+
+ // if preAssignBindingsEnabled === true and no $onInit
+ if (angular.version.major === 1 && angular.version.minor < 5) {
+ this.init();
+ }
}
- /**
- * The offset ( page ) changed externally, update the page
- * @param {new offset}
- */
+ _createClass(FooterController, [{
+ key: '$onInit',
+ value: function $onInit() {
+ this.init();
+ }
+ }, {
+ key: 'init',
+ value: function init() {
+ var _this7 = this;
+ this.page = this.paging.offset + 1;
- _createClass(FooterController, [{
+ this.$scope.$watch('footer.paging.offset', function (newVal) {
+ _this7.offsetChanged(newVal);
+ });
+ }
+ }, {
key: 'offsetChanged',
value: function offsetChanged(newVal) {
this.page = newVal + 1;
@@ -2739,41 +2781,53 @@
/**
* Creates an instance of the Pager Controller
- * @param {object} $scope
+ * @param {object} $scope
*/
+
/*@ngInject*/
PagerController.$inject = ["$scope"];
function PagerController($scope) {
- var _this8 = this;
-
_classCallCheck(this, PagerController);
- $scope.$watch('pager.count', function (newVal) {
- _this8.calcTotalPages(_this8.size, _this8.count);
- _this8.getPages(_this8.page || 1);
+ _extends(this, {
+ $scope: $scope
});
- $scope.$watch('pager.size', function (newVal) {
- _this8.calcTotalPages(_this8.size, _this8.count);
- _this8.getPages(_this8.page || 1);
- });
+ // if preAssignBindingsEnabled === true and no $onInit
+ if (angular.version.major === 1 && angular.version.minor < 5) {
+ this.init();
+ }
+ }
- $scope.$watch('pager.page', function (newVal) {
- if (newVal !== 0 && newVal <= _this8.totalPages) {
- _this8.getPages(newVal);
- }
- });
+ _createClass(PagerController, [{
+ key: '$onInit',
+ value: function $onInit() {
+ this.init();
+ }
+ }, {
+ key: 'init',
+ value: function init() {
+ var _this8 = this;
- this.getPages(this.page || 1);
- }
+ this.$scope.$watch('pager.count', function (newVal) {
+ _this8.calcTotalPages(_this8.size, _this8.count);
+ _this8.getPages(_this8.page || 1);
+ });
- /**
- * Calculates the total number of pages given the count.
- * @return {int} page count
- */
+ this.$scope.$watch('pager.size', function (newVal) {
+ _this8.calcTotalPages(_this8.size, _this8.count);
+ _this8.getPages(_this8.page || 1);
+ });
+ this.$scope.$watch('pager.page', function (newVal) {
+ if (newVal !== 0 && newVal <= _this8.totalPages) {
+ _this8.getPages(newVal);
+ }
+ });
- _createClass(PagerController, [{
+ this.getPages(this.page || 1);
+ }
+ }, {
key: 'calcTotalPages',
value: function calcTotalPages(size, count) {
var count = size < 1 ? 1 : Math.ceil(count / size);
@@ -3214,8 +3268,8 @@
var MenuController = function () {
/*@ngInject*/
- MenuController.$inject = ["$scope", "$timeout"];
- function MenuController($scope, $timeout) {
+ MenuController.$inject = ["$scope"];
+ function MenuController($scope) {
_classCallCheck(this, MenuController);
this.$scope = $scope;
diff --git a/release/dataTable.min.js b/release/dataTable.min.js
index 1aed9af..26cba65 100644
--- a/release/dataTable.min.js
+++ b/release/dataTable.min.js
@@ -4,5 +4,5 @@
* @link http://swimlane.com/
* @license MIT
*/
-!function(e,t){if("function"==typeof define&&define.amd)define("DataTable",["exports","angular"],t);else if("undefined"!=typeof exports)t(exports,require("angular"));else{var n={exports:{}};t(n.exports,e.angular),e.DataTable=n.exports}}(this,function(e,t){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function o(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t