From 3e3dff31a83ba44a44fd6a741fd5d22fd98cab00 Mon Sep 17 00:00:00 2001
From: abijah <abijah@97e9348a-65ac-dc4b-aefc-98561f571b83>
Date: Mon, 7 Sep 2009 17:04:34 +0000
Subject: [PATCH] I believe the bug Shirley has been seeing is finally fixed. 
 The problem is that an extra comma at the end of a javascript object literal
 blows up in IE7.  FF and IE8 both handle it fine, which is why we hadn't
 noticed.  Hopefully, this change includes all areas which had the extra
 comma.

git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@842 97e9348a-65ac-dc4b-aefc-98561f571b83
---
 site/views/customers/receipt.ctp |  6 +--
 site/views/elements/sidemenu.ctp |  4 +-
 site/views/leases/invoice.ctp    | 78 ++++----------------------------
 3 files changed, 14 insertions(+), 74 deletions(-)

diff --git a/site/views/customers/receipt.ctp b/site/views/customers/receipt.ctp
index 0d8c8f9..6e6f41e 100644
--- a/site/views/customers/receipt.ctp
+++ b/site/views/customers/receipt.ctp
@@ -25,12 +25,12 @@ Configure::write('debug', '0');
       beforeSubmit:  verifyRequest,  // pre-submit callback 
       success:       showResponse,  // post-submit callback 
  
-      url: "<?php echo $html->url(array('controller' => 'transactions',
-					'action' => 'postReceipt', 0)); ?>",
- 
       // other available options: 
       //clearForm: true,        // clear all form fields after successful submit 
       //resetForm: true,        // reset the form after successful submit 
+
+      url: "<?php echo $html->url(array('controller' => 'transactions',
+					'action' => 'postReceipt', 0)); ?>"
       }; 
 
     // bind form using 'ajaxForm' 
diff --git a/site/views/elements/sidemenu.ctp b/site/views/elements/sidemenu.ctp
index 093d251..806844d 100644
--- a/site/views/elements/sidemenu.ctp
+++ b/site/views/elements/sidemenu.ctp
@@ -74,9 +74,9 @@ jQuery(document).ready(function(){
       jQuery("#sidemenu").accordion
 	({  fillSpace : true,
 	    event : "click hoverintent",
-	    animated : "bounceslide",
+	    animated : "bounceslide"
 JSCB
-. (isset($active_section) ? "\tactive : $active_section,\n" : '') .
+. (isset($active_section) ? ",\n\t    active : $active_section\n" : '') .
 <<<JSCB
 	});
     }
diff --git a/site/views/leases/invoice.ctp b/site/views/leases/invoice.ctp
index 504879a..ed3b6e7 100644
--- a/site/views/leases/invoice.ctp
+++ b/site/views/leases/invoice.ctp
@@ -24,36 +24,27 @@ Configure::write('debug', '0');
 ?>
 
 <script type="text/javascript"><!--
-  var debugmsg = new Array();
 
   // prepare the form when the DOM is ready 
   $(document).ready(function() { 
-      debugmsg.push('doc ready1');
-
-      var options = { 
+    var options = { 
       target:        '#output-debug',   // target element(s) to be updated with server response 
       beforeSubmit:  verifyRequest,  // pre-submit callback 
       success:       showResponse,  // post-submit callback 
 
-      url: "<?php echo $html->url(array('controller' => 'transactions',
-					'action' => 'postInvoice', 0)); ?>",
- 
       // other available options: 
       //clearForm: true,        // clear all form fields after successful submit 
       //resetForm: true,        // reset the form after successful submit 
+
+      url: "<?php echo $html->url(array('controller' => 'transactions',
+					'action' => 'postInvoice', 0)); ?>"
       };
 
-      // bind form using 'ajaxForm' 
-      if ($('#invoice-form').ajaxForm != null) {
-	debugmsg.push('bind ajaxForm');
-	$('#invoice-form').ajaxForm(options); 
-	debugmsg.push('ajaxForm bound');
-      }
-      else {
-	debugmsg.push('remove repeat label');
-	$('#repeat, label[for=repeat]').remove();
-      }
-
+    // bind form using 'ajaxForm' 
+    if ($('#invoice-form').ajaxForm != null)
+      $('#invoice-form').ajaxForm(options); 
+    else
+      $('#repeat, label[for=repeat]').remove();
     });
  
 // pre-submit callback 
@@ -131,13 +122,11 @@ function showResponse(responseText, statusText)  {
 
 // Reset the form
 function resetForm(nocharge) {
-  debugmsg.push('reset form: ' + nocharge);
   $('#charge-entry-id').val(1);
   $('#charges').html('');
 
   if (!nocharge)
     addChargeSource(false);
-  debugmsg.push('reset form done');
 }
 
 
@@ -163,7 +152,6 @@ function onRowSelect(grid_id, lease_id) {
 }
 
 function onGridState(grid_id, state) {
-  debugmsg.push('on grid state: ' + grid_id + '; ' + state + '; lid=' + $("#lease-id").val());
   if (state == 'visible') {
     $(".lease-selection-invalid").hide();
     $(".lease-selection-valid").hide();
@@ -177,12 +165,10 @@ function onGridState(grid_id, state) {
       $(".lease-selection-invalid").show();
     }
   }
-  debugmsg.push('on grid state done');
 }
 
 function addChargeSource(flash) {
   var id = $("#charge-entry-id").val();
-  debugmsg.push('add charge source: flash=' + flash + '; id=' + id);
   addDiv('charge-entry-id', 'charge', 'charges', flash,
 	 // HTML section
 	 '<FIELDSET CLASS="charge subset">' +
@@ -218,14 +204,10 @@ function addChargeSource(flash) {
 
 	 '</FIELDSET>'
 	 );
-  debugmsg.push('add div complete: id=' + id);
 
-  debugmsg.push('add datepicker1: id=' + id);
   datepicker("Entry"+id+"EffectiveDate");
-  debugmsg.push('add datepicker2: id=' + id);
   datepicker("Entry"+id+"ThroughDate");
 
-  debugmsg.push('add charge source complete: id=' + id);
   return id;
   }
 
@@ -295,11 +277,6 @@ if (!empty($movein))
 			  'type' => 'hidden',
 			  'value' => $customer['id']));
 
-echo $form->input("Message.text",
-		  array('id' => 'message-text',
-			'type' => 'hidden',
-			'value' => 'not set'));
-
 /* echo '<fieldset CLASS="invoice">' . "\n"; */
 /* echo ' <legend>Invoice</legend>' . "\n"; */
 
@@ -348,40 +325,13 @@ Configure::write('debug', '0');
 ?>
 
 <script type="text/javascript"><!--
-  $('#message-text').val('javascript working');
-
-  if (typeof(jQuery) != 'undefined')
-    debugmsg.push('jQuery loaded');
-  else
-    debugmsg.push('jQuery NOT loaded');
-
-  if ($().accordion)
-    debugmsg.push('accordion loaded');
-  else
-    debugmsg.push('accordion NOT loaded');
-
-  if ($().ajaxForm)
-    debugmsg.push('ajaxForm loaded');
-  else
-    debugmsg.push('ajaxForm NOT loaded');
-
-  var eatt = debugmsg;
-  eatt.push('early attempt');
-  $('#message-text').val(eatt.join("\n                              "));
-
   $.fn.removeCol = function(col){
     if(!col){ col = 1; }
     $('tr td:nth-child('+col+'), tr th:nth-child('+col+')', this).remove();
   };
 
-  eatt.push('early attempt2');
-  $('#message-text').val(eatt.join("\n                              "));
-
   $(document).ready(function(){
-      debugmsg.push('doc ready2');
-      debugmsg.push('make transaction-stamp datepicker');
       datepicker('TransactionStamp');
-      debugmsg.push('datepicker OK');
 
       $("#lease-id").val(0);
       $("#invoice-lease").html("INTERNAL ERROR");
@@ -393,14 +343,11 @@ Configure::write('debug', '0');
 
       <?php if (empty($movein)): ?>
 
-      debugmsg.push('movein empty');
       resetForm();
-      debugmsg.push('transaction-stamp now');
       datepickerNow('TransactionStamp');
 
       <?php else: ?>
 
-      debugmsg.push('movein not empty');
       var id;
       resetForm(true);
 
@@ -482,13 +429,6 @@ Configure::write('debug', '0');
       $('#output-debug').show();
       <?php endif; ?>
 
-      $.post("<?php echo $html->url(array('controller' => 'util',
-					  'action' => 'logmsg')); ?>",
-	     { 'messages[]' : debugmsg }
-	     );
-
-      //$('#debug').html(debugmsg.join('<BR>'));
-      $('#message-text').val(debugmsg.join("\n                              "));
   });
 --></script>