Bug 5741 - Extra comma causes JavaScript error in Internet Explorer

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/-- b/--
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
index 5d05b94..df1acbf 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
@@ -14,7 +14,7 @@
                                 ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                                 button : "newduedate_button",
                                 disableFunc : validate1,
-                                dateStatusFunc : validate1,
+                                dateStatusFunc : validate1
                               }
                            );
                        //]]>
@@ -22,4 +22,4 @@
                        <p><label>Forgive fines on return: <input type="checkbox" name="exemptfine" value="1" /></label></p>
                </td>
        </tr>
-</tfoot>
\ No newline at end of file
+</tfoot>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
index 523fd13..ff336a9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
@@ -170,7 +170,7 @@
         inputField     :    "budget_period_enddate",
         ifFormat         :    "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
         button         :    "openCalendarTo",
-        align          :    "Tl",
+        align          :    "Tl"
         });
     </script>
                                <div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
index adcafbc..0187cf9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
@@ -114,7 +114,7 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
         inputField     :    "dateto",
       ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
         button         :    "openCalendarTo",
-        align          :    "Tl",
+        align          :    "Tl"
     });
 </script>
 <div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index 2004a7d..58a5ad9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -307,7 +307,7 @@ function checkMultiHold() {
                                ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                                button : "CalendarReserveDate",
                                disableFunc : validate1,
-                               dateStatusFunc : validate1,
+                               dateStatusFunc : validate1
                        }
                );
                //]]>
@@ -338,7 +338,7 @@ function checkMultiHold() {
                                ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                                button : "CalendarExpirationDate",
                                disableFunc : validate1,
-                               dateStatusFunc : validate1,
+                               dateStatusFunc : validate1
                        }
                );
                //]]>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
index f87aef1..a2f78ab 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
@@ -60,7 +60,7 @@
                  {
                                        button : "openCalendar",
                      inputField : "date",
-                     ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                     ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->"
                  }
                 );
             </script> <span class="required">Required</span>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
index 3259497..331ec2c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
@@ -64,7 +64,7 @@
                 Calendar.setup(
                  {
                      inputField : "date1",
-                     ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                     ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->"
                  }
                 );
             </script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span></p>
@@ -76,7 +76,7 @@
                 Calendar.setup(
                  {
                      inputField : "date2",
-                     ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                     ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->"
                  }
                 );
             </script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span></p>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
index 342e51b..9ce264c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
@@ -74,7 +74,7 @@ Edit News Item<!-- TMPL_ELSE -->Add News Item<!-- /TMPL_IF --><!-- TMPL_ELSE -->
                     {
                         button : "timestampButton",
                         inputField : "timestamp",
-                        ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                        ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->"
                     }
                     );
                 </script>
@@ -89,7 +89,7 @@ Edit News Item<!-- TMPL_ELSE -->Add News Item<!-- /TMPL_IF --><!-- TMPL_ELSE -->
                     {
                         button : "openCalendar",
                         inputField : "expirationdate",
-                        ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                        ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->"
                     }
                     );
                 </script>

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index 802d79b..b727361 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -330,7 +330,7 @@
                 ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                 button : "CalendarReserveDate<!-- TMPL_VAR NAME="biblionumber" -->",
                 disableFunc : validate<!-- TMPL_VAR NAME="biblionumber" -->,
-                dateStatusFunc : validate<!-- TMPL_VAR NAME="biblionumber" -->,
+                dateStatusFunc : validate<!-- TMPL_VAR NAME="biblionumber" -->
               }
               );
               //]]>
@@ -360,7 +360,7 @@
           ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
           button : "CalendarExpirationDate_<!-- TMPL_VAR NAME="biblionumber" -->",
           disableFunc : validate1,
-          dateStatusFunc : validate1,
+          dateStatusFunc : validate1
         }
       );
       //]]>