From: Anthony Talarico Date: Wed, 21 Sep 2016 17:36:17 +0000 (-0400) Subject: corrected enqueue path for front end form submission, changing $ to jquery for testin... X-Git-Tag: v1.4.0^2~25 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=88b8b20b0e8611c2c1e1fd7382d8dc42d9467c22;p=WP-Plugins%2Fglm-member-db-events.git corrected enqueue path for front end form submission, changing $ to jquery for testing to remove js errors --- diff --git a/js/dashboard.js b/js/dashboard.js index 350a495..4b028c7 100644 --- a/js/dashboard.js +++ b/js/dashboard.js @@ -1,32 +1,32 @@ (function(){ - if ($('#glm-event-from').length > 0) { - $('#glm-event-from').datepicker(); - $('#glm-event-to').datepicker(); + if (jQuery('#glm-event-from').length > 0) { + jQuery('#glm-event-from').datepicker(); + jQuery('#glm-event-to').datepicker(); } - $('#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, autoOpen: false }); - $("#eventDetail-map").click(function(e){ + jQuery("#eventDetail-map").click(function(e){ e.preventDefault(); - $("#map-dialog").dialog('open'); + jQuery("#map-dialog").dialog('open'); GLM_GeoMap.initializeLargeMap(); }); } - $('#glm-event-pdf-submit').click(function(event){ + jQuery('#glm-event-pdf-submit').click(function(event){ eventForm = $('#glm-member-event-search'); eventForm.attr('action', ajaxUrl + '?action=glm_members_admin_ajax&glm_action=pdfOutput&glm-event-pdf=1'); }); - if ($('#glm-event-name').length > 0) { + if (jQuery('#glm-event-name').length > 0) { var cache = {}; - $("#glm-event-name").autocomplete({ + jQuery("#glm-event-name").autocomplete({ minLength: 2, source: function(request, response) { var term = request.term; @@ -35,7 +35,7 @@ return; } var url = ajaxUrl + '?action=glm_members_admin_ajax&glm_action=nameSearch'; - $.getJSON( url, request, function(data, status, xhr){ + jQuery.getJSON( url, request, function(data, status, xhr){ //cache[term] = data; response( data ); }); diff --git a/js/front.js b/js/front.js index 867b530..1ca21ad 100644 --- a/js/front.js +++ b/js/front.js @@ -20,41 +20,41 @@ var EventFront = { }); // load front end form submission jquery if elements exist - if($("#frontForm").length > 0){ - $("#sdate, #edate").datepicker({ + if(jQuery("#frontForm").length > 0){ + jQuery("#sdate, #edate").datepicker({ dateFormat: 'mm/dd/yy' }); - $("#freeEvent").change( function () { + jQuery("#freeEvent").change( function () { if(this.checked){ $("#cost").fadeOut('medium'); } else { $("#cost").fadeIn('medium'); } }); - $("#repeatingEvent").change( function () { + jQuery("#repeatingEvent").change( function () { if(this.checked){ $(".frontRecurrences").fadeIn('medium'); } else { $(".frontRecurrences").fadeOut('medium'); } }); - $("#allDay").change( function () { + jQuery("#allDay").change( function () { if(this.checked){ $(".timeRow").fadeOut('medium'); } else { $(".timeRow").fadeIn('medium'); } }); - $("#dayOfMonth").change( function () { + jQuery("#dayOfMonth").change( function () { if(this.val() !== ""){ $("#daysOfWeek, #weeklyRepeatRow").fadeOut(); } else { $("#daysOfWeek, #weeklyRepeatRow").fadeIn(); } }); - $("#weeklyRepeat").change( function () { + jQuery("#weeklyRepeat").change( function () { if(this.val() !== ""){ $("#dayOfMonthRow").fadeOut(); } else { diff --git a/models/front/events/frontAdd.php b/models/front/events/frontAdd.php index daf1e26..1f0ebeb 100644 --- a/models/front/events/frontAdd.php +++ b/models/front/events/frontAdd.php @@ -120,7 +120,7 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents if( ! wp_script_is( 'jquery-ui', 'enqueued' ) ){ wp_enqueue_script('jquery-ui-datepicker', false, array('jquery'), false, true); wp_enqueue_style('jquery-style', 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css'); - wp_enqueue_script('front-js', GLM_MEMBERS_EVENTS_PLUGIN_PATH . 'js/front.js'); + wp_enqueue_script('front-js', GLM_MEMBERS_EVENTS_PLUGIN_PATH . '/js/front.js'); } $view = 'frontAdd'; // populate category dropdown