Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: tonytomov/jqGrid
base: 0f352c3296
...
head fork: tonytomov/jqGrid
compare: f9a93ae367
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 2 contributors
Commits on Mar 21, 2012
@OlegKi OlegKi Add this in calls of unformatter and formatter
Signed-off-by: Dr. Oleg Kiriljuk <oleg.kiriljuk@ok-soft-gmbh.com>
c477260
@tonytomov Merge pull request #273 from OlegKi/master
Add this in calls of $.unformat and $.unformat.date
f9a93ae
Showing with 5 additions and 5 deletions.
  1. +2 −2 js/grid.base.js
  2. +3 −3 js/grid.celledit.js
View
4 js/grid.base.js
@@ -2796,7 +2796,7 @@ $.jgrid.extend({
$(this.p.colModel).each(function(i){
nm = this.name;
if( data[nm] !== undefined) {
- lcdata[nm] = this.formatter && typeof(this.formatter) === 'string' && this.formatter == 'date' ? $.unformat.date(data[nm],this) : data[nm];
+ lcdata[nm] = this.formatter && typeof(this.formatter) === 'string' && this.formatter == 'date' ? $.unformat.date.call(t,data[nm],this) : data[nm];
vl = t.formatter( rowid, data[nm], i, data, 'edit');
title = this.title ? {"title":$.jgrid.stripHtml(vl)} : {};
if(t.p.treeGrid===true && nm == t.p.ExpandColumn) {
@@ -3303,7 +3303,7 @@ $.jgrid.extend({
while(i<ln){
if($($t.rows[i]).hasClass('jqgrow')) {
try {
- val = $.unformat($($t.rows[i].cells[pos]),{rowId:$t.rows[i].id, colModel:$t.p.colModel[pos]},pos);
+ val = $.unformat.call($t,$($t.rows[i].cells[pos]),{rowId:$t.rows[i].id, colModel:$t.p.colModel[pos]},pos);
} catch (e) {
val = $.jgrid.htmlDecode($t.rows[i].cells[pos].innerHTML);
}
View
6 js/grid.celledit.js
@@ -62,7 +62,7 @@ $.jgrid.extend({
$(cc).addClass("edit-cell ui-state-highlight");
$($t.rows[iRow]).addClass("selected-row ui-state-hover");
try {
- tmp = $.unformat(cc,{rowId: $t.rows[iRow].id, colModel:cm},iCol);
+ tmp = $.unformat.call($t,cc,{rowId: $t.rows[iRow].id, colModel:cm},iCol);
} catch (_) {
tmp = ( cm.edittype && cm.edittype == 'textarea' ) ? $(cc).text() : $(cc).html();
}
@@ -467,14 +467,14 @@ $.jgrid.extend({
if (mthd=='dirty') {
if ($(this).hasClass('dirty-cell')) {
try {
- res[nm] = $.unformat(this,{rowId:$t.rows[j].id, colModel:$t.p.colModel[i]},i);
+ res[nm] = $.unformat.call($t,this,{rowId:$t.rows[j].id, colModel:$t.p.colModel[i]},i);
} catch (e){
res[nm] = $.jgrid.htmlDecode($(this).html());
}
}
} else {
try {
- res[nm] = $.unformat(this,{rowId:$t.rows[j].id,colModel:$t.p.colModel[i]},i);
+ res[nm] = $.unformat.call($t,this,{rowId:$t.rows[j].id,colModel:$t.p.colModel[i]},i);
} catch (e) {
res[nm] = $.jgrid.htmlDecode($(this).html());
}

No commit comments for this range

Something went wrong with that request. Please try again.