fe 2.1.2 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a12e14ff5fa1b0cf7c6c2ac0264a03b3e95a8f05dceb01bf42e0963ecb1436c4
-  data.tar.gz: a6d9669f7a71e364d1c114d7db3f5b515762beae8fd08ee8b3b73391c898d328
+  metadata.gz: c2c44e123b4011acc1a3bcec88de8e57c444b3bb29bdae0726b28ffce191535d
+  data.tar.gz: bb4223a3158cf7c0f71865c26d9ace3e8c1017342dc25443f04e15eaa6b3a874
 SHA512:
-  metadata.gz: bc9e85eebb802c6085cd771e0eefcf23c2f34c6b7a26ecdae14751a32894d51cafe911ffbfce8a071fc989837b3e92a9659c1a64370220d86786a04b23855797
-  data.tar.gz: eadf4560863b3005841c19fc7b60b826b12b9b7a5d8f6e3503a4ae660b2fc48cc3dedadf8c341c39a46cefda15f0f99bf693b681f71699b2c2f06fc9410d18a7
+  metadata.gz: 7a1a1e827a8e35c8136e76b0831d611d0e680d6bd9ce2570b8559ba3b1ea00b4abc772bff3426b2a7d9f4606997ef99c506dcdab4f739ca24390465910e8bc66
+  data.tar.gz: 3eb967c51430ae55cb2ad680f41157b3aadc2a5c51ade7cf1678c14731d9b1500b9272c19e445db48b204fb9b19d8a4e7f1dc787f871f5e92f086a1b41e8fc18

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/assets/javascripts/fe/jquery.html5_upload.js

@@ -10,7 +10,7 @@
             return file.size || file.fileSize;
         }
         let available_events = ['onStart', 'onStartOne', 'onProgress', 'onFinishOne', 'onFinish', 'onError'];
-        let options = $.extend({
+        options = $.extend({
             onStart: function(event, total) {
                 return true;
             },

data/app/models/fe/question.rb

@@ -87,7 +87,7 @@ module Fe
     # NOTE: current_person is passed in for the benefit of enclosing apps that override locked?
     # and need to lock an element depending on who the current person is
     def locked?(params, answer_sheet, presenter, current_person)
-      return true unless params['action'] == 'edit'
+      return true if params['action'] == 'show'
       if self.object_name == 'person.current_address' && ['address1','address2','city','zip','email','state','country'].include?(self.attribute_name)
         # Billing Address
         return false

data/lib/fe/version.rb

@@ -1,3 +1,3 @@
 module Fe
-  VERSION = "2.1.2"
+  VERSION = "2.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fe
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.4
 platform: ruby
 authors:
 - CruGlobal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails