diff options
| author | michael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2010-08-24 14:40:22 +0000 |
|---|---|---|
| committer | michael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2010-08-24 14:40:22 +0000 |
| commit | 2d9e48b8f5b80ab6c4840b4130253f4ff0010506 (patch) | |
| tree | c7a7caea6f6cfece7172e28151f15f452d471abd /packages/fcl-web/src/webdata/extjsjson.pp | |
| parent | 8f32f94fa60551553b996a14be40fc69a6516420 (diff) | |
| download | fpc-2d9e48b8f5b80ab6c4840b4130253f4ff0010506.tar.gz | |
* Fixed (BLOB) display, added support for transcoding
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15893 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/fcl-web/src/webdata/extjsjson.pp')
| -rw-r--r-- | packages/fcl-web/src/webdata/extjsjson.pp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/packages/fcl-web/src/webdata/extjsjson.pp b/packages/fcl-web/src/webdata/extjsjson.pp index 22daedb7c3..d93379bfc4 100644 --- a/packages/fcl-web/src/webdata/extjsjson.pp +++ b/packages/fcl-web/src/webdata/extjsjson.pp @@ -106,6 +106,10 @@ end; function TExtJSJSONDataFormatter.AddFieldToJSON(O : TJSONObject; AFieldName : String; F : TField): TJSONData; +Var + S : String; + + begin if F.IsNull then Result:=O.Items[O.Add(AFieldName)] @@ -129,9 +133,18 @@ begin ftMemo, ftFmtMemo, ftWideMemo, - ftBlob :O.Items[O.Add(AFieldName,F.AsString)]; + ftBlob : + begin + S:=F.AsString; + If (OnTranscode<>Nil) then + OnTranscode(Self,F,S,True); + Result:=O.Items[O.Add(AFieldName,S)]; + end; else - Result:=O.Items[O.Add(AFieldName,F.DisplayText)]; + S:=F.DisplayText; + If (OnTranscode<>Nil) then + OnTranscode(Self,F,S,True); + Result:=O.Items[O.Add(AFieldName,S)]; end; end; |