summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-08-08 03:21:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:31:31 -0500
commit2dcd55f31fa0d4db4dbe3454a0b452f370f6d0c5 (patch)
treeedc59839f7ccd972f7350220d8f3493778bd1262
parent2b31c6d9d0d853d6be0a7e4f42977029389fc5ce (diff)
downloadsamba-2dcd55f31fa0d4db4dbe3454a0b452f370f6d0c5.tar.gz
samba-2dcd55f31fa0d4db4dbe3454a0b452f370f6d0c5.tar.bz2
samba-2dcd55f31fa0d4db4dbe3454a0b452f370f6d0c5.zip
r9211: don't try to encode functions in the AJAJ object encoder
(This used to be commit a08104a13c722b3888aecd365e32aae63ea481e5)
-rw-r--r--swat/scripting/client/encoder.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/swat/scripting/client/encoder.js b/swat/scripting/client/encoder.js
index 20eec9e2c3..2b1db669d2 100644
--- a/swat/scripting/client/encoder.js
+++ b/swat/scripting/client/encoder.js
@@ -37,7 +37,7 @@ function encodeObject(o) {
r = r + "" + i + ":" + t + ":" + o[i] + ":";
} else if (t == 'undefined' || t == 'null') {
r = r + "" + i + ":" + t + ":";
- } else {
+ } else if (t != 'function') {
alert("Unable to encode type " + t);
}
}