jqgrid_utils 1.5.2 → 1.5.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -117,17 +117,24 @@ console.log(_data);
117
117
  {
118
118
  col_model[i]['formatter'] = function (cell_value, o)
119
119
  {
120
- cell_value = cell_value.toString();
121
- let value = cell_value;
122
- if(cell_value.length >= 8 && cell_value.indexOf(seperator) === -1)
120
+ if(cell_value)
123
121
  {
124
- let a = [];
125
- a.push(cell_value.substr(6, 2));
126
- a.push(cell_value.substr(4, 2));
127
- a.push(cell_value.substr(0, 4));
128
- value = a.join(seperator);
129
- }
130
- return value;
122
+ cell_value = cell_value.toString();
123
+ let value = cell_value;
124
+ if(cell_value.length >= 8 && cell_value.indexOf(seperator) === -1)
125
+ {
126
+ let a = [];
127
+ a.push(cell_value.substr(6, 2));
128
+ a.push(cell_value.substr(4, 2));
129
+ a.push(cell_value.substr(0, 4));
130
+ value = a.join(seperator);
131
+ }
132
+ return value;
133
+ }
134
+ else
135
+ {
136
+ return cell_value;
137
+ }
131
138
  };
132
139
  }
133
140
  }
@@ -728,15 +735,26 @@ async add_link_details(col_model, url, edit_field, attr = '', keys, format)
728
735
  {
729
736
  pref = pref.slice(0, -1);
730
737
  }
731
-
732
- const _cell_val = self.__cell_format(cell_val, format);
733
-
734
- cell_val = '<a ' + attr + 'href="' + url + pref + '"> ' + _cell_val + '</a>';
738
+ const _cell_val = self.__cell_format(cell_val, format);
739
+ if(cell_val)
740
+ {
741
+ cell_val = '<a ' + attr + 'href="' + url + pref + '"> ' + _cell_val + '</a>';
742
+ }
743
+ else
744
+ {
745
+ cell_val = '';
746
+ }
735
747
  }
736
748
 
737
749
  }
738
-
739
- return cell_val;
750
+ if(cell_val)
751
+ {
752
+ return cell_val;
753
+ }
754
+ else
755
+ {
756
+ return '';
757
+ }
740
758
  };
741
759
  }
742
760
 
package/jqgrid_utils.js CHANGED
@@ -116,17 +116,24 @@ console.log(_data);
116
116
  {
117
117
  col_model[i]['formatter'] = function (cell_value, o)
118
118
  {
119
- cell_value = cell_value.toString();
120
- let value = cell_value;
121
- if(cell_value.length >= 8 && cell_value.indexOf(seperator) === -1)
119
+ if(cell_value)
122
120
  {
123
- let a = [];
124
- a.push(cell_value.substr(6, 2));
125
- a.push(cell_value.substr(4, 2));
126
- a.push(cell_value.substr(0, 4));
127
- value = a.join(seperator);
128
- }
129
- return value;
121
+ cell_value = cell_value.toString();
122
+ let value = cell_value;
123
+ if(cell_value.length >= 8 && cell_value.indexOf(seperator) === -1)
124
+ {
125
+ let a = [];
126
+ a.push(cell_value.substr(6, 2));
127
+ a.push(cell_value.substr(4, 2));
128
+ a.push(cell_value.substr(0, 4));
129
+ value = a.join(seperator);
130
+ }
131
+ return value;
132
+ }
133
+ else
134
+ {
135
+ return cell_value;
136
+ }
130
137
  };
131
138
  }
132
139
  }
@@ -727,15 +734,26 @@ async add_link_details(col_model, url, edit_field, attr = '', keys, format)
727
734
  {
728
735
  pref = pref.slice(0, -1);
729
736
  }
730
-
731
- const _cell_val = self.__cell_format(cell_val, format);
732
-
733
- cell_val = '<a ' + attr + 'href="' + url + pref + '"> ' + _cell_val + '</a>';
737
+ const _cell_val = self.__cell_format(cell_val, format);
738
+ if(cell_val)
739
+ {
740
+ cell_val = '<a ' + attr + 'href="' + url + pref + '"> ' + _cell_val + '</a>';
741
+ }
742
+ else
743
+ {
744
+ cell_val = '';
745
+ }
734
746
  }
735
747
 
736
748
  }
737
-
738
- return cell_val;
749
+ if(cell_val)
750
+ {
751
+ return cell_val;
752
+ }
753
+ else
754
+ {
755
+ return '';
756
+ }
739
757
  };
740
758
  }
741
759
 
package/package.json CHANGED
@@ -29,5 +29,5 @@
29
29
  {
30
30
  "test": "echo \"Error: no test specified\" && exit 1"
31
31
  },
32
- "version": "1.5.2"
32
+ "version": "1.5.5"
33
33
  }