fe 2.0.6 → 2.1.0

data/app/assets/javascripts/fe/jquery.uploadify.v2.1.0.js

@@ -28,7 +28,7 @@ if(jQuery)(
 		jQuery.extend(jQuery.fn,{
 			uploadify:function(options) {
 				jQuery(this).each(function(){
-					settings = jQuery.extend({
+					let settings = jQuery.extend({
 					id             : jQuery(this).attr('id'), // The ID of the object being Uploadified
 					uploader       : 'uploadify.swf', // The path to the uploadify swf file
 					script         : 'uploadify.php', // The path to the uploadify backend upload script
@@ -55,11 +55,11 @@ if(jQuery)(
 					onComplete     : function() {}, // Function to run when an upload is completed
 					onAllComplete  : function() {}  // Functino to run when all uploads are completed
 				}, options);
-				var pagePath = location.pathname;
+				let pagePath = location.pathname;
 				pagePath = pagePath.split('/');
 				pagePath.pop();
 				pagePath = pagePath.join('/') + '/';
-				var data = {};
+				let data = {};
 				data.uploadifyID = settings.id;
 				data.pagepath = pagePath;
 				if (settings.buttonImg) data.buttonImg = escape(settings.buttonImg);
@@ -68,8 +68,8 @@ if(jQuery)(
 				data.script = settings.script;
 				data.folder = escape(settings.folder);
 				if (settings.scriptData) {
-					var scriptDataString = '';
-					for (var name in settings.scriptData) {
+					let scriptDataString = '';
+					for (let name in settings.scriptData) {
 						scriptDataString += '&' + name + '=' + settings.scriptData[name];
 					}
 					data.scriptData = escape(scriptDataString.substr(1));
@@ -102,24 +102,25 @@ if(jQuery)(
 				}
 				jQuery(this).bind("uploadifySelect", {'action': settings.onSelect, 'queueID': settings.queueID}, function(event, ID, fileObj) {
 					if (event.data.action(event, ID, fileObj) !== false) {
-						var byteSize = Math.round(fileObj.size / 1024 * 100) * .01;
-						var suffix = 'KB';
+						let byteSize = Math.round(fileObj.size / 1024 * 100) * .01;
+						let suffix = 'KB';
 						if (byteSize > 1000) {
 							byteSize = Math.round(byteSize *.001 * 100) * .01;
 							suffix = 'MB';
 						}
-						var sizeParts = byteSize.toString().split('.');
+						let sizeParts = byteSize.toString().split('.');
 						if (sizeParts.length > 1) {
 							byteSize = sizeParts[0] + '.' + sizeParts[1].substr(0,2);
 						} else {
 							byteSize = sizeParts[0];
 						}
+						let fileName;
 						if (fileObj.name.length > 20) {
 							fileName = fileObj.name.substr(0,20) + '...';
 						} else {
 							fileName = fileObj.name;
 						}
-						queue = '#' + jQuery(this).attr('id') + 'Queue';
+						let queue = '#' + jQuery(this).attr('id') + 'Queue';
 						if (event.data.queueID) {
 							queue = '#' + event.data.queueID;
 						}
@@ -143,18 +144,18 @@ if(jQuery)(
 					}
 				});
 				jQuery(this).bind("uploadifyCheckExist", {'action': settings.onCheck}, function(event, checkScript, fileQueueObj, folder, single) {
-					var postData = new Object();
+					let postData = new Object();
 					postData = fileQueueObj;
 					postData.folder = pagePath + folder;
 					if (single) {
-						for (var ID in fileQueueObj) {
-							var singleFileID = ID;
+						for (let ID in fileQueueObj) {
+							let singleFileID = ID;
 						}
 					}
 					jQuery.post(checkScript, postData, function(data) {
-						for(var key in data) {
+						for(let key in data) {
 							if (event.data.action(event, checkScript, fileQueueObj, folder, single) !== false) {
-								var replaceFile = confirm("Do you want to replace the file " + data[key] + "?");
+								let replaceFile = confirm("Do you want to replace the file " + data[key] + "?");
 								if (!replaceFile) {
 									document.getElementById(jQuery(event.target).attr('id') + 'Uploader').cancelFileUpload(key, true,true);
 								}
@@ -169,17 +170,17 @@ if(jQuery)(
 				});
 				jQuery(this).bind("uploadifyCancel", {'action': settings.onCancel}, function(event, ID, fileObj, data, clearFast) {
 					if (event.data.action(event, ID, fileObj, data, clearFast) !== false) {
-						var fadeSpeed = (clearFast == true) ? 0 : 250;
+						let fadeSpeed = (clearFast == true) ? 0 : 250;
 						jQuery("#" + jQuery(this).attr('id') + ID).fadeOut(fadeSpeed, function() { jQuery(this).remove() });
 					}
 				});
 				if (typeof(settings.onClearQueue) == 'function') {
 					jQuery(this).bind("uploadifyClearQueue", settings.onClearQueue);
 				}
-				var errorArray = [];
+				let errorArray = [];
 				jQuery(this).bind("uploadifyError", {'action': settings.onError}, function(event, ID, fileObj, errorObj) {
 					if (event.data.action(event, ID, fileObj, errorObj) !== false) {
-						var fileArray = new Array(ID, fileObj, errorObj);
+						let fileArray = new Array(ID, fileObj, errorObj);
 						errorArray.push(fileArray);
 						jQuery("#" + jQuery(this).attr('id') + ID + " .percentage").text(" - " + errorObj.type + " Error");
 						jQuery("#" + jQuery(this).attr('id') + ID).addClass('uploadifyError');
@@ -210,16 +211,16 @@ if(jQuery)(
 			});
 		},
 		uploadifySettings:function(settingName, settingValue, resetObject) {
-			var returnValue = false;
+			let returnValue = false;
 			jQuery(this).each(function() {
 				if (settingName == 'scriptData' && settingValue != null) {
 					if (resetObject) {
-						var scriptData = settingValue;
+						let scriptData = settingValue;
 					} else {
-						var scriptData = jQuery.extend(settings.scriptData, settingValue);
+						let scriptData = jQuery.extend(settings.scriptData, settingValue);
 					}
-					var scriptDataString = '';
-					for (var name in scriptData) {
+					let scriptDataString = '';
+					for (let name in scriptData) {
 						scriptDataString += '&' + name + '=' + escape(scriptData[name]);
 					}
 					settingValue = scriptDataString.substr(1);
@@ -228,10 +229,10 @@ if(jQuery)(
 			});
 			if (settingValue == null) {
 				if (settingName == 'scriptData') {
-					var returnSplit = unescape(returnValue).split('&');
-					var returnObj   = new Object();
-					for (var i = 0; i < returnSplit.length; i++) {
-						var iSplit = returnSplit[i].split('=');
+					let returnSplit = unescape(returnValue).split('&');
+					let returnObj   = new Object();
+					for (let i = 0; i < returnSplit.length; i++) {
+						let iSplit = returnSplit[i].split('=');
 						returnObj[iSplit[0]] = iSplit[1];
 					}
 					returnValue = returnObj;

data/app/helpers/fe/application_helper.rb

@@ -42,7 +42,7 @@ module Fe
 
     def spinner(extra = nil)
       e = extra ? "spinner_#{extra}" : 'spinner'
-      image_tag('spinner.gif', id: e, style: 'display:none', class: 'spinner')
+      image_tag('fe/spinner.gif', id: e, style: 'display:none', class: 'spinner')
     end
 
     def link_to_function(name, *args, &block)

data/app/models/fe/question_set.rb

@@ -107,12 +107,9 @@ module Fe
           values = [Date.new(year.to_i, month.to_i, 1).strftime('%Y-%m-%d')]  # for mm/yy drop downs
         end
       elsif param.kind_of?(Hash)
-        # from Hash with multiple answers per question
-        # If value is also a hash, use the value hash without escaping or anything,
-        # so that custom elements can be implemented by handling set_response.
-        values = param.values.map {|v| v.is_a?(Hash) ? v : CGI.unescape(v)}
+        values = param.values
       elsif param.kind_of?(String)
-        values = [CGI.unescape(param)]
+        values = [param]
       end
 
       # Hash may contain empty string to force post for no checkboxes

data/app/views/fe/admin/question_sheets/show.html.erb

@@ -1,5 +1,5 @@
 <script language="javascript">
-var activeElement = "";
+  let activeElement = "";
 </script>
 
 <div id="content">

data/app/views/fe/questions/fe/_attachment_field.html.erb

@@ -96,7 +96,7 @@
       <script type="text/javascript">
           $(function() {
 
-              var $input = $("<%= base_element %> .upload_field").html5_upload({
+              let $input = $("<%= base_element %> .upload_field").html5_upload({
                   url: function(number) {
                     return "<%= save_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, question_id: element_id, answer_sheet_type: @answer_sheet.class.name) %>";
                   },
@@ -143,7 +143,7 @@
                 $.event.props.push('dataTransfer');
               }
 
-              var $drop = $('<%= base_element %> .drop_area');
+              let $drop = $('<%= base_element %> .drop_area');
               $drop.on('dragover dragenter', function(e) {
                   $drop.addClass('file_hover');
                   return false;

data/app/views/layouts/fe/application.html.erb

@@ -8,7 +8,7 @@
   <%= stylesheet_link_tag "base" %>
 
   <script type="text/javascript" charset="utf-8">
-    var answer_sheet_type = "<%= @answer_sheet.class %>"
+    let answer_sheet_type = "<%= @answer_sheet.class %>"
   </script>
   <%= csrf_meta_tag %>
   <%= stylesheet_link_tag asset_path("fe/fe.screen.css") %>

data/lib/fe/version.rb

@@ -1,3 +1,3 @@
 module Fe
-  VERSION = "2.0.6"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fe
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - CruGlobal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-04 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -228,7 +228,7 @@ dependencies:
         version: '0'
 description: A rails engine that facilitates question/answer stuff
 email:
-- programmers@cojourners.com
+- andrewroth@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -276,6 +276,7 @@ files:
 - app/assets/images/fe/indent.png
 - app/assets/images/fe/overlay.png
 - app/assets/images/fe/selected_bg.jpg
+- app/assets/images/fe/spinner.gif
 - app/assets/images/fe/status.gif
 - app/assets/images/fe/tooltip/black.png
 - app/assets/images/fe/tooltip/black_arrow.png
@@ -589,7 +590,6 @@ files:
 - spec/dummy/db/migrate/20160204164613_add_visible_and_visibility_cache_key_to_reference_sheets.fe_engine.rb
 - spec/dummy/db/migrate/20181108201746_create_versions.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -664,8 +664,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Form Engine
@@ -743,7 +742,6 @@ test_files:
 - spec/dummy/db/migrate/20160204164613_add_visible_and_visibility_cache_key_to_reference_sheets.fe_engine.rb
 - spec/dummy/db/migrate/20181108201746_create_versions.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html