From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 30 Sep 2016 20:22:07 +0000 (-0400)
Subject: Merge tag 'v1.3.11' into develop
X-Git-Tag: v1.4.0^2~11
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=112fb146e55c5e885ebb4cefe09988535471d89e;p=WP-Plugins%2Fglm-member-db-events.git

Merge tag 'v1.3.11' into develop

Version 1.3.11
---

112fb146e55c5e885ebb4cefe09988535471d89e
diff --cc js/dashboard.js
index 4b028c7,7ab5015..b8c9024
--- a/js/dashboard.js
+++ b/js/dashboard.js
@@@ -1,14 -1,18 +1,18 @@@
  (function(){
-     if (jQuery('#glm-event-from').length > 0) {
-         jQuery('#glm-event-from').datepicker();
-         jQuery('#glm-event-to').datepicker();
+     if ($('#glm-event-from').length > 0) {
+         $('#glm-event-from').datepicker({
+             dateFormat: "mm/dd/yy"
+         });
+         $('#glm-event-to').datepicker({
+             dateFormat: "mm/dd/yy"
+         });
      }
 -    $('#glm-event-detail-backtosearch').click(function(){
 +    jQuery('#glm-event-detail-backtosearch').click(function(){
          window.history.back();
      });
 -    if ($('#eventDetail-map').length > 0) {
 +    if (jQuery('#eventDetail-map').length > 0) {
          GLM_GeoMap.initialize();
 -        $('#map-dialog').dialog({
 +        jQuery('#map-dialog').dialog({
              height: 490,
              width: 630,
              modal: true,