Skip to content

Updated the watch to use watchCollection and removed JQGrid tree code… #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sax1johno wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated the watch to use watchCollection and removed JQGrid tree code… #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 24 additions & 20 deletions angular-jqgrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ angular.module('angular-jqgrid', []).directive('jqGrid', function() {
// Exception process if dataset is empty.
return gridObj;
}

var options = {};

options.data = scope.dataset;
Expand All @@ -62,6 +61,10 @@ angular.module('angular-jqgrid', []).directive('jqGrid', function() {
scope.callback(gridObj);
}

// Make sure the initial width of the grid is the width of its parent.
var parentElement = angular.element(element).parent();
gridObj.setGridWidth(parentElement.width());

return gridObj;
};

Expand All @@ -73,51 +76,52 @@ angular.module('angular-jqgrid', []).directive('jqGrid', function() {
var parentElement = angular.element(element).parent();
jqGrid.setGridWidth(parentElement.width());
});


/**
* Watches
*/
var onOptionsChanged = function() {
// console.log()
jqGrid = init();
};

var unwatchOptions = scope.$watch('options', onOptionsChanged, true);

var onDatasetChanged = function(dataset) {
var onDatasetChanged = function() {
var startDataChanged = new Date().getTime();
if (jqGrid) {

jqGrid.jqGrid('clearGridData');
// This tree grid code breaks the standard JQgrid use case.
// Commented out for now.
// jqGrid.jqGrid('clearGridData');
// // Bugfix : 갱신 후 undefined 행을 제거하기 위해 gridData 길이를 체크 후 빈값 할당
if( jqGrid.get(0).p.treeGrid) {
var perfTime = new Date().getTime();
jqGrid.get(0).addJSONData({
rows : dataset
});
console.log('addJSONData : ', new Date().getTime() - perfTime, 'ms');
}
else {
// if( jqGrid.get(0).p.treeGrid) {
// var perfTime = new Date().getTime();
// jqGrid.get(0).addJSONData({
// rows : scope.dataset
// });
// console.log('addJSONData : ', new Date().getTime() - perfTime, 'ms');
// }
// else {
jqGrid.jqGrid('setGridParam', {
datatype: 'local',
data: dataset,
rowNum: dataset.length
data: scope.dataset,
rowNum: scope.dataset.length
});
}
// }
//
// jqGrid.trigger('reloadGrid');

console.log('onDatasetChanged : ', new Date().getTime() - startDataChanged, 'ms');

return jqGrid.trigger('reload');


return jqGrid.trigger('reloadGrid');
} else {

jqGrid = init();

}
};

var unwatchDataset = scope.$watch('dataset', onDatasetChanged, false);
var unwatchDataset = scope.$watchCollection('dataset', onDatasetChanged, true);

/**
* Tear Down
Expand Down