Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions packages/core/src/js/directives/ui-grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
self.grid.preCompileCellTemplates();

self.grid.refreshCanvas(true);
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });
}) );
}

Expand Down Expand Up @@ -118,7 +118,7 @@
promises.push(self.grid.buildColumns()
.then(function() {
self.grid.preCompileCellTemplates();
}).catch(angular.noop));
}).catch(function(err) { $log.error(err); }));
}

$q.all(promises).then(function() {
Expand All @@ -133,8 +133,8 @@
self.grid.refreshCanvas(true);
self.grid.callDataChangeCallbacks(uiGridConstants.dataChange.ROW);
});
}).catch(angular.noop);
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });
}).catch(function(err) { $log.error(err); });
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/js/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
aria: {
defaultFilterLabel: 'Filter for column',
removeFilter: 'Remove Filter',
columnMenuButtonLabel: 'Column Menu',
columnMenuButtonLabel: 'Column Menu Button',
column: 'Column'
},
priority: 'Priority:',
Expand Down
26 changes: 13 additions & 13 deletions packages/core/src/js/factories/Grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -803,9 +803,9 @@ angular.module('ui.grid')
.then(function() {
self.preCompileCellTemplates();
self.queueGridRefresh();
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });
}
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });
};

/**
Expand Down Expand Up @@ -924,7 +924,7 @@ angular.module('ui.grid')
if (options.preCompileCellTemplates) {
self.preCompileCellTemplates();
}
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });
};

Grid.prototype.preCompileCellTemplate = function(col) {
Expand Down Expand Up @@ -953,7 +953,7 @@ angular.module('ui.grid')
} else if ( col.cellTemplatePromise ) {
col.cellTemplatePromise.then( function() {
self.preCompileCellTemplate( col );
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });
}
});
};
Expand Down Expand Up @@ -1261,12 +1261,12 @@ angular.module('ui.grid')
var p1 = $q.when(self.processRowsProcessors(self.rows))
.then(function (renderableRows) {
return self.setVisibleRows(renderableRows);
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });

var p2 = $q.when(self.processColumnsProcessors(self.columns))
.then(function (renderableColumns) {
return self.setVisibleColumns(renderableColumns);
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });

return $q.all([p1, p2]);
};
Expand Down Expand Up @@ -1564,7 +1564,7 @@ angular.module('ui.grid')
else {
finished.resolve(myRenderableColumns);
}
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });
}

// Start on the first processor
Expand Down Expand Up @@ -1637,7 +1637,7 @@ angular.module('ui.grid')

self.refreshCanceller.then(function () {
self.refreshCanceller = null;
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });

return self.refreshCanceller;
};
Expand All @@ -1662,7 +1662,7 @@ angular.module('ui.grid')

self.gridRefreshCanceller.then(function () {
self.gridRefreshCanceller = null;
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });

return self.gridRefreshCanceller;
};
Expand Down Expand Up @@ -2116,16 +2116,16 @@ angular.module('ui.grid')

var p1 = self.processRowsProcessors(self.rows).then(function (renderableRows) {
self.setVisibleRows(renderableRows);
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });

var p2 = self.processColumnsProcessors(self.columns).then(function (renderableColumns) {
self.setVisibleColumns(renderableColumns);
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });

return $q.all([p1, p2]).then(function () {
self.refreshCanvas(true);
self.redrawInPlace(rowsAltered);
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });
};

/**
Expand All @@ -2146,7 +2146,7 @@ angular.module('ui.grid')
self.redrawInPlace();

self.refreshCanvas( true );
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });
};

/**
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/js/services/gridClassFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
function () {
// Todo handle response error here?
throw new Error("Couldn't fetch/use row template '" + grid.options.rowTemplate + "'");
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });
}

grid.registerColumnBuilder(service.defaultColumnBuilder);
Expand Down Expand Up @@ -122,7 +122,7 @@
},
function () {
throw new Error("Couldn't fetch/use colDef." + templateType + " '" + colDef[templateType] + "'");
}).catch(angular.noop);
}).catch(function(err) { $log.error(err); });

templateGetPromises.push(templatePromise);

Expand Down