fe 2.1.3 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d33ad97dceb71023da5ccabf23d67181e5df82544a04bc5d572c34269e7e088
-  data.tar.gz: 6b91ebbb978a6d40c9b3a788321385dd3dd2d8adc05c1160e21defc4493fa698
+  metadata.gz: 531fbb4921ea1c69da23ed89880617df5280a8528c32c0ff7b4ed44a2da216f1
+  data.tar.gz: 123bb9f3fcf8329abe3997754180c2f511e65bf2d2b70305f69c7f0f564b8e49
 SHA512:
-  metadata.gz: ef873fd17595ac279b6b5c4492fe336c8bc3dfa49ce6787e5c63ff6008edb66932b137fffd2163859a81578a7dc25ff4e46d9fdf7bf997a2d55864ff95728c47
-  data.tar.gz: a273983c1efb0b042643b1063ee9e1c27d74de9d39b03d5156f27cd52050dec0668ccb771686c6166f9641274de4c28777ea5ec99c08672e15671170460aea71
+  metadata.gz: e4f7e2af6c9e1993baa425f151cc8fd20b036b513e1b489af15c3c11104ee345e33f478ff5693cfbfa9be32315e9dc50d4ea57905a550483593a6d3d43edd9b8
+  data.tar.gz: 1a90fea9860483d1401af1c086b43eb697fd36dff0f91736459a62c7541438805987d8d08e898f60b135071755a0cb8a5341722b3cd9d46239306fd2516b054f

data/app/assets/javascripts/fe/fe.common.js.erb

@@ -1,40 +1,40 @@
 function setUpSortables() {
-	$('[data-sortable]').sortable({axis:'y',
-                                  items: '> li.sortable',
-																  dropOnEmpty:false,
-																  update: function(event, ui) {
-                                    let sortable = this;
-																		$.ajax({data:$(this).sortable('serialize',{key:sortable.id + '[]'}),
-																						complete: function(request) {$(sortable).effect('highlight')},
-																						success:function(request){$('#errors').html(request)},
-																						type:'POST',
-																						url: $(sortable).attr('data-sortable-url')
-																					 })
-																		},
-                                  stop: function(event, ui) {
-                                    let before_dropper = $('li.before-container[data-element_id="'+ui.item.data('element_id'));
-                                    if (before_dropper.length > 0) {
-                                      before_dropper.detach();
-                                      before_dropper.insertBefore(ui.item);
-                                    }
-                                    let after_dropper = $('li.after-container[data-element_id="'+ui.item.data('element_id'));
-                                    if (after_dropper.length > 0) {
-                                      after_dropper.detach();
-                                      after_dropper.insertAfter(ui.item);
-                                    }
+  $('[data-sortable]').sortable({axis:'y',
+                                items: '> li.sortable',
+                                dropOnEmpty:false,
+                                update: function(event, ui) {
+                                  let sortable = this;
+                                  $.ajax({data:$(this).sortable('serialize',{key:sortable.id + '[]'}),
+                                         complete: function(request) {$(sortable).effect('highlight')},
+                                         success:function(request){$('#errors').html(request)},
+                                         type:'POST',
+                                         url: $(sortable).attr('data-sortable-url')
+                                  })
+                                },
+                                stop: function(event, ui) {
+                                  let before_dropper = $('li.before-container[data-element_id="'+ui.item.data('element_id'));
+                                  if (before_dropper.length > 0) {
+                                    before_dropper.detach();
+                                    before_dropper.insertBefore(ui.item);
                                   }
-	});
-	$('[data-sortable][data-sortable-handle]').each(function() {
-		handle = $(this).attr('data-sortable-handle');
-		$(this).sortable("option", "handle", handle);
-	});
+                                  let after_dropper = $('li.after-container[data-element_id="'+ui.item.data('element_id'));
+                                  if (after_dropper.length > 0) {
+                                    after_dropper.detach();
+                                    after_dropper.insertAfter(ui.item);
+                                  }
+                                }
+  });
+  $('[data-sortable][data-sortable-handle]').each(function() {
+    handle = $(this).attr('data-sortable-handle');
+    $(this).sortable("option", "handle", handle);
+  });
 
-	$('.droppable').droppable({
-		activeClass: 'droppable-active',
+  $('.droppable').droppable({
+    activeClass: 'droppable-active',
     hoverClass: 'droppable-hover',
-		drop: function( event, ui ) {
-			$.post($(this).attr('data-url'), {draggable_element: ui.draggable.attr('id')}, function() {}, 'script')
-		},
+    drop: function( event, ui ) {
+      $.post($(this).attr('data-url'), {draggable_element: ui.draggable.attr('id')}, function() {}, 'script')
+    },
     activate: function( event, ui ) {
       $draggable = ui.draggable;
       $container = $draggable.parents("li.element.container")
@@ -53,7 +53,7 @@ function setUpSortables() {
         $('li.around-container').removeClass('droppable-active');
       }
     }
-	});
+  });
 }
 
 function setUpCalendars() {
@@ -67,27 +67,27 @@ function setUpCalendars() {
 }
 
 function setUpJsHelpers() {
-		// ==================
-		// Sortable
-		setUpSortables();
-		// ==================
+  // ==================
+  // Sortable
+  setUpSortables();
+  // ==================
 
-		// ==================
-		// Calendar
-		setUpCalendars();
-		// ==================
-    <% unless Fe.bootstrap %>$(".tip[title], a[title]").tooltip()<% end %>
+  // ==================
+  // Calendar
+  setUpCalendars();
+  // ==================
+  <% unless Fe.bootstrap %>$(".tip[title], a[title]").tooltip()<% end %>
 }
 
 function fixGridColumnWidths() {
-	$("table.grid").each(function(i, grid) {
+  $("table.grid").each(function(i, grid) {
     let num_columns = $(grid).find("th").length;
-		if (num_columns > 0) {
+    if (num_columns > 0) {
       let width = (100 / num_columns) + "%";
-			$(grid).find("> tbody > tr > th").css("width", width);
-			$(grid).find("> tbody > tr > td").css("width", width);
-		}
-	});
+      $(grid).find("> tbody > tr > th").css("width", width);
+      $(grid).find("> tbody > tr > td").css("width", width);
+    }
+  });
 };
 
 function scrollTo(el) {
@@ -96,3 +96,11 @@ function scrollTo(el) {
     scrollTop: $(el).offset().top
   }, 1000);
 }
+
+// jQuery 3 has removed $(document).on('ready', ...) in favor of $(document).ready(...). Manually call it from
+// the new method here, so we can avoid changing over all the document ready's.
+$(document).ready(function() {
+  if (typeof jQuery == 'function' && parseInt(jQuery.fn.jquery.split(".")[0]) >= 3) {
+    $(document).trigger("ready")
+  }
+});

data/app/controllers/fe/admin/email_templates_controller.rb

@@ -1,6 +1,6 @@
 class Fe::Admin::EmailTemplatesController < ApplicationController
   before_action :check_valid_user
-  layout 'fe/fe.admin'
+  layout 'fe/fe_admin'
 
   def index 
     @email_templates = Fe::EmailTemplate.order('name')

data/app/models/fe/question.rb

@@ -98,7 +98,7 @@ module Fe
         # Relationship & Country & Email Address
         return false
       else
-        return answer_sheet.frozen? && !presenter.reference? &&
+        return answer_sheet.frozen? && !presenter&.reference? &&
           !@answer_sheet.try(:reference?)
       end
     end

data/lib/fe/version.rb

@@ -1,3 +1,3 @@
 module Fe
-  VERSION = "2.1.3"
+  VERSION = "2.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fe
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.5
 platform: ruby
 authors:
 - CruGlobal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-26 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails