Skip to content

Commit

Permalink
Merge branch 'master' into ruby31
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbirdjavi
jbirdjavi authored Feb 27, 2024
2 parents b74d111 + 8dad0b6 commit d11e483
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 73 deletions.
133 changes: 67 additions & 66 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,47 +15,47 @@ GEM
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.7.2)
actionpack (= 7.0.7.2)
activesupport (= 7.0.7.2)
actioncable (7.0.8.1)
actionpack (= 7.0.8.1)
activesupport (= 7.0.8.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.7.2)
actionpack (= 7.0.7.2)
activejob (= 7.0.7.2)
activerecord (= 7.0.7.2)
activestorage (= 7.0.7.2)
activesupport (= 7.0.7.2)
actionmailbox (7.0.8.1)
actionpack (= 7.0.8.1)
activejob (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.7.2)
actionpack (= 7.0.7.2)
actionview (= 7.0.7.2)
activejob (= 7.0.7.2)
activesupport (= 7.0.7.2)
actionmailer (7.0.8.1)
actionpack (= 7.0.8.1)
actionview (= 7.0.8.1)
activejob (= 7.0.8.1)
activesupport (= 7.0.8.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.7.2)
actionview (= 7.0.7.2)
activesupport (= 7.0.7.2)
actionpack (7.0.8.1)
actionview (= 7.0.8.1)
activesupport (= 7.0.8.1)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.7.2)
actionpack (= 7.0.7.2)
activerecord (= 7.0.7.2)
activestorage (= 7.0.7.2)
activesupport (= 7.0.7.2)
actiontext (7.0.8.1)
actionpack (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.7.2)
activesupport (= 7.0.7.2)
actionview (7.0.8.1)
activesupport (= 7.0.8.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -78,22 +78,22 @@ GEM
sassc
sassc-rails
xdan-datetimepicker-rails (~> 2.5.1)
activejob (7.0.7.2)
activesupport (= 7.0.7.2)
activejob (7.0.8.1)
activesupport (= 7.0.8.1)
globalid (>= 0.3.6)
activemodel (7.0.7.2)
activesupport (= 7.0.7.2)
activerecord (7.0.7.2)
activemodel (= 7.0.7.2)
activesupport (= 7.0.7.2)
activestorage (7.0.7.2)
actionpack (= 7.0.7.2)
activejob (= 7.0.7.2)
activerecord (= 7.0.7.2)
activesupport (= 7.0.7.2)
activemodel (7.0.8.1)
activesupport (= 7.0.8.1)
activerecord (7.0.8.1)
activemodel (= 7.0.8.1)
activesupport (= 7.0.8.1)
activestorage (7.0.8.1)
actionpack (= 7.0.8.1)
activejob (= 7.0.8.1)
activerecord (= 7.0.8.1)
activesupport (= 7.0.8.1)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.7.2)
activesupport (7.0.8.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand All @@ -117,9 +117,9 @@ GEM
msgpack (~> 1.2)
brakeman (6.1.2)
racc
brpoplpush-redis_script (0.1.2)
brpoplpush-redis_script (0.1.3)
concurrent-ruby (~> 1.0, >= 1.0.5)
redis (>= 1.0, <= 5.0)
redis (>= 1.0, < 6)
builder (3.2.4)
bundle-audit (0.1.0)
bundler-audit
Expand All @@ -137,7 +137,7 @@ GEM
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
coderay (1.1.2)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
countries (3.0.1)
i18n_data (~> 0.10.0)
Expand All @@ -150,7 +150,7 @@ GEM
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
date (3.3.3)
date (3.3.4)
ddtrace (1.4.2)
debase-ruby_core_source (= 0.10.16)
libdatadog (~> 0.7.0.1.1)
Expand Down Expand Up @@ -271,17 +271,17 @@ GEM
mime-types-data (3.2019.1009)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.20.0)
minitest (5.22.2)
msgpack (1.5.6)
multi_xml (0.6.0)
net-imap (0.3.7)
net-imap (0.4.10)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
net-protocol (0.2.2)
timeout
net-smtp (0.3.3)
net-smtp (0.4.0.1)
net-protocol
netrc (0.11.0)
nio4r (2.7.0)
Expand Down Expand Up @@ -325,37 +325,37 @@ GEM
puma (5.6.8)
nio4r (~> 2.0)
racc (1.7.3)
rack (2.2.8)
rack (2.2.8.1)
rack-cors (1.1.1)
rack (>= 2.0.0)
rack-protection (3.1.0)
rack (~> 2.2, >= 2.2.4)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.7.2)
actioncable (= 7.0.7.2)
actionmailbox (= 7.0.7.2)
actionmailer (= 7.0.7.2)
actionpack (= 7.0.7.2)
actiontext (= 7.0.7.2)
actionview (= 7.0.7.2)
activejob (= 7.0.7.2)
activemodel (= 7.0.7.2)
activerecord (= 7.0.7.2)
activestorage (= 7.0.7.2)
activesupport (= 7.0.7.2)
rails (7.0.8.1)
actioncable (= 7.0.8.1)
actionmailbox (= 7.0.8.1)
actionmailer (= 7.0.8.1)
actionpack (= 7.0.8.1)
actiontext (= 7.0.8.1)
actionview (= 7.0.8.1)
activejob (= 7.0.8.1)
activemodel (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
bundler (>= 1.15.0)
railties (= 7.0.7.2)
railties (= 7.0.8.1)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.0.7.2)
actionpack (= 7.0.7.2)
activesupport (= 7.0.7.2)
railties (7.0.8.1)
actionpack (= 7.0.8.1)
activesupport (= 7.0.8.1)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand Down Expand Up @@ -449,10 +449,11 @@ GEM
redis (>= 4.5.0, < 5)
sidekiq-failures (1.0.1)
sidekiq (>= 4.0.0)
sidekiq-unique-jobs (7.1.25)
sidekiq-unique-jobs (7.1.33)
brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
concurrent-ruby (~> 1.0, >= 1.0.5)
sidekiq (>= 5.0, < 8.0)
redis (< 5.0)
sidekiq (>= 5.0, < 7.0)
thor (>= 0.20, < 3.0)
simplecov (0.22.0)
docile (~> 1.1)
Expand Down Expand Up @@ -494,7 +495,7 @@ GEM
activemodel (>= 3.0, < 8.0)
thor (1.3.0)
tilt (2.2.0)
timeout (0.4.0)
timeout (0.4.1)
turbo-rails (1.4.0)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
Expand Down Expand Up @@ -528,7 +529,7 @@ GEM
rails (>= 3.2.16)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.12)
zeitwerk (2.6.13)

PLATFORMS
ruby
Expand Down
7 changes: 0 additions & 7 deletions public/campaign-form.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,15 @@ script3.onload = function () {
var campaignForms = window.campaignForms = window.campaignForms || {}
var campaignForm = window.campaignForm = window.campaignForm || {}
var idCounter = 0
console.log('line 11')

campaignForms.jQuery = $.noConflict(true)

function uniqueFormId () {
console.log('uniqueFormId')
var id = ++idCounter
return 'campaignForm' + id
}

function submitForm (form, recaptchaToken) {
console.log('submitForm')
var formId = form.attr('id')

if (!campaignForms[formId].formSubmitted) {
Expand Down Expand Up @@ -86,7 +83,6 @@ script3.onload = function () {
}

function validate (form) {
console.log('validate')
return form.validate({
errorElement: 'span',
errorClass: 'help-block',
Expand Down Expand Up @@ -144,7 +140,6 @@ script3.onload = function () {

// Register all existing forms (not previously registered)
window.campaignForms.registerForms = function () {
console.log('registerForms')
$('.campaign-form form:not([id])').each(function () {
var form = $(this)

Expand All @@ -171,12 +166,10 @@ script3.onload = function () {

// Bootstrap campaign-forms
window.campaignForms.jQuery(function () {
console.log('bootstrap')
window.campaignForms.registerForms()
})

$(document).ready(function() {
console.log('ready')
$("[id^='cf_Country_']").change(function(){
if ($(this).val()!='US'){
$("[for^='cf_US_State_']").hide()
Expand Down

0 comments on commit d11e483

Please sign in to comment.