Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzofox3 committed Aug 27, 2015
1 parent bae254c commit d1b715e
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 29 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-smart-table",
"version": "2.1.2",
"version": "2.1.3",
"homepage": "https://github.com/lorenzofox3/Smart-Table",
"authors": [
"lorenzofox3 <[email protected]>"
Expand Down
6 changes: 5 additions & 1 deletion changeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,8 @@ function(tableState, tableController){

## version 2.1.2

* improve build #461 [stanleyxu](https://github.com/stanleyxu2005)
* improve build #461 [stanleyxu](https://github.com/stanleyxu2005)

## version 2.1.3

* fix #477
25 changes: 13 additions & 12 deletions dist/smart-table.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @version 2.1.2
* @version 2.1.3
* @license MIT
*/
(function (ng, undefined){
Expand Down Expand Up @@ -70,19 +70,19 @@ ng.module('smart-table')
}
}

function deepDelete(object, path) {
function deepDelete (object, path) {
if (path.indexOf('.') != -1) {
var partials = path.split('.');
var key = partials.pop();
var parentPath = partials.join('.');
var parentObject = $parse(parentPath)(object)
delete parentObject[key];
if (Object.keys(parentObject).length == 0) {
deepDelete(object, parentPath);
}
} else {
delete object[path];
var partials = path.split('.');
var key = partials.pop();
var parentPath = partials.join('.');
var parentObject = $parse(parentPath)(object)
delete parentObject[key];
if (Object.keys(parentObject).length == 0) {
deepDelete(object, parentPath);
}
} else {
delete object[path];
}
}

if ($attrs.stSafeSrc) {
Expand All @@ -100,6 +100,7 @@ ng.module('smart-table')
return safeGetter($scope);
}, function (newValue, oldValue) {
if (newValue !== oldValue) {
tableState.pagination.start = 0;
updateSafeCopy();
}
});
Expand Down
4 changes: 2 additions & 2 deletions dist/smart-table.min.js

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

2 changes: 1 addition & 1 deletion dist/smart-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": "angular-smart-table",
"version": "2.1.2",
"version": "2.1.3",
"description": "",
"main": "index.js",
"scripts": {
Expand Down
23 changes: 12 additions & 11 deletions src/stTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ ng.module('smart-table')
}
}

function deepDelete(object, path) {
function deepDelete (object, path) {
if (path.indexOf('.') != -1) {
var partials = path.split('.');
var key = partials.pop();
var parentPath = partials.join('.');
var parentObject = $parse(parentPath)(object)
delete parentObject[key];
if (Object.keys(parentObject).length == 0) {
deepDelete(object, parentPath);
}
} else {
delete object[path];
var partials = path.split('.');
var key = partials.pop();
var parentPath = partials.join('.');
var parentObject = $parse(parentPath)(object)
delete parentObject[key];
if (Object.keys(parentObject).length == 0) {
deepDelete(object, parentPath);
}
} else {
delete object[path];
}
}

if ($attrs.stSafeSrc) {
Expand All @@ -61,6 +61,7 @@ ng.module('smart-table')
return safeGetter($scope);
}, function (newValue, oldValue) {
if (newValue !== oldValue) {
tableState.pagination.start = 0;
updateSafeCopy();
}
});
Expand Down

0 comments on commit d1b715e

Please sign in to comment.