-
Notifications
You must be signed in to change notification settings - Fork 39
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Form integration bug fixes and improvements #889
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,183 +1,211 @@ | ||
| (function ($, document, undefined) { | ||
| "use strict"; | ||
|
|
||
| var setCookie = function (settings) { | ||
| $.pm_cookie( | ||
| settings.name, | ||
| true, | ||
| settings.session ? null : settings.time, | ||
| settings.path ? pum_vars.home_url || '/' : null | ||
| ); | ||
| pum.hooks.doAction('popmake.setCookie', settings); | ||
| }; | ||
|
|
||
| $.extend($.fn.popmake.methods, { | ||
| addCookie: function (type) { | ||
| // Method calling logic | ||
|
|
||
| pum.hooks.doAction('popmake.addCookie', arguments); | ||
|
|
||
| if ($.fn.popmake.cookies[type]) { | ||
| return $.fn.popmake.cookies[type].apply(this, Array.prototype.slice.call(arguments, 1)); | ||
| } | ||
| if (window.console) { | ||
| console.warn('Cookie type ' + type + ' does not exist.'); | ||
| } | ||
| return this; | ||
| }, | ||
| setCookie: setCookie, | ||
| checkCookies: function (settings) { | ||
| var i, | ||
| ret = false; | ||
|
|
||
| if (settings.cookie_name === undefined || settings.cookie_name === null || settings.cookie_name === '') { | ||
| return false; | ||
| } | ||
|
|
||
| switch (typeof settings.cookie_name) { | ||
| case 'object': | ||
| case 'array': | ||
| for (i = 0; settings.cookie_name.length > i; i += 1) { | ||
| if ($.pm_cookie(settings.cookie_name[i]) !== undefined) { | ||
| ret = true; | ||
| } | ||
| } | ||
| break; | ||
| case 'string': | ||
| if ($.pm_cookie(settings.cookie_name) !== undefined) { | ||
| ret = true; | ||
| } | ||
| break; | ||
| } | ||
|
|
||
| pum.hooks.doAction('popmake.checkCookies', settings, ret); | ||
|
|
||
| return ret; | ||
| } | ||
| }); | ||
|
|
||
| $.fn.popmake.cookies = $.fn.popmake.cookies || {}; | ||
|
|
||
| $.extend($.fn.popmake.cookies, { | ||
| on_popup_open: function (settings) { | ||
| var $popup = PUM.getPopup(this); | ||
| $popup.on('pumAfterOpen', function () { | ||
| $popup.popmake('setCookie', settings); | ||
| }); | ||
| }, | ||
| on_popup_close: function (settings) { | ||
| var $popup = PUM.getPopup(this); | ||
| $popup.on('pumBeforeClose', function () { | ||
| $popup.popmake('setCookie', settings); | ||
| }); | ||
| }, | ||
| form_submission: function ( settings ) { | ||
| var $popup = PUM.getPopup( this ); | ||
|
|
||
| settings = $.extend( { | ||
| form: '', | ||
| formInstanceId: '', | ||
| only_in_popup: false, | ||
| }, settings ); | ||
|
|
||
| PUM.hooks.addAction( 'pum.integration.form.success', function ( form, args ) { | ||
| if ( ! settings.form.length ) { | ||
| return; | ||
| } | ||
|
|
||
| if ( PUM.integrations.checkFormKeyMatches( settings.form, settings.formInstanceId, args ) ) { | ||
| if ( | ||
| ( settings.only_in_popup && PUM.getPopup( form ).length && PUM.getPopup( form ).is( $popup ) ) || | ||
| ! settings.only_in_popup | ||
| ) { | ||
| $popup.popmake( 'setCookie', settings ); | ||
| } | ||
| } | ||
| } ); | ||
| }, | ||
| manual: function (settings) { | ||
| var $popup = PUM.getPopup(this); | ||
| $popup.on('pumSetCookie', function () { | ||
| $popup.popmake('setCookie', settings); | ||
| }); | ||
| }, | ||
| form_success: function (settings) { | ||
| var $popup = PUM.getPopup(this); | ||
| $popup.on('pumFormSuccess', function () { | ||
| $popup.popmake('setCookie', settings); | ||
| }); | ||
| }, | ||
| pum_sub_form_success: function (settings) { | ||
| var $popup = PUM.getPopup(this); | ||
| $popup.find('form.pum-sub-form').on('success', function () { | ||
| $popup.popmake('setCookie', settings); | ||
| }); | ||
| }, | ||
| /** | ||
| * @deprecated 1.7.0 | ||
| * | ||
| * @param settings | ||
| */ | ||
| pum_sub_form_already_subscribed: function (settings) { | ||
| var $popup = PUM.getPopup(this); | ||
| $popup.find('form.pum-sub-form').on('success', function () { | ||
| $popup.popmake('setCookie', settings); | ||
| }); | ||
| }, | ||
| ninja_form_success: function (settings) { | ||
| return $.fn.popmake.cookies.form_success.apply(this, arguments); | ||
| }, | ||
| cf7_form_success: function (settings) { | ||
| return $.fn.popmake.cookies.form_success.apply(this, arguments); | ||
| }, | ||
| gforms_form_success: function (settings) { | ||
| return $.fn.popmake.cookies.form_success.apply(this, arguments); | ||
| } | ||
| }); | ||
|
|
||
| // Register All Cookies for a Popup | ||
| $(document) | ||
| .ready(function () { | ||
| var $cookies = $('.pum-cookie'); | ||
|
|
||
| $cookies.each(function () { | ||
| var $cookie = $(this), | ||
| index = $cookies.index($cookie), | ||
| args = $cookie.data('cookie-args'); | ||
|
|
||
| // If only-onscreen not set or false, set the cookie immediately. | ||
| if ( ! $cookie.data('only-onscreen') ) { | ||
| setCookie(args); | ||
| } else { | ||
| // If the element is visible on page load, set the cookie. | ||
| if ( $cookie.isInViewport() && $cookie.is(':visible') ) { | ||
| setCookie(args); | ||
| } else { | ||
| // Add a throttled scroll listener, when its in view, set the cookie. | ||
| $(window).on('scroll.pum-cookie-' + index, $.fn.popmake.utilities.throttle(function(event) { | ||
| if ( $cookie.isInViewport() && $cookie.is(':visible') ) { | ||
| setCookie(args); | ||
|
|
||
| $(window).off('scroll.pum-cookie-' + index ); | ||
| } | ||
| }, 100)); | ||
| } | ||
| } | ||
| }) | ||
| }) | ||
| .on('pumInit', '.pum', function () { | ||
| var $popup = PUM.getPopup(this), | ||
| settings = $popup.popmake('getSettings'), | ||
| cookies = settings.cookies || [], | ||
| cookie = null, | ||
| i; | ||
|
|
||
| if (cookies.length) { | ||
| for (i = 0; cookies.length > i; i += 1) { | ||
| cookie = cookies[i]; | ||
| $popup.popmake('addCookie', cookie.event, cookie.settings); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| }(jQuery, document)); | ||
| (function($, document, undefined) { | ||
| "use strict"; | ||
|
|
||
| var setCookie = function(settings) { | ||
| $.pm_cookie( | ||
| settings.name, | ||
| true, | ||
| settings.session ? null : settings.time, | ||
| settings.path ? pum_vars.home_url || "/" : null | ||
| ); | ||
| pum.hooks.doAction("popmake.setCookie", settings); | ||
| }; | ||
|
|
||
| $.extend($.fn.popmake.methods, { | ||
| addCookie: function(type) { | ||
| // Method calling logic | ||
|
|
||
| pum.hooks.doAction("popmake.addCookie", arguments); | ||
|
|
||
| if ($.fn.popmake.cookies[type]) { | ||
| return $.fn.popmake.cookies[type].apply( | ||
| this, | ||
| Array.prototype.slice.call(arguments, 1) | ||
| ); | ||
| } | ||
| if (window.console) { | ||
| console.warn("Cookie type " + type + " does not exist."); | ||
| } | ||
| return this; | ||
| }, | ||
| setCookie: setCookie, | ||
| checkCookies: function(settings) { | ||
| var i, | ||
| ret = false; | ||
|
|
||
| if ( | ||
| settings.cookie_name === undefined || | ||
| settings.cookie_name === null || | ||
| settings.cookie_name === "" | ||
| ) { | ||
| return false; | ||
| } | ||
|
|
||
| switch (typeof settings.cookie_name) { | ||
| case "object": | ||
| case "array": | ||
| for (i = 0; settings.cookie_name.length > i; i += 1) { | ||
| if ( | ||
| $.pm_cookie(settings.cookie_name[i]) !== undefined | ||
| ) { | ||
| ret = true; | ||
| } | ||
| } | ||
| break; | ||
| case "string": | ||
| if ($.pm_cookie(settings.cookie_name) !== undefined) { | ||
| ret = true; | ||
| } | ||
| break; | ||
| } | ||
|
|
||
| pum.hooks.doAction("popmake.checkCookies", settings, ret); | ||
|
|
||
| return ret; | ||
| } | ||
| }); | ||
|
|
||
| $.fn.popmake.cookies = $.fn.popmake.cookies || {}; | ||
|
|
||
| $.extend($.fn.popmake.cookies, { | ||
| on_popup_open: function(settings) { | ||
| var $popup = PUM.getPopup(this); | ||
| $popup.on("pumAfterOpen", function() { | ||
| $popup.popmake("setCookie", settings); | ||
| }); | ||
| }, | ||
| on_popup_close: function(settings) { | ||
| var $popup = PUM.getPopup(this); | ||
| $popup.on("pumBeforeClose", function() { | ||
| $popup.popmake("setCookie", settings); | ||
| }); | ||
| }, | ||
| form_submission: function(settings) { | ||
| var $popup = PUM.getPopup(this); | ||
|
|
||
| settings = $.extend( | ||
| { | ||
| form: "", | ||
| formInstanceId: "", | ||
| only_in_popup: false | ||
| }, | ||
| settings | ||
| ); | ||
|
|
||
| PUM.hooks.addAction("pum.integration.form.success", function( | ||
| form, | ||
| args | ||
| ) { | ||
| if (!settings.form.length) { | ||
| return; | ||
| } | ||
|
|
||
| if ( | ||
| PUM.integrations.checkFormKeyMatches( | ||
| settings.form, | ||
| settings.formInstanceId, | ||
| args | ||
| ) | ||
| ) { | ||
| if ( | ||
| (settings.only_in_popup && | ||
| args.popup.length && | ||
| args.popup.is($popup)) || | ||
| !settings.only_in_popup | ||
| ) { | ||
| $popup.popmake("setCookie", settings); | ||
| } | ||
| } | ||
| }); | ||
| }, | ||
| manual: function(settings) { | ||
| var $popup = PUM.getPopup(this); | ||
| $popup.on("pumSetCookie", function() { | ||
| $popup.popmake("setCookie", settings); | ||
| }); | ||
| }, | ||
| form_success: function(settings) { | ||
| var $popup = PUM.getPopup(this); | ||
| $popup.on("pumFormSuccess", function() { | ||
| $popup.popmake("setCookie", settings); | ||
| }); | ||
| }, | ||
| pum_sub_form_success: function(settings) { | ||
| var $popup = PUM.getPopup(this); | ||
| $popup.find("form.pum-sub-form").on("success", function() { | ||
| $popup.popmake("setCookie", settings); | ||
| }); | ||
| }, | ||
| /** | ||
| * @deprecated 1.7.0 | ||
| * | ||
| * @param settings | ||
| */ | ||
| pum_sub_form_already_subscribed: function(settings) { | ||
| var $popup = PUM.getPopup(this); | ||
| $popup.find("form.pum-sub-form").on("success", function() { | ||
| $popup.popmake("setCookie", settings); | ||
| }); | ||
| }, | ||
| ninja_form_success: function(settings) { | ||
| return $.fn.popmake.cookies.form_success.apply(this, arguments); | ||
| }, | ||
| cf7_form_success: function(settings) { | ||
| return $.fn.popmake.cookies.form_success.apply(this, arguments); | ||
| }, | ||
| gforms_form_success: function(settings) { | ||
| return $.fn.popmake.cookies.form_success.apply(this, arguments); | ||
| } | ||
| }); | ||
|
|
||
| // Register All Cookies for a Popup | ||
| $(document) | ||
| .ready(function() { | ||
| var $cookies = $(".pum-cookie"); | ||
|
|
||
| $cookies.each(function() { | ||
| var $cookie = $(this), | ||
| index = $cookies.index($cookie), | ||
| args = $cookie.data("cookie-args"); | ||
|
|
||
| // If only-onscreen not set or false, set the cookie immediately. | ||
| if (!$cookie.data("only-onscreen")) { | ||
| setCookie(args); | ||
| } else { | ||
| // If the element is visible on page load, set the cookie. | ||
| if ($cookie.isInViewport() && $cookie.is(":visible")) { | ||
| setCookie(args); | ||
| } else { | ||
| // Add a throttled scroll listener, when its in view, set the cookie. | ||
| $(window).on( | ||
| "scroll.pum-cookie-" + index, | ||
| $.fn.popmake.utilities.throttle(function(event) { | ||
| if ( | ||
| $cookie.isInViewport() && | ||
| $cookie.is(":visible") | ||
| ) { | ||
| setCookie(args); | ||
|
|
||
| $(window).off("scroll.pum-cookie-" + index); | ||
| } | ||
| }, 100) | ||
| ); | ||
| } | ||
| } | ||
| }); | ||
| }) | ||
| .on("pumInit", ".pum", function() { | ||
| var $popup = PUM.getPopup(this), | ||
| settings = $popup.popmake("getSettings"), | ||
| cookies = settings.cookies || [], | ||
| cookie = null, | ||
| i; | ||
|
|
||
| if (cookies.length) { | ||
| for (i = 0; cookies.length > i; i += 1) { | ||
| cookie = cookies[i]; | ||
| $popup.popmake("addCookie", cookie.event, cookie.settings); | ||
| } | ||
| } | ||
| }); | ||
| })(jQuery, document); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed spaces to tabs so it shows the whole file changed. The only actual code changes is this conditional.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PHPStorm doesn't allow line by line staging which is ashame, but VSCode does which is nice, you can highlight the changed lines, stage them, commit, then stage the rest of the file for a second commit.