chore(release): 1.0.0-beta.4 distribution files

esvit · Sep 13, 2015 · b3bd193 · b3bd193
1 parent c075106
commit b3bd193
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,27 @@
+<a name="1.0.0-beta.4"></a>
+# 1.0.0-beta.4 (2015-09-13)
+
+
+## Breaking Changes
+
+- **NgTableParams:** due to [380ba21f](https://github.com/esvit/ng-table/commit/380ba21fdf5f4cd69322599a53d86e456851dcea),
+
+
+* `NgTableParams.settings().data` renamed to `NgTableParams.settings().dataset`
+
+Previously:
+
+```js
+var tp = new NgTableParams({}, {data: yourArray });
+```
+
+Now:
+
+```js
+var tp = new NgTableParams({}, {dataset: yourArray });
+```
+
+
 <a name="1.0.0-beta.3"></a>
 # 1.0.0-beta.3 (2015-09-06)
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-table",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "main": [
     "./dist/ng-table.min.js",
     "./dist/ng-table.min.css"

diff --git a/dist/ng-table.js b/dist/ng-table.js
@@ -548,7 +548,7 @@
                 defaultFilterOptions = {
                     filterComparator: undefined, // look for a substring match in case insensitive way
                     filterDelay: 500,
-                    filterDelayThreshold: 10000, // size of data array that will trigger the filterDelay being applied
+                    filterDelayThreshold: 10000, // size of dataset array that will trigger the filterDelay being applied
                     filterFilterName: undefined, // when defined overrides ngTableDefaultGetDataProvider.filterFilterName
                     filterFn: undefined, // when defined overrides the filter function that ngTableDefaultGetData uses
                     filterLayout: 'stack' // alternative: 'horizontal'
@@ -648,9 +648,9 @@
                         newSettings.groupOptions = angular.extend({}, settings.groupOptions, newSettings.groupOptions);
                     }
 
-                    if (angular.isArray(newSettings.data)) {
-                        //auto-set the total from passed in data
-                        newSettings.total = newSettings.data.length;
+                    if (angular.isArray(newSettings.dataset)) {
+                        //auto-set the total from passed in dataset
+                        newSettings.total = newSettings.dataset.length;
                     }
 
                     // todo: remove the backwards compatibility shim and the following two if blocks
@@ -663,21 +663,21 @@
                         newSettings.getGroupsFnAdaptor = ngTableGetDataBcShim;
                     }
 
-                    var originalDataset = settings.data;
+                    var originalDataset = settings.dataset;
                     settings = angular.extend(settings, newSettings);
 
-                    if (angular.isArray(newSettings.data)) {
+                    if (angular.isArray(newSettings.dataset)) {
                         optimizeFilterDelay();
                     }
 
                     // note: using != as want null and undefined to be treated the same
-                    var hasDatasetChanged = newSettings.hasOwnProperty('data') && (newSettings.data != originalDataset);
+                    var hasDatasetChanged = newSettings.hasOwnProperty('dataset') && (newSettings.dataset != originalDataset);
                     if (hasDatasetChanged) {
                         if (isCommittedDataset){
                             this.page(1); // reset page as a new dataset has been supplied
                         }
                         isCommittedDataset = false;
-                        ngTableEventsChannel.publishDatasetChanged(this, newSettings.data, originalDataset);
+                        ngTableEventsChannel.publishDatasetChanged(this, newSettings.dataset, originalDataset);
                     }
                     log('ngTable: set settings', settings);
                     return this;
@@ -1165,7 +1165,7 @@
                  * @param {Object} params the `NgTableParams` requesting data
                  */
                 function getData(params) {
-                    return ngTableDefaultGetData(params.settings().data, params);
+                    return ngTableDefaultGetData(params.settings().dataset, params);
                 }
 
                 /**
@@ -1250,7 +1250,7 @@
                 // todo: remove $scope after acceptable depreciation period as no longer required
                 $scope: null, // set by ngTable controller
                 $loading: false,
-                data: null, //allows data to be set when table is initialized
+                dataset: null, //allows data to be set when table is initialized
                 total: 0,
                 defaultSort: 'desc',
                 filterOptions: angular.copy(defaultFilterOptions),
@@ -1748,7 +1748,7 @@
     ngTableColumnsBinding.$inject = ["$parse"];
 
     /**
-     * @ngdoc service
+     * @ngdoc directive
      * @name ngTableColumnsBinding
      * @description One-way data binds the $columns array generated by ngTable/ngTableDynamic to the specified
      * expression.

diff --git a/dist/ng-table.min.css b/dist/ng-table.min.css
diff --git a/dist/ng-table.min.js b/dist/ng-table.min.js
diff --git a/dist/ng-table.min.js.map b/dist/ng-table.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-table",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "author": "Vitalii Savchuk <esvit666@gmail.com>",
   "license": "BSD",
   "repository": {