Skip to content

Commit

Permalink
chore(release): 1.0.0-alpha.1 distribution files
Browse files Browse the repository at this point in the history
  • Loading branch information
ccrowhurstram committed Aug 10, 2015
1 parent a01da5b commit aab23f1
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 7 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
<a name="1.0.0-alpha.1"></a>
# 1.0.0-alpha.1 (2015-08-10)


## Bug Fixes

- **ngTableController:** should not call reload twice when initial load fails
([a01da5bd](https://github.com/esvit/ng-table/commit/a01da5bdf9e88f27b6807458212f5c36d2390e85))


## Features

- **NgTableParams:** add hasErrorState method
([093ba3d9](https://github.com/esvit/ng-table/commit/093ba3d96c591faaccff6a613223629a861a1c6a))


<a name="1.0.0-alpha"></a>
# 1.0.0-alpha (2015-08-10)

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-table",
"version": "1.0.0-alpha",
"version": "1.0.0-alpha.1",
"main": [
"./dist/ng-table.min.js",
"./dist/ng-table.min.css"
Expand Down
19 changes: 18 additions & 1 deletion dist/ng-table.js
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@

var self = this,
committedParams,
erroredParams,
isCommittedDataset = false,
log = function() {
if (settings.debugMode && $log.debug) {
Expand Down Expand Up @@ -838,6 +839,8 @@
var oldData = self.data;
return pData.then(function(data) {
settings.$loading = false;
erroredParams = null;

self.data = data;
// note: I think it makes sense to publish this event even when data === oldData
// subscribers can always set a filter to only receive the event when data !== oldData
Expand All @@ -851,13 +854,27 @@

return data;
}).catch(function(reason){
erroredParams = committedParams;
committedParams = null;
isCommittedDataset = false;
// "rethrow"
return $q.reject(reason);
});
};

/**
* @ngdoc method
* @name NgTableParams#hasErrorState
* @description Return true when an attempt to `reload` the current `parameter` values have resulted in
* a failure
*
* This method will continue to return true until the reload is successfully called or when the
* `parameter` values have changed
*/
this.hasErrorState = function(){
return !!(erroredParams && angular.equals(erroredParams, params));
};

this.reloadPages = (function() {
var currentPages;
return function(){
Expand Down Expand Up @@ -1050,7 +1067,7 @@
})();

function onDataReloadStatusChange (newStatus/*, oldStatus*/) {
if (!newStatus) {
if (!newStatus || $scope.params.hasErrorState()) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion dist/ng-table.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/ng-table.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ng-table.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-table",
"version": "1.0.0-alpha",
"version": "1.0.0-alpha.1",
"author": "Vitalii Savchuk <[email protected]>",
"license": "BSD",
"repository": {
Expand Down

0 comments on commit aab23f1

Please sign in to comment.