Skip to content

Commit

Permalink
async render + convertValue bugfix + highlight bugfix with null value
Browse files Browse the repository at this point in the history
  • Loading branch information
Deshayes Yann committed Jul 28, 2015
1 parent 88d1b47 commit a3c8445
Show file tree
Hide file tree
Showing 8 changed files with 223 additions and 124 deletions.
113 changes: 73 additions & 40 deletions dist/3.2.0/js/ultimate-datatable-3.2.0-no-template.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2491,7 +2491,7 @@ directive("udtCell", function(){

scope.udtTableFunctions.getConvertDirective = function(col, header){
if(col.convertValue != undefined && col.convertValue.active == true && col.convertValue.saveMeasureValue != col.convertValue.displayMeasureValue){
return 'udtConvertvalue="col.convertValue"';
return 'udt-convertvalue="col.convertValue"';
}
return "";
}
Expand Down Expand Up @@ -2692,40 +2692,61 @@ directive('udtCompile', function($compile) {
});;angular.module('ultimateDataTableServices').
//This directive convert the ngModel value to a view value and then the view value to the ngModel unit value
//The value passed to the directive must be an object with displayMeasureValue and saveMeasureValue
directive('udtConvertvalue',['udtConvertValueServices', function(udtConvertValueServices) {
directive('udtConvertvalue',['udtConvertValueServices','$filter', function(udtConvertValueServices, $filter) {
return {
require: 'ngModel',
link: function(scope, ele, attr, ngModel) {
//init service
var convertValues = udtConvertValueServices();
var property = undefined;

scope.$watch(attr.udtConvertvalue, function(value){
if(value.saveMeasureValue != undefined && value.displayMeasureValue != undefined){
property = value;
}
});

//model to view
scope.$watch(
function(){
return ngModel.$modelValue;
}, function(newValue, oldValue){
if(property != undefined){
ngModel.$setViewValue(convertValues.convertValue(newValue, property.saveMeasureValue, property.displayMeasureValue));
require: 'ngModel',
link: function(scope, element, attr, ngModel) {
//init service
var convertValues = udtConvertValueServices();
var property = undefined;

var watchModelValue = function(){
return scope.$watch(
function(){
return ngModel.$modelValue;
}, function(newValue, oldValue){
if(property != undefined){
var convertedValue = convertValues.convertValue(newValue, property.saveMeasureValue, property.displayMeasureValue);
ngModel.$setViewValue($filter('number')(convertedValue));
ngModel.$render();
}
});
};

scope.$watch(attr.udtConvertvalue, function(value){
if(value.saveMeasureValue != undefined && value.displayMeasureValue != undefined){
property = value;
}
});

//model to view when the user go out of the input
element.bind('blur', function () {
var convertedValue = convertValues.convertValue(ngModel.$modelValue, property.saveMeasureValue, property.displayMeasureValue, ngModel.$viewValue.length);
ngModel.$setViewValue($filter('number')(convertedValue));
ngModel.$render();
}
});

//view to model
ngModel.$parsers.push(function(value) {
if(property != undefined){
value = convertValues.convertValue(value, property.displayMeasureValue, property.saveMeasureValue);
}
return value;
});
}
};
//We restart the watcher when the user is out of the inputs
scope.currentWatcher = watchModelValue();
});

//when the user go into the input
element.bind('focus', function () {
//We need to disable the watcher when the user is typing
scope.currentWatcher();
});

//model to view whatcher
scope.currentWatcher = watchModelValue();

//view to model
ngModel.$parsers.push(function(value) {
value = convertValues.parse(value);
if(property != undefined){
value = convertValues.convertValue(value, property.displayMeasureValue, property.saveMeasureValue);
}
return value;
});
}
};
}]);;angular.module('ultimateDataTableServices').
//Convert the date in format(view) to a timestamp date(model)
directive('udtDateTimestamp', function() {
Expand Down Expand Up @@ -2834,7 +2855,7 @@ directive('udtForm', function(){

scope.$watch('keywords', function(newValue, oldValue) {
if (!newValue || newValue == '' || !scope.active) {
if(scope.udtHighlight !== undefined)
if(scope.udtHighlight !== undefined && scope.udtHighlight !== null)
element.html(scope.udtHighlight.toString());
return false;
}
Expand Down Expand Up @@ -3019,7 +3040,9 @@ directive('ultimateDatatable', ['$parse', '$q', '$timeout','$templateCache', fun
scope.udtTableFunctions.cancel = function(){
scope.udtTable.setSpinner(true);
$timeout(function(){scope.udtTable.cancel()}).then(function(){
scope.udtTable.setSpinner(false);
scope.udtTable.computeDisplayResultTimeOut.then(function(){
scope.udtTable.setSpinner(false);
});
});


Expand All @@ -3029,7 +3052,9 @@ directive('ultimateDatatable', ['$parse', '$q', '$timeout','$templateCache', fun
scope.udtTable.setSpinner(true);
$timeout(function(){scope.udtTable.setNumberRecordsPerPage(elt)}).then(function(){
if(!scope.udtTable.isRemoteMode(scope.udtTable.config.pagination.mode)){
scope.udtTable.setSpinner(false);
scope.udtTable.computeDisplayResultTimeOut.then(function(){
scope.udtTable.setSpinner(false);
});
}
});

Expand All @@ -3040,7 +3065,9 @@ directive('ultimateDatatable', ['$parse', '$q', '$timeout','$templateCache', fun
scope.udtTable.setSpinner(true);
$timeout(function(){scope.udtTable.setPageNumber(page)}).then(function(){
if(!scope.udtTable.isRemoteMode(scope.udtTable.config.pagination.mode)){
scope.udtTable.setSpinner(false);
scope.udtTable.computeDisplayResultTimeOut.then(function(){
scope.udtTable.setSpinner(false);
});
}
});
};
Expand All @@ -3056,7 +3083,9 @@ directive('ultimateDatatable', ['$parse', '$q', '$timeout','$templateCache', fun
scope.udtTable.setSpinner(true);
$timeout(function(){scope.udtTable.setOrderColumn(column)}).then(function(){
if(!scope.udtTable.isRemoteMode(scope.udtTable.config.order.mode)){
scope.udtTable.setSpinner(false);
scope.udtTable.computeDisplayResultTimeOut.then(function(){
scope.udtTable.setSpinner(false);
});
}
});

Expand All @@ -3072,7 +3101,9 @@ directive('ultimateDatatable', ['$parse', '$q', '$timeout','$templateCache', fun
scope.udtTableFunctions.setGroupColumn = function(column){
scope.udtTable.setSpinner(true);
$timeout(function(){scope.udtTable.setGroupColumn(column)}).then(function(){
scope.udtTable.setSpinner(false);
scope.udtTable.computeDisplayResultTimeOut.then(function(){
scope.udtTable.setSpinner(false);
});
});
};

Expand All @@ -3087,7 +3118,9 @@ directive('ultimateDatatable', ['$parse', '$q', '$timeout','$templateCache', fun
scope.udtTableFunctions.updateShowOnlyGroups = function(){
scope.udtTable.setSpinner(true);
$timeout(function(){scope.udtTable.updateShowOnlyGroups()}).then(function(){
scope.udtTable.setSpinner(false);
scope.udtTable.computeDisplayResultTimeOut.then(function(){
scope.udtTable.setSpinner(false);
});
});
};

Expand Down
4 changes: 2 additions & 2 deletions dist/3.2.0/js/ultimate-datatable-3.2.0-no-template.min.js
View file

Large diffs are not rendered by default.

113 changes: 73 additions & 40 deletions dist/3.2.0/js/ultimate-datatable-3.2.0.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2491,7 +2491,7 @@ directive("udtCell", function(){

scope.udtTableFunctions.getConvertDirective = function(col, header){
if(col.convertValue != undefined && col.convertValue.active == true && col.convertValue.saveMeasureValue != col.convertValue.displayMeasureValue){
return 'udtConvertvalue="col.convertValue"';
return 'udt-convertvalue="col.convertValue"';
}
return "";
}
Expand Down Expand Up @@ -2692,40 +2692,61 @@ directive('udtCompile', function($compile) {
});;angular.module('ultimateDataTableServices').
//This directive convert the ngModel value to a view value and then the view value to the ngModel unit value
//The value passed to the directive must be an object with displayMeasureValue and saveMeasureValue
directive('udtConvertvalue',['udtConvertValueServices', function(udtConvertValueServices) {
directive('udtConvertvalue',['udtConvertValueServices','$filter', function(udtConvertValueServices, $filter) {
return {
require: 'ngModel',
link: function(scope, ele, attr, ngModel) {
//init service
var convertValues = udtConvertValueServices();
var property = undefined;

scope.$watch(attr.udtConvertvalue, function(value){
if(value.saveMeasureValue != undefined && value.displayMeasureValue != undefined){
property = value;
}
});

//model to view
scope.$watch(
function(){
return ngModel.$modelValue;
}, function(newValue, oldValue){
if(property != undefined){
ngModel.$setViewValue(convertValues.convertValue(newValue, property.saveMeasureValue, property.displayMeasureValue));
require: 'ngModel',
link: function(scope, element, attr, ngModel) {
//init service
var convertValues = udtConvertValueServices();
var property = undefined;

var watchModelValue = function(){
return scope.$watch(
function(){
return ngModel.$modelValue;
}, function(newValue, oldValue){
if(property != undefined){
var convertedValue = convertValues.convertValue(newValue, property.saveMeasureValue, property.displayMeasureValue);
ngModel.$setViewValue($filter('number')(convertedValue));
ngModel.$render();
}
});
};

scope.$watch(attr.udtConvertvalue, function(value){
if(value.saveMeasureValue != undefined && value.displayMeasureValue != undefined){
property = value;
}
});

//model to view when the user go out of the input
element.bind('blur', function () {
var convertedValue = convertValues.convertValue(ngModel.$modelValue, property.saveMeasureValue, property.displayMeasureValue, ngModel.$viewValue.length);
ngModel.$setViewValue($filter('number')(convertedValue));
ngModel.$render();
}
});

//view to model
ngModel.$parsers.push(function(value) {
if(property != undefined){
value = convertValues.convertValue(value, property.displayMeasureValue, property.saveMeasureValue);
}
return value;
});
}
};
//We restart the watcher when the user is out of the inputs
scope.currentWatcher = watchModelValue();
});

//when the user go into the input
element.bind('focus', function () {
//We need to disable the watcher when the user is typing
scope.currentWatcher();
});

//model to view whatcher
scope.currentWatcher = watchModelValue();

//view to model
ngModel.$parsers.push(function(value) {
value = convertValues.parse(value);
if(property != undefined){
value = convertValues.convertValue(value, property.displayMeasureValue, property.saveMeasureValue);
}
return value;
});
}
};
}]);;angular.module('ultimateDataTableServices').
//Convert the date in format(view) to a timestamp date(model)
directive('udtDateTimestamp', function() {
Expand Down Expand Up @@ -2834,7 +2855,7 @@ directive('udtForm', function(){

scope.$watch('keywords', function(newValue, oldValue) {
if (!newValue || newValue == '' || !scope.active) {
if(scope.udtHighlight !== undefined)
if(scope.udtHighlight !== undefined && scope.udtHighlight !== null)
element.html(scope.udtHighlight.toString());
return false;
}
Expand Down Expand Up @@ -3019,7 +3040,9 @@ directive('ultimateDatatable', ['$parse', '$q', '$timeout','$templateCache', fun
scope.udtTableFunctions.cancel = function(){
scope.udtTable.setSpinner(true);
$timeout(function(){scope.udtTable.cancel()}).then(function(){
scope.udtTable.setSpinner(false);
scope.udtTable.computeDisplayResultTimeOut.then(function(){
scope.udtTable.setSpinner(false);
});
});


Expand All @@ -3029,7 +3052,9 @@ directive('ultimateDatatable', ['$parse', '$q', '$timeout','$templateCache', fun
scope.udtTable.setSpinner(true);
$timeout(function(){scope.udtTable.setNumberRecordsPerPage(elt)}).then(function(){
if(!scope.udtTable.isRemoteMode(scope.udtTable.config.pagination.mode)){
scope.udtTable.setSpinner(false);
scope.udtTable.computeDisplayResultTimeOut.then(function(){
scope.udtTable.setSpinner(false);
});
}
});

Expand All @@ -3040,7 +3065,9 @@ directive('ultimateDatatable', ['$parse', '$q', '$timeout','$templateCache', fun
scope.udtTable.setSpinner(true);
$timeout(function(){scope.udtTable.setPageNumber(page)}).then(function(){
if(!scope.udtTable.isRemoteMode(scope.udtTable.config.pagination.mode)){
scope.udtTable.setSpinner(false);
scope.udtTable.computeDisplayResultTimeOut.then(function(){
scope.udtTable.setSpinner(false);
});
}
});
};
Expand All @@ -3056,7 +3083,9 @@ directive('ultimateDatatable', ['$parse', '$q', '$timeout','$templateCache', fun
scope.udtTable.setSpinner(true);
$timeout(function(){scope.udtTable.setOrderColumn(column)}).then(function(){
if(!scope.udtTable.isRemoteMode(scope.udtTable.config.order.mode)){
scope.udtTable.setSpinner(false);
scope.udtTable.computeDisplayResultTimeOut.then(function(){
scope.udtTable.setSpinner(false);
});
}
});

Expand All @@ -3072,7 +3101,9 @@ directive('ultimateDatatable', ['$parse', '$q', '$timeout','$templateCache', fun
scope.udtTableFunctions.setGroupColumn = function(column){
scope.udtTable.setSpinner(true);
$timeout(function(){scope.udtTable.setGroupColumn(column)}).then(function(){
scope.udtTable.setSpinner(false);
scope.udtTable.computeDisplayResultTimeOut.then(function(){
scope.udtTable.setSpinner(false);
});
});
};

Expand All @@ -3087,7 +3118,9 @@ directive('ultimateDatatable', ['$parse', '$q', '$timeout','$templateCache', fun
scope.udtTableFunctions.updateShowOnlyGroups = function(){
scope.udtTable.setSpinner(true);
$timeout(function(){scope.udtTable.updateShowOnlyGroups()}).then(function(){
scope.udtTable.setSpinner(false);
scope.udtTable.computeDisplayResultTimeOut.then(function(){
scope.udtTable.setSpinner(false);
});
});
};

Expand Down
4 changes: 2 additions & 2 deletions dist/3.2.0/js/ultimate-datatable-3.2.0.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/directives/udt-cell.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ directive("udtCell", function(){

scope.udtTableFunctions.getConvertDirective = function(col, header){
if(col.convertValue != undefined && col.convertValue.active == true && col.convertValue.saveMeasureValue != col.convertValue.displayMeasureValue){
return 'udtConvertvalue="col.convertValue"';
return 'udt-convertvalue="col.convertValue"';
}
return "";
}
Expand Down
Loading

0 comments on commit a3c8445

Please sign in to comment.