fe 2.0.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08d142cda467012228fd3d7f41f95a48608fc2bb83c47aa320c6c77470f2a147'
-  data.tar.gz: bdb32c206769ff5a375bfdaf34c39384dd20bb028cbed9a217bb44b6b79e415b
+  metadata.gz: f3679834a5251fd9a7412f9da4734020a7b1a72dc9882afd2994c8fa6fbd92fd
+  data.tar.gz: 4d0e2a3c4c2085bf1ff788912e85d0ca0ed012446acb137174ae42196a7546b8
 SHA512:
-  metadata.gz: 72c009e490ee51171ef97544b0a9f84a0f2bc2c271bafc0aa72a14c671f007871314d33693f0058effd158a21cfce36649e5325a60a22aae9f04e710d0327121
-  data.tar.gz: bcd6f040366d73a4480fc4aa6e0f7d0ae50b3203f7b9f82396b16f612fe7e261e120bef9e53e1974a7081cc993961963d99baf808d8637adee5b54d45fe3d394
+  metadata.gz: 796bbd4824ffe28319b5dfc7365a93dedcb06fed9e3b3bfe60bd8f5168b3328f9f9b6f4387d589202dd66281999e4217d934d490de12d4dec845733386f9d52d
+  data.tar.gz: 25addcd22738328428a59cdce369d221f8bd6131570d4923b71c4b18336c952553d51e32f8e08f8ae29b0d0cc25a6de21bf06f5b1473137fa976940a2e0a2810

data/app/assets/javascripts/fe/fe.admin.js

@@ -1,4 +1,4 @@
-$(function() {
+$(document).on('ready turbo:load', function () {
   setUpJsHelpers();
 	$(document).on('ajaxStart', function() {
 		$('#status').show();
@@ -8,7 +8,7 @@ $(function() {
 	});
 
   $(document).on('click', '.link-show-xml', function() {
-    div = $(this).closest('.choices_section')
+    let div = $(this).closest('.choices_section')
     $('.xmlChoices', div).show();
     $('.link-show-csv', div).show();
     $('.link-show-xml', div).hide();
@@ -16,7 +16,7 @@ $(function() {
   });
 
   $(document).on('click', '.link-show-csv', function() {
-    div = $(this).closest('.choices_section')
+    let div = $(this).closest('.choices_section')
     $('.csvChoices', div).show();
     $('.link-show-xml', div).show();
     $('.link-show-csv', div).hide();
@@ -70,7 +70,7 @@ $(function() {
 });
 // used by form designer
 
-var currentTab = 'pages_list';
+let currentTab = 'pages_list';
 
 function switchTab(toTab) {
   if(currentTab != null) $('#tab-' + currentTab).removeClass('active');
@@ -82,50 +82,50 @@ function switchTab(toTab) {
 }
 
 function selectPage() {
-    el = $('#link-page-name');
-    clearCurrentElement();
-    el.addClass('active');
-    switchTab('properties');
+  let el = $('#link-page-name');
+  clearCurrentElement();
+  el.addClass('active');
+  switchTab('properties');
 
-    if($('#page_label').length > 0) $('#page_label').focus();
+  if($('#page_label').length > 0) $('#page_label').focus();
 }
 
 function selectElement(id) {
-    el = $(id);
-    clearPageName();
-    clearCurrentElement();
-    el.addClass('active');
-    // snapElementProperties(el);
-    activeElement = id;
-    switchTab('properties');
-
-    // if( $('#element_label')) $('#element_label').focus();
+  let el = $(id);
+  clearPageName();
+  clearCurrentElement();
+  el.addClass('active');
+  // snapElementProperties(el);
+  activeElement = id;
+  switchTab('properties');
+
+  // if( $('#element_label')) $('#element_label').focus();
 }
 
 function clearCurrentElement() {
-    if (activeElement != '' && $(activeElement)) {
-        $(activeElement).removeClass('active');
-    }
+  if (activeElement != '' && $(activeElement)) {
+    $(activeElement).removeClass('active');
+  }
 }
 
 function clearPageName() {
-    $('#link-page-name').removeClass('active');
+  $('#link-page-name').removeClass('active');
 }
 
 function snapElementProperties(el) {
-    propsTop = Position.cumulativeOffset(el)[1] - 160;
-    if (propsTop < 0) propsTop = 0;
-    $('#panel-properties-element').css({'margin-top': propsTop});
+  let propsTop = Position.cumulativeOffset(el)[1] - 160;
+  if (propsTop < 0) propsTop = 0;
+  $('#panel-properties-element').css({'margin-top': propsTop});
 }
 
 function addError(id) {
-    $('#' + id).addClassName('fieldWithErrors');
+  $('#' + id).addClassName('fieldWithErrors');
 }
 
 // convert label to slug
 function updateSlug(source, dest) {
-  label = $(source).val();
-  slug = $(dest).val();
+  let label = $(source).val();
+  let slug = $(dest).val();
   if( label == null || slug == null) return;  // oh oh
 
   label = label.strip();
@@ -144,7 +144,7 @@ function updateSlug(source, dest) {
   }
 }
 
-$(function() {
+$(document).on('ready turbo:load', function () {
 	setUpSortables();
 	fixGridColumnWidths();
 });

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

@@ -3,7 +3,7 @@ function setUpSortables() {
                                   items: '> li.sortable',
 																  dropOnEmpty:false,
 																  update: function(event, ui) {
-																		sortable = this;
+                                    let sortable = this;
 																		$.ajax({data:$(this).sortable('serialize',{key:sortable.id + '[]'}),
 																						complete: function(request) {$(sortable).effect('highlight')},
 																						success:function(request){$('#errors').html(request)},
@@ -12,12 +12,12 @@ function setUpSortables() {
 																					 })
 																		},
                                   stop: function(event, ui) {
-                                    before_dropper = $('li.before-container[data-element_id="'+ui.item.data('element_id'));
+                                    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);
                                     }
-                                    after_dropper = $('li.after-container[data-element_id="'+ui.item.data('element_id'));
+                                    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);
@@ -57,8 +57,8 @@ function setUpSortables() {
 }
 
 function setUpCalendars() {
-  now = new Date();
-  year = now.getFullYear() + 10;
+  let now = new Date();
+  let year = now.getFullYear() + 10;
   $('[data-calendar]').datepicker({
     changeYear:true,
     yearRange: '1950:' + year,
@@ -81,9 +81,9 @@ function setUpJsHelpers() {
 
 function fixGridColumnWidths() {
 	$("table.grid").each(function(i, grid) {
-		num_columns = $(grid).find("th").length;
+    let num_columns = $(grid).find("th").length;
 		if (num_columns > 0) {
-			width = (100 / num_columns) + "%";
+      let width = (100 / num_columns) + "%";
 			$(grid).find("> tbody > tr > th").css("width", width);
 			$(grid).find("> tbody > tr > td").css("width", width);
 		}

data/app/assets/javascripts/fe/fe.public.nojquery.js.erb

@@ -2,7 +2,7 @@
 
 // used by answer sheets
 
-(function($) {
+$(document).on('ready turbo:load', function () {
   <% if Fe.bootstrap %>
   // http://stackoverflow.com/questions/18754020/bootstrap-3-with-jquery-validation-plugin
   $.validator.setDefaults({
@@ -29,9 +29,9 @@
   });
 
   $(document).on('click', '.reference_send_invite', function() {
-    var el = this;
-    var form_elements = $(el).closest('form').find('input:not(.dont_submit), textarea:not(.dont_submit), select:not(.dont_submit)');
-    var data = form_elements.serializeArray();
+    let el = this;
+    let form_elements = $(el).closest('form').find('input:not(.dont_submit), textarea:not(.dont_submit), select:not(.dont_submit)');
+    let data = form_elements.serializeArray();
 
     data.push({name: 'answer_sheet_type', value: answer_sheet_type});
     $.ajax({url: $(el).attr('href'), data: data, dataType: 'script',  type: 'POST',
@@ -48,10 +48,10 @@
     return false;
   });
   $(document).on('focus', 'textarea[maxlength]', function() {
-    var max = parseInt($(this).attr('maxlength'));
+    let max = parseInt($(this).attr('maxlength'));
     $(this).parent().find('.charsRemaining').html('You have ' + (max - $(this).val().length) + ' characters remaining');
   }).on('keyup', 'textarea[maxlength]', function(){
-    var max = parseInt($(this).attr('maxlength'));
+    let max = parseInt($(this).attr('maxlength'));
     if($(this).val().length > max){
       $(this).val($(this).val().substr(0, $(this).attr('maxlength')));
     }
@@ -113,10 +113,10 @@
       background_load = typeof background_load !== 'undefined' ? background_load : false;
 
       // var response = new String(transport.responseText);
-      var match = response.match(/<div id=\"(.*?)\"/i); // what did I just load? parse out the first div id
+      let match = response.match(/<div id=\"(.*?)\"/i); // what did I just load? parse out the first div id
       if( match != null )
         {
-          var page = match[1];
+          let page = match[1];
           if (response.match(/<html/)) {
             alert("There was a problem loading that page. To work on other pages, please refresh the website.");
             document.location = document.location;
@@ -142,6 +142,7 @@
       background_load = typeof background_load !== 'undefined' ? background_load : false;
       validate_current_page = typeof validate_current_page !== 'undefined' ? validate_current_page : true;
 
+      let isValid;
       if (validate_current_page) {
         isValid = this.validatePage(this.current_page);   // mark current page as valid (or not) as we're leaving
       } else {
@@ -204,12 +205,13 @@
       if (typeof blocking == "undefined") blocking = false;
 
       // don't save more than once per second
-      timeNow = new Date();
-      if (typeof(lastSave) != "undefined" && lastSave && !force && (timeNow - lastSave < 1000)) {
+      let timeNow = new Date();
+      let lastSave;
+      if (typeof lastSave !== "undefined" && lastSave && !force && (timeNow - lastSave < 1000)) {
         return true;
       }
       lastSave = timeNow;
-      form_data = this.captureForm(page);
+      let form_data = this.captureForm(page);
       if( form_data ) {
         if( page.data('form_data') == null || page.data('form_data').data !== form_data.data || force === true) {  // if any changes
           page.data('form_data', form_data);
@@ -225,7 +227,7 @@
                  },
                  async: !blocking,
                  error: function() {
-                   save_fails = page.data('save_fails') == null ? 0 : page.data('save_fails');
+                   let save_fails = page.data('save_fails') == null ? 0 : page.data('save_fails');
                    save_fails += 1;
                    page.data('save_fails', save_fails)
 
@@ -263,9 +265,9 @@
 
     // serialize form data and extract url to post to
     captureForm : function(page) {      
-      form_el = $('#' + page.attr('id') + '-form');
+      let form_el = $('#' + page.attr('id') + '-form');
       if( form_el[0] == null ) return null;
-      form_all_el = form_el.find("input:not(.dont_submit), textarea:not(.dont_submit), select:not(.dont_submit)");
+      let form_all_el = form_el.find("input:not(.dont_submit), textarea:not(.dont_submit), select:not(.dont_submit)");
       return {url: form_el.attr('action'), data: form_all_el.serialize() + '&answer_sheet_type=' + answer_sheet_type};
     },
 
@@ -296,10 +298,10 @@
       if ($('#' + this.current_page + "-form").hasClass('no-validation')) { return; }
 
       try {
-        var li = $('#' + page + '-li');
-        var form = $('#' + page + '-form');
+        let li = $('#' + page + '-li');
+        let form = $('#' + page + '-form');
 
-        valid = form.valid();
+        let valid = form.valid();
 
         if (!page_classes_only) {
           // Move radio button errors up
@@ -339,10 +341,10 @@
       $('.page_link').each(function(index, page) {
         fe.pageHandler.validatePage($(page).attr('data-page-id'));
       });	
-      var all_valid = ($('#list-pages li.incomplete').length == 0);
+      let all_valid = ($('#list-pages li.incomplete').length == 0);
 
       // Make sure any necessary payments are made
-      var payments_made = $('.payment_question.required').length <= $('.payment').length
+      let payments_made = $('.payment_question.required').length <= $('.payment').length
 
 
       if(  payments_made)
@@ -353,10 +355,10 @@
           // submit the application
           if($('#submit_to')[0] != null)
             {
-              url = $('#submit_to').val();
+              let url = $('#submit_to').val();
               // clear out pages array to force reload.  This enables "frozen" apps
               //       immediately after submission - :onSuccess (for USCM which stays in the application vs. redirecting to the dashboard)
-              var curr = fe.pageHandler.current_page;
+              let curr = fe.pageHandler.current_page;
               $.ajax({url: url, dataType:'script',
                      data: {answer_sheet_type: answer_sheet_type, a: $('input[type=hidden][name=a]').val()},
                      type:'post', 
@@ -370,7 +372,7 @@
                      },
                      complete: function(xhr) {
                        $('body').trigger('ajax:complete', xhr);
-                       var btn = $('#submit_button'); 
+                       let btn = $('#submit_button');
                        if (btn) { btn.attr('disabled', false); }
                      }
               });
@@ -382,7 +384,7 @@
             $('#submit_message, .submit_message').html("Please make a payment");
             $('#submit_message, .submit_message').show();
 
-            var btn = $('#submit_button'); if (btn) { btn.attr('disabled', false); }
+            let btn = $('#submit_button'); if (btn) { btn.attr('disabled', false); }
           }
     },
 
@@ -393,7 +395,8 @@
     },
 
     checkConditional : function($element) {
-      matchable_answers = String($element.data('conditional_answer')).split(';').map(function(s) { return s.trim(); })
+      let vals;
+      let matchable_answers = String($element.data('conditional_answer')).split(';').map(function(s) { return s.trim(); })
       if ($element.hasClass('fe_choicefield') && ($element.hasClass('style_yes-no') || $element.hasClass('yes-no'))) {
         if ($(matchable_answers).filter([1, '1', true, 'true', 'yes', 'Yes']).length > 0) {
           matchable_answers = [1, '1', true, 'true', 'yes', 'Yes'];
@@ -409,7 +412,7 @@
       } else {
         vals = $([$element.find("input:visible, select:visible").val()]);
       }
-      match = $(matchable_answers).filter(vals).length > 0 || (matchable_answers == "" && vals.length == 0);
+      let match = $(matchable_answers).filter(vals).length > 0 || (matchable_answers == "" && vals.length == 0);
 
       switch ($element.data('conditional_type')) {
         case 'Fe::Element':
@@ -420,9 +423,9 @@
           }
           break;
         case 'Fe::Page':
-          prefix = $element.data('answer_sheet_id_prefix');
-          pg = prefix + '_' + $element.data('application_id') + '-fe_page_' + $element.data('conditional_id');
-          li_id = 'li#'+pg+'-li';
+          let prefix = $element.data('answer_sheet_id_prefix');
+          let pg = prefix + '_' + $element.data('application_id') + '-fe_page_' + $element.data('conditional_id');
+          let li_id = 'li#'+pg+'-li';
           li_id += ', li#'+pg+'-no_cache-li';
 
           if (match) {
@@ -439,9 +442,9 @@
     next : function(validate_current_page) {
       validate_current_page = typeof validate_current_page !== 'undefined' ? validate_current_page : false;
 
-      curr_page_link = $('#'+fe.pageHandler.current_page+"-link");
+      let curr_page_link = $('#'+fe.pageHandler.current_page+"-link");
       //fe.pageHandler.loadPage('application_22544-fe_page_165-no_cache','/fe/answer_sheets/22544/page/165/edit'); return false;
-      page_link = curr_page_link
+      let page_link = curr_page_link
         .parents('.application_section')
         .nextAll()
         .filter(function() { return $(this).find('a.page_link:visible').length > 0 })
@@ -452,9 +455,9 @@
     },
 
     prev : function() {
-      curr_page_link = $('#'+fe.pageHandler.current_page+"-link");
+      let curr_page_link = $('#'+fe.pageHandler.current_page+"-link");
       //fe.pageHandler.loadPage('application_22544-fe_page_165-no_cache','/fe/answer_sheets/22544/page/165/edit'); return false;
-      page_link = curr_page_link
+      let page_link = curr_page_link
         .parents('.application_section')
         .prevAll()
         .filter(function() { return $(this).find('a.page_link:visible').length > 0 })
@@ -474,15 +477,15 @@
   $(document).on('change', ".conditional select", function() { $(this).click(); });
 
   $(document).on('keyup', 'textarea[maxlength]', function() {
-    maxlength = parseInt($(this).attr('maxlength'));
-    remaining = maxlength - $(this).val().length;
+    let maxlength = parseInt($(this).attr('maxlength'));
+    let remaining = maxlength - $(this).val().length;
     $('#'+$(this).attr('id')+'_count').val(remaining);
   });
 
   $(document).on('click', 'a[disabled]', function(event) {
     event.preventDefault();
   });
-})(jQuery);
+});
 
 $(function() {
   fixGridColumnWidths();
@@ -492,7 +495,7 @@ $(function() {
 
 function updateTotal(id) {
   try {
-    total = 0;
+    let total = 0;
     $(".col_" + id).each(function(index, el) {
       total += Number($(el).val().replace(',',''));
     });
@@ -502,8 +505,8 @@ function updateTotal(id) {
 }
 
 function submitToFrame(id, url) {
-  form = $('<form method="post" action="'+url+'.js" endtype="multipart/form-data"></form>')
-  var csrf_token = $('meta[name=csrf-token]').attr('content'),
+  let form = $('<form method="post" action="'+url+'.js" endtype="multipart/form-data"></form>')
+  let csrf_token = $('meta[name=csrf-token]').attr('content'),
   csrf_param = $('meta[name=csrf-param]').attr('content'),
   dom_id = '#attachment_field_' + id,
   metadata_input = '<input name="'+csrf_param+'" value="'+csrf_token+'" type="hidden" />',
@@ -518,9 +521,11 @@ function submitToFrame(id, url) {
   return false
 }
 
-function scrollTo(el) {
-  if ($(el).length == 0) { return; }
-  $('html, body').animate({
-    scrollTop: $(el).offset().top
-  }, 1000);
+if (typeof scrollTo === 'undefined') {
+  function scrollTo(el) {
+    if ($(el).length == 0) { return; }
+    $('html, body').animate({
+      scrollTop: $(el).offset().top
+    }, 1000);
+  }
 }

data/app/assets/javascripts/fe/jquery.html5_upload.js

@@ -9,8 +9,8 @@
         function get_file_size(file) {
             return file.size || file.fileSize;
         }
-        var available_events = ['onStart', 'onStartOne', 'onProgress', 'onFinishOne', 'onFinish', 'onError'];
-        var options = $.extend({
+        let available_events = ['onStart', 'onStartOne', 'onProgress', 'onFinishOne', 'onFinish', 'onError'];
+        let options = $.extend({
             onStart: function(event, total) {
                 return true;
             },
@@ -82,14 +82,14 @@
         }, options);
 
         function upload( files ) {
-            var total = files.length;
-            var $this = $(this);
+            let total = files.length;
+            let $this = $(this);
             if (!$this.triggerHandler('html5_upload.onStart', [total])) {
                 return false;
             }
             this.disabled = true;
-            var uploaded = 0;
-            var xhr = this.html5_upload['xhr'];
+            let uploaded = 0;
+            let xhr = this.html5_upload['xhr'];
             this.html5_upload['continue_after_abort'] = true;
             function upload_file(number) {
                 if (number == total) {
@@ -101,7 +101,7 @@
                     }
                     return;
                 }
-                var file = files[number];
+                let file = files[number];
                 if (!$this.triggerHandler('html5_upload.onStartOne', [get_file_name(file), number, total])) {
                     return upload_file(number+1);
                 }
@@ -156,7 +156,7 @@
                 }
                 else {
                     if (window.FormData) {//Many thanks to scottt.tw
-                        var f = new FormData();
+                        let f = new FormData();
                         f.append(typeof(options.fieldName) == "function" ? options.fieldName() : options.fieldName, file);
                         options.extraFields = typeof(options.extraFields) == "function" ? options.extraFields() : options.extraFields;
                         $.each(options.extraFields, function(key, val){
@@ -165,12 +165,12 @@
                         xhr.send(f);
                     }
                     else if (file.getAsBinary) {//Thanks to jm.schelcher
-                        var boundary = '------multipartformboundary' + (new Date).getTime();
-                        var dashdash = '--';
-                        var crlf     = '\r\n';
+                        let boundary = '------multipartformboundary' + (new Date).getTime();
+                        let dashdash = '--';
+                        let crlf     = '\r\n';
 
                         /* Build RFC2388 string. */
-                        var builder = '';
+                        let builder = '';
 
                         builder += dashdash;
                         builder += boundary;
@@ -179,7 +179,7 @@
                         builder += 'Content-Disposition: form-data; name="'+(typeof(options.fieldName) == "function" ? options.fieldName() : options.fieldName)+'"';
 
                         //thanks to oyejo...@gmail.com for this fix
-                        fileName = unescape(encodeURIComponent(get_file_name(file))); //encode_utf8
+                        let fileName = unescape(encodeURIComponent(get_file_name(file))); //encode_utf8
 
                         builder += '; filename="' + fileName + '"';
                         builder += crlf;
@@ -212,7 +212,7 @@
 
         try {
             return this.each(function() {
-                var file_input = this;
+                let file_input = this;
                 this.html5_upload = {
                     xhr:                    new XMLHttpRequest(),
                     continue_after_abort:    true
@@ -222,7 +222,7 @@
                         upload.call( e.target, this.files );
                     });
                 }
-                var self = this;
+                let self = this;
                 $.each(available_events, function(event) {
                     if (options[available_events[event]]) {
                         $(self).bind("html5_upload."+available_events[event], options[available_events[event]]);

data/app/assets/javascripts/fe/jquery.metadata.js

@@ -69,28 +69,28 @@ $.extend({
 			this.defaults.name = name;
 		},
 		get: function( elem, opts ){
-			var settings = $.extend({},this.defaults,opts);
+			let settings = $.extend({},this.defaults,opts);
 			// check for empty string in single property
 			if ( !settings.single.length ) settings.single = 'metadata';
-			
-			var data = $.data(elem, settings.single);
+
+			let data = $.data(elem, settings.single);
 			// returned cached data if it already exists
 			if ( data ) return data;
 			
 			data = "{}";
 			
 			if ( settings.type == "class" ) {
-				var m = settings.cre.exec( elem.className );
+				let m = settings.cre.exec( elem.className );
 				if ( m )
 					data = m[1];
 			} else if ( settings.type == "elem" ) {
 				if( !elem.getElementsByTagName )
 					return undefined;
-				var e = elem.getElementsByTagName(settings.name);
+				let e = elem.getElementsByTagName(settings.name);
 				if ( e.length )
 					data = $.trim(e[0].innerHTML);
 			} else if ( elem.getAttribute != undefined ) {
-				var attr = elem.getAttribute( settings.name );
+				let attr = elem.getAttribute( settings.name );
 				if ( attr )
 					data = attr;
 			}