[asterisk-commits] seanbright: branch 1.6.0 r192526 - in /branches/1.6.0: ./ static-http/astman.js

[SVN commits to the Asterisk project]

Author: seanbright
Date: Tue May  5 15:02:10 2009
New Revision: 192526

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=192526
Log:
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
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/static-http/astman.js

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/static-http/astman.js
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/static-http/astman.js?view=diff&rev=192526&r1=192525&r2=192526
==============================================================================
--- branches/1.6.0/static-http/astman.js (original)
+++ branches/1.6.0/static-http/astman.js Tue May  5 15:02:10 2009
@@ -238,7 +238,7 @@
 			onSuccess: this.managerResponse,
 			onFailure: function(t) {
 				alert("Error: " + t.status + ": " + t.statusText);
-			},
+			}
 		};
 		me.callback = callback;
 		opt.parameters = request;
@@ -252,7 +252,7 @@
 			onSuccess: this.eventResponse,
 			onFailure: function(t) {
 				alert("Event Error: " + t.status + ": " + t.statusText);
-			},
+			}
 		};
 		opt.parameters="action=waitevent";
 		tmp = new Ajax.Request(this.url, opt);