From: Sean Bright <sean@malleable.com>
Date: Tue, 5 May 2009 20:02:12 +0000 (+0000)
Subject: Merged revisions 192525 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13f8b475c07baccf5cf9b1a4fbf5dd97dbc9459d;p=thirdparty%2Fasterisk.git

Merged revisions 192525 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r192525 | seanbright | 2009-05-05 15:57:49 -0400 (Tue, 05 May 2009) | 18 lines

  Merged revisions 192524 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r192524 | seanbright | 2009-05-05 15:56:11 -0400 (Tue, 05 May 2009) | 11 lines

    Fix Javascript error when using astman.js in Internet Explorer.

    Internet Explorer (tested with 7.0) does not like trailing commas on constructs
    like object initializers, so get rid of them to avoid some errors.

    (closes issue #15026)
    Reported by: rajnishgiri
    Patches:
          bug15026.patch uploaded by seanbright (license 71)
    Tested by: seanbright
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@192527 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/static-http/astman.js b/static-http/astman.js
index 81f896c1c7..e00a2e0554 100644
--- a/static-http/astman.js
+++ b/static-http/astman.js
@@ -238,7 +238,7 @@ function Astman() {
 			onSuccess: this.managerResponse,
 			onFailure: function(t) {
 				alert("Error: " + t.status + ": " + t.statusText);
-			},
+			}
 		};
 		me.callback = callback;
 		opt.parameters = request;
@@ -252,7 +252,7 @@ function Astman() {
 			onSuccess: this.eventResponse,
 			onFailure: function(t) {
 				alert("Event Error: " + t.status + ": " + t.statusText);
-			},
+			}
 		};
 		opt.parameters="action=waitevent";
 		tmp = new Ajax.Request(this.url, opt);