fe 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab8bef6577ff95fc7c33695a64217ca1436844ae
-  data.tar.gz: bf3d6f5eac700ce6c9d2185aa0a655f3825f100a
+  metadata.gz: 7be29ca99d6897702864247f44659b07068b917d
+  data.tar.gz: 3a4b5b1401e357ca9b4fdd5a9d65c49083fbda89
 SHA512:
-  metadata.gz: cd8180a211513f1651368c173d330fd22a8a25b5837a6ccf56e302db02c48416adb962eed75af11c9b728cd4f26259352fc32d124581cf7f0e519e74fe884d6c
-  data.tar.gz: 113bd04128aa3e34002305267127fab5e43b3741a4686c49228d560f73535cf9117390faaaa90ed9b1756ea494eee3357900730fa2980058bffe18bdf0a0ae53
+  metadata.gz: f480268cc6bac72b46ff5e19debbd5114997f39cba51f48e57972b84fae257e3ad7289c6af4c890f7a159dedb97f88d1c98c6828e1286f1e23a83f7d289668ac
+  data.tar.gz: ffa4819032a0495515a75d28e83bb2bc3e6d26615046b26fd4a6fd10bc90fb3e35c9984792d912e11c7e9a3a9e3e3639a86a9fa41f2686e1ee32d6b4a7d3694e

data/Rakefile

@@ -4,54 +4,34 @@ require 'thor'
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake' if File.exists? 'spec/dummy/Rakefile'
 
-
 Bundler::GemHelper.install_tasks
 
-ENV['ENGINE'] = 'fe_engine'
-
 require "rspec/core/rake_task" 
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  unless File.directory?("spec/dummy")
-    Rake::Task['dummy:app'].invoke unless ENV['SKIP_DUMMY_APP']
-  end
   spec.rspec_opts = "-I #{File.expand_path('../spec/', __FILE__)}"
   spec.pattern = FileList[File.expand_path('../spec/**/*_spec.rb', __FILE__)]
 end
 task default: :spec
 
-
-require 'rails/dummy/tasks'
-
-# ENV['ENGINE']
-# ENV['TEMPLATE']
-
-task :setup_dummy_app do 
-  # Nuke any previous testing envs (for local development purposes).
-  FileUtils.remove_dir("spec/dummy", force=true) if Dir.exists? "spec/dummy"
-  
-  # Use system here (rather than Rake::Task['task'].invoke) so a new rails env
-  # is created, in which the dummy app's module name is no longer present.
-  # If we did, Rake::Task["task"].invoke, the dummy app would not be created
-  # because the "deleted" spec/dummy would still have it's "Dummy" rails app 
-  # name in the Ruby VM environment.
-  #
-  system({"DISABLE_MIGRATE" => "true", 
-          "DISABLE_CREATE" => "true"}, "rake dummy:app")
-  
-  # Bring in the customized mysql/postgres testing database.yml.
-  database_path = "spec/dummy/config/database.yml"
-  File.delete(database_path) if File.exists?(database_path)
-  FileUtils.cp("spec/support/database.txt", database_path)
-  
-  Rake::Task["install_engine"].invoke
-end
-
-task :install_engine do 
+task :setup_db do
   # Use system so that we load the dummy app's Rake commands.
 
   # Drop any existing db so that it is recreated; Hide output so there's no stack trace if the db doesn't exist
-  system('cd spec/dummy && rake db:drop >/dev/null 2>&1')
+  system('cd spec/dummy && RAILS_ENV=test bundle exec rake db:drop >/dev/null 2>&1')
   
   # Use system so that we funcitonally test the install generator.
-  system("cd spec/dummy && rake db:create && rake db:migrate && rake db:test:prepare")
+  system("cd spec/dummy && RAILS_ENV=test bundle exec rake db:create && RAILS_ENV=test bundle exec rake db:migrate")
+end
+
+require 'rails/dummy/tasks'
+
+task :skip_concerns do
+  ENV['SKIP_CONCERNS'] = 'true'
 end
+task :skip_decorators do
+  ENV['SKIP_DECORATORS'] = 'true'
+end
+
+task :spec => [ :skip_concerns, :skip_decorators ]
+
+

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

@@ -1,4 +1,3 @@
 //= require fe/fe.common.js
 //= require fe/fe.admin.js
 //= require fe/jquery.scrollTo-min.js
-//= require fe/rails.extra.js

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

@@ -1,11 +1,29 @@
 $(function() {
-	$('#status').ajaxStart(function() {
-		$(this).show();
-	}).ajaxComplete(function() {
-		$(this).hide();
+  setUpJsHelpers();
+	$(document).on('ajaxStart', function() {
+		$('#status').show();
+	}).on('ajaxComplete', function() {
+		$('#status').hide();
 		setUpJsHelpers();
 	});
-	
+
+  $(document).on('click', '.link-show-xml', function() {
+    div = $(this).closest('.choices_section')
+    $('.xmlChoices', div).show();
+    $('.link-show-csv', div).show();
+    $('.link-show-xml', div).hide();
+    $('.csvChoices', div).hide();
+  });
+
+  $(document).on('click', '.link-show-csv', function() {
+    div = $(this).closest('.choices_section')
+    $('.csvChoices', div).show();
+    $('.link-show-xml', div).show();
+    $('.link-show-csv', div).hide();
+    $('.xmlChoices', div).hide();
+  });
+
+
 	$(document).on('click', '.lbOn', function() {
 		if ($('#dialog-help')[0] == null) {
 			$('body').append('<div id="dialog-help" style="display:none" title="Help!"><p><span id="dialog-help-message"></span></p></div>');
@@ -24,7 +42,7 @@ $(function() {
 		});
 		return false;
 	});
-	
+
 	$(document).on('click', '.close_prop', function() {
   	$('#element_form_' + $(this).attr('data-dom_id')).hide();
 	  $('#element_' + $(this).attr('data-dom_id')).show();
@@ -33,9 +51,12 @@ $(function() {
 
 	$(document).on('click', 'input[name=future_affect][type=radio]', function() {
     if ($(this).val() == "yes") {
-      $(".future_answer, .future_target").show();
+      $(".future_answer, .future_target, .future_page").show();
     } else if ($(this).val() == "no") {
-      $(".future_answer, .future_target").hide();
+      $(".future_answer, .future_target, .future_page").hide();
+      $('#element_conditional_id').val('');
+      $(".future_target input").removeAttr("checked");
+      $("#element_conditional_type_").attr("checked", "checked");
     }
   });
 
@@ -55,6 +76,9 @@ function switchTab(toTab) {
   if(currentTab != null) $('#tab-' + currentTab).removeClass('active');
   $('#tab-' + toTab).addClass('active');
   currentTab = toTab;
+  if (toTab == 'pages_list') {
+    setUpSortables();
+  }
 }
 
 function selectPage() {
@@ -62,7 +86,7 @@ function selectPage() {
     clearCurrentElement();
     el.addClass('active');
     switchTab('properties');
-    
+
     if($('#page_label').length > 0) $('#page_label').focus();
 }
 
@@ -74,12 +98,12 @@ function selectElement(id) {
     // snapElementProperties(el);
     activeElement = id;
     switchTab('properties');
-    
+
     // if( $('#element_label')) $('#element_label').focus();
 }
 
 function clearCurrentElement() {
-    if (activeElement != '' && $(activeElement)) { 
+    if (activeElement != '' && $(activeElement)) {
         $(activeElement).removeClass('active');
     }
 }
@@ -94,8 +118,8 @@ function snapElementProperties(el) {
     $('#panel-properties-element').css({'margin-top': propsTop});
 }
 
-function scrollToElement(id) { 
-    $(id).scrollTo(); 
+function scrollToElement(id) {
+    $(id).scrollTo();
 }
 
 function addError(id) {
@@ -107,10 +131,10 @@ function updateSlug(source, dest) {
   label = $F(source)
   slug = $F(dest)
   if( label == null || slug == null) return;  // oh oh
-  
+
   label = label.strip();
   slug = slug.strip();
-  
+
   if( label != '' && slug == '' ) {  // if slug is empty lets copy label to it
     slug = label.toLowerCase();
     slug = slug.gsub(/[^a-z0-9]/, '_');   // only alpha-numeric
@@ -118,7 +142,7 @@ function updateSlug(source, dest) {
     slug = slug.gsub(/_$/, '');           // remove trailing underscores
     slug = slug.gsub(/^([0-9])/, '_\1')   // can't begin with a digit, so preprend an underscore
     if( slug.length > 36 ) slug = slug.slice(0, 36)  // max length
-    
+
     $(dest).value = slug
     $(dest).focus();
   }

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

@@ -1,35 +1,69 @@
 function setUpSortables() {
-	$('[data-sortable]').sortable({axis:'y', 
-																  dropOnEmpty:false, 
+	$('[data-sortable]').sortable({axis:'y',
+                                  items: '> li.sortable',
+																  dropOnEmpty:false,
 																  update: function(event, ui) {
 																		sortable = this;
 																		$.ajax({data:$(this).sortable('serialize',{key:sortable.id + '[]'}),
-																						complete: function(request) {$(sortable).effect('highlight')}, 
-																						success:function(request){$('#errors').html(request)}, 
-																						type:'POST', 
+																						complete: function(request) {$(sortable).effect('highlight')},
+																						success:function(request){$('#errors').html(request)},
+																						type:'POST',
 																						url: $(sortable).attr('data-sortable-url')
 																					 })
-																		}
+																		},
+                                  stop: function(event, ui) {
+                                    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'));
+                                    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',
+    hoverClass: 'droppable-hover',
 		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")
+      if ($container.length == 1) {
+        $container.parent().find('li.around-container[data-element_id="'+$container.data('element_id')+'"]').addClass('droppable-active')
+      } else {
+        $('li.around-container').removeClass('droppable-active');
+      }
+    },
+    deactivate: function( event, ui ) {
+      $draggable = ui.draggable;
+      $container = $draggable.parents("li.element.container")
+      if ($container.length == 1) {
+        $container.parent().find('li.around-container[data-element_id="'+$container.data('element_id')+'"]').removeClass('droppable-active')
+      } else {
+        $('li.around-container').removeClass('droppable-active');
+      }
+    }
 	});
 }
 
 function setUpCalendars() {
 	now = new Date();
 	year = now.getFullYear() + 10;
-	$('[data-calendar]').datepicker({changeYear:true,
-																	 yearRange: '1950:' + year})
+	$('[data-calendar]').datepicker({
+    changeYear:true,
+		yearRange: '1950:' + year,
+    dateFormat: 'yy-mm-dd'
+  })
 }
 
 function setUpJsHelpers() {
@@ -37,7 +71,7 @@ function setUpJsHelpers() {
 		// Sortable
 		setUpSortables();
 		// ==================
-		
+
 		// ==================
 		// Calendar
 		setUpCalendars();
@@ -50,8 +84,8 @@ function fixGridColumnWidths() {
 		num_columns = $(grid).find("th").length;
 		if (num_columns > 0) {
 			width = (100 / num_columns) + "%";
-			$(grid).find("th").css("width", width);
-			$(grid).find("td").css("width", width);
+			$(grid).find("> tbody > tr > th").css("width", width);
+			$(grid).find("> tbody > tr > td").css("width", width);
 		}
 	});
 };

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

@@ -1,419 +1,6 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery-ui
-//= require fe/fe.common.js
 //= require fe/jquery.scrollTo-min.js
-//= require fe/rails.extra.js
 //= require fe/jquery.validate.pack.js
-
-// used by answer sheets
-
-(function($) {
-  //debugger;
-	$(function() {
-
-		$(document).on('click', '.save_button', function() {
-			$.fe.pageHandler.savePage($(this).closest('.answer-page'), true);
-		});
-		
-    //debugger;
-		$(document).on('keydown', '#payment_staff_first, #payment_staff_last', function(e) {
-      //debugger;
-			if (e.which == 13) {
-        console.log('staff_search click');
-				$('#staff_search').trigger('click');
-				return false;
-			}
-			
-		});
-		$(document).on('click', '.reference_send_invite', function() {
-            var el = this;
-			var data = $(el).closest('form').serializeArray();
-
-			data.push({name: 'answer_sheet_type', value: answer_sheet_type});
-      $.ajax({url: $(el).attr('href'), data: data, dataType: 'script',  type: 'POST',
-                        beforeSend: function (xhr) {
-                            $('body').trigger('ajax:loading', xhr);
-                        },
-                        complete: function (xhr) {
-                            $('body').trigger('ajax:complete', xhr);
-                        },
-                        error: function (xhr, status, error) {
-                            $('body').trigger('ajax:failure', [xhr, status, error]);
-                        }
-										});
-			return false;
-		});
-		$(document).on('focus', 'textarea[maxlength]', function() {
-			var 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'));
-			if($(this).val().length > max){
-				$(this).val($(this).val().substr(0, $(this).attr('maxlength')));
-			}
-			$(this).parent().find('.charsRemaining').html('You have ' + (max - $(this).val().length) + ' characters remaining');
-		}).on('blur', 'textarea[maxlength]', function() {
-			$(this).parent().find('.charsRemaining').html('');
-		});
-		
-    // Payment submission
-    $(document).on('click', '.submit_payment', function() {
-      var form = $(this).closest('form');
-      $this = $(this);
-      $.ajax({url: $(this).attr('data-url'), data: form.serializeArray(), type: 'POST', dataType:'script',
-             beforeSend: function (xhr) {
-               $('body').trigger('ajax:loading', xhr);
-               if ($this.data('disable-with') !== null) {
-                 $this.attr('disabled','disabled');
-                 $this.data('enabled-text', $(this).html());
-                 $this.attr('value', $this.data('disable-with'));
-               }
-             },
-             complete: function (xhr) {
-               $('body').trigger('ajax:complete', xhr);
-               $this.removeAttr('disabled');
-               $this.attr('value', $this.data('enabled-text'));
-             },
-             error: function (xhr, status, error) {
-               $('body').trigger('ajax:failure', [xhr, status, error]);
-               $this.removeAttribute('disabled');
-               $this.attr('value', $this.data('enabled-text'));
-             }
-      });
-      return false;
-    });
-
-	});
-	$.fe = {};
-	$.fe.pageHandler = {
-	  initialize : function(page) {
-	    this.auto_save_frequency = 30;  // seconds
-	    this.timer_id = null;
-		  this.suspendLoad = false;
-    
-	    this.current_page = page;
-			$('#' + page).data('form_data', this.captureForm($('#' + page)));
-	    this.registerAutoSave();
-    
-	    this.page_validation = {};  // validation objects for each page
-	    this.enableValidation(page);
-    
-	    // this.background_load = false;
-	    // this.final_submission = false;
-	  },
-  
-	  // swap to a different page
-	  showPage : function(page) {
-	    // hide the old
-	    $('#' + this.current_page + '-li').removeClass('active'); 
-	    $('#' + this.current_page).hide();
-  
-			// HACK: Need to clear the main error message when returning to the submit page
-			//       It is very confusing to users to be there when they revisit the page
-			if ((page=='submit_page') && ($('#submit_message')[0] != null)) $('#submit_message').hide(); 
-			if ((page=='submit_page') && ($('#application_errors')[0] != null)) $('#application_errors').html('');
-
-	    // show the new
-			// $('#' + page + '-li').removeClass('incomplete');
-			// $('#' + page + '-li').removeClass('valid');
-			$('#' + page + '-li').addClass('active');
-	    $('#' + page).show();
-	    this.current_page = page;
-	    this.registerAutoSave(page);
-	    this.suspendLoad = false;
-	    fixGridColumnWidths();
-	  },
-  
-	  // callback onSuccess
-	  pageLoaded : function(response) {
-	    // var response = new String(transport.responseText);
-	    var match = response.match(/<div id=\"(.*?)\"/i); // what did I just load? parse out the first div id
-	    if( match != null )
-	    {
-	      var page = match[1];
-	      $('#preview').append(response);
-	      // if(this.background_load) $('#' + page).hide(); else 
-				$.fe.pageHandler.showPage(page);  // show after load, unless loading in background
-				setUpJsHelpers();
-	      $.fe.pageHandler.enableValidation(page);
-				// $.fe.pageHandler.validatePage('#' + page);
-				$('#' + page).data('form_data', $.fe.pageHandler.captureForm($('#' + page)));
-	    }
-			$('#page_ajax_spinner').hide();
-			$('.reference_send_invite').button();
-			updateTotals();
-	  },
-  
-	  loadPage : function(page, url) {
-	    if (!this.suspendLoad) {
-				this.suspendLoad = true; // don't load a page if one is currently loading (prevent double-click behavior where two pages end up visible!)
-		
-				this.unregisterAutoSave();  // don't auto-save while loading/saving
-			      // will register auto-save on new page once loaded/shown
-	    
-				$.scrollTo('#main');
-
-		    this.validatePage(this.current_page);   // mark current page as valid (or not) as we're leaving
-	    
-		    this.savePage();
-	
-		    if( $.fe.pageHandler.isPageLoaded(page) && page.match('no_cache') == null )   // if already loaded (element exists) excluding pages that need reloading
-		    {
-		      $.fe.pageHandler.showPage(page);
-					$('#page_ajax_spinner').hide();
-		    }
-		    else
-		    {
-					$.ajax({
-             url: url,
-             type: 'GET',
-						 data: {'answer_sheet_type':answer_sheet_type},
-						 success: $.fe.pageHandler.pageLoaded,
-             error: function (xhr, status, error) {
-                alert("There was a problem loading that page. We've been notified and will fix it as soon as possible. To work on other pages, please refresh the website.");
-								document.location = document.location;
-             },
-             beforeSend: function (xhr) {
-                 $('body').trigger('ajax:loading', xhr);
-             },
-             complete: function (xhr) {
-                 $('body').trigger('ajax:complete', xhr);
-             }
-         });
-		      // new Ajax.Request(url, {asynchronous:true, evalScripts:false, method:'get', 
-		      //     onSuccess:this.pageLoaded.bind(this)});
-		    }
-			}
-	  },
-  
-	  // save form if any changes were made
-	  savePage : function(page, force) {  
-			if (page == null) page = $('#' + this.current_page);
-      // don't save more than once per second
-      timeNow = new Date();
-      if (typeof(lastSave) != "undefined" && lastSave && !force && (timeNow - lastSave < 1000)) {
-        return true;
-      }
-      lastSave = timeNow;
-      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);
-          $.ajax({url: form_data.url, type: 'put', data: form_data.data,  
-                 beforeSend: function (xhr) {
-                   $('#spinner_' + page.attr('id')).show();
-                 },
-                 complete: function (xhr) {
-                   $('#spinner_' + page.attr('id')).hide();
-                 },
-                 error: function() {
-                   page.data('form_data', null);    // on error, force save for next call to save
-                   // WARNING: race conditions with load & show?
-                   // sort of a mess if save fails while another page is already loading!!
-                 }});
-        }
-      }
-      // Update last saved stamp
-    },
-		
-		savePages : function(force) {
-			$('.answer-page').each(function() {$.fe.pageHandler.savePage($(this), force)})
-		},
-  
-	  // setup a timer to auto-save (only one timer, for the page being viewed)
-	  registerAutoSave: function(page) {
-	    this.timer_id = setInterval(this.savePages, this.auto_save_frequency * 1000);
-	  },
-  
-	  unregisterAutoSave: function() {
-	    if( this.timer_id != null ) 
-	    {
-	      clearInterval(this.timer_id);
-	      this.timer_id = null;
-	    }
-	  },
-  
-	  // serialize form data and extract url to post to
-	  captureForm : function(page) {      
-	    form_el = $('#' + page.attr('id') + '-form');
-	    if( form_el[0] == null ) return null;
-			return {url: form_el.attr('action'), data: form_el.serialize() + '&answer_sheet_type=' + answer_sheet_type};
-	  },
-  
-  
-	  // enable form validation (when form is loaded)
-	  enableValidation : function(page) {
-	    $('#' + page + '-form').validate({onsubmit:false, focusInvalid:true, onfocusout: function(element) { this.element(element);}});  
-	    // $('#' + page + '-form').valid();  
-	  },
-  
-	  validatePage : function(page) {
-			try {
-			  var li = $('#' + page + '-li');
-			  var form = $('#' + page + '-form');
-
-		    valid = form.valid();
-				// Move radio button errors up
-				$('input[type=radio].error').closest('tr').addClass('error');
-				$('.choice_field input[type=radio].error').removeClass('error')
-					.closest('.choice_field')
-					.addClass('error');
-				$('div.yesno label.error').hide();
-				
-		    if(valid)  {  
-		      el.removeClass('incomplete');
-				  el.addClass('complete');
-		    } else {
-				  el.removeClass('complete');
-		      el.addClass('incomplete');
-		    }
-		    return valid;
-			}
-			catch(err) {
-			
-				// If the user clicks too quickly, sometimes the page element isn't properly defined yet.
-				// If we don't catch the error, js stops execution. If we catch it, the user just has to click again.
-			}
-			$('page_ajax_spinner').hide();
-	  },
-  
-  // callback when falls to 0 active Ajax requests
-  completeAll : function()
-  {
-		$('#submit_button').attr('disabled', true)
-		$('#submit_message').html('');
-		$('#submit_message').hide();
-		// validate all the pages
-  	$('.page_link').each(function(index, page) {
-			$.fe.pageHandler.validatePage($(page).attr('data-page-id'));
-		});	
-		var all_valid = ($('#list-pages li.incomplete').length == 0);
-		
-		// Make sure any necessary payments are made
-		var payments_made = $('.payment_question.required').length <= $('.payment').length
-		
-		
-		if(  payments_made)
-		{
-		  this.savePage($('#' + $.fe.pageHandler.current_page));  // in case any input fields on submit_page
-  
-		  // submit the application
-		  if($('#submit_to')[0] != null)
-		  {
-		    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;
-			  $.ajax({url: url, dataType:'script',
-			 		data: {answer_sheet_type: answer_sheet_type},
-					type:'post', 
-					beforeSend: function(xhr) {
-          	$('body').trigger('ajax:loading', xhr);
-					},
-					success: function(xhr) {
-						$('#list-pages a').each(function() { 
-						  if ($(this).attr('data-page-id') != curr) $('#' + $(this).attr('data-page-id')).remove();
-						})
-					},
-					complete: function(xhr) {
-            $('body').trigger('ajax:complete', xhr);
-		  			var btn = $('#submit_button'); 
-						if (btn) { btn.attr('disabled', false); }
-					}
-				});
-		  }
-		}
-		else
-		{
-		  // some pages aren't valid
- 	    $('#submit_message').html("Please make a payment"); 
-		  $('#submit_message').show();
-  
-		  var btn = $('#submit_button'); if (btn) { btn.attr('disabled', false); }
-		}
-  },
-  
-    // is page loaded? (useful for toggling enabled state of questions)
-    isPageLoaded : function(page)
-    {
-      return $('#' + page)[0] != null
-    },
-
-    checkConditional : function($element_li) {
-      matchable_answers = String($element_li.data('conditional_answer')).split(',').map(function(s) { return s.trim(); })
-      if ($element_li.hasClass('fe::choicefield') && $element_li.hasClass('yes-no')) {
-        if ($(matchable_answers).filter([1, '1', true, 'true', 'yes']).length > 0) {
-          matchable_answers = [1, '1', true, 'true', 'yes'];
-        }
-        vals = $([$element_li.find("input[type=radio]:checked").val()]);
-      } else if ($element_li.hasClass('fe::choicefield') && $element_li.hasClass('checkbox')) {
-        vals = $element_li.find("input[type=checkbox]:checked").map(function(i, el) { return $(el).val(); });
-      } else {
-        vals = $([$element_li.find("input:visible, select:visible").val()]);
-      }
-      match = $(matchable_answers).filter(vals).length > 0;
-
-      console.log('checkConditional match: ' + match);
-
-      switch ($element_li.data('conditional_type')) {
-        case 'Fe::Element':
-          if (match) {
-            $("#element_" + $element_li.data('conditional_id')).show(); 
-          } else {
-            $("#element_" + $element_li.data('conditional_id')).hide();
-          }
-        case 'Fe::Page':
-          li_id = "li#fe_application_" + $element_li.data('application_id') + '-fe_page_' + $element_li.data('conditional_id') + '-li';
-          if (match) {
-            $(li_id).show();
-          } else {
-            $(li_id).hide();
-          }
-      }
-    }
-
-  };
-
-  $(document).on('click', "li.conditional input, li.conditional select", function() {
-    console.log('click');
-    $.fe.pageHandler.checkConditional($(this).closest('li'));
-  });
-  $(document).on('keyup', "li.conditional input, li.conditional select", function() { $(this).click(); });
-  $(document).on('blug', "li.conditional input, li.conditional select", function() { $(this).click(); });
-  $(document).on('change', "li.conditional select", function() { $(this).click(); });
-
-})(jQuery);
-
-$(function() {
-	fixGridColumnWidths();
-});
-
-
-function updateTotal(id) {
-	try {
-		total = 0;
-		$(".col_" + id ).each(function(e) {
-		  total += Number(e.val());
-		});
-		$('#total_' + id).val(total);
-	} catch(e) {}
-}
-
-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'),
-      csrf_param = $('meta[name=csrf-param]').attr('content'),
-			dom_id = '#attachment_field_' + id,
-			metadata_input = '<input name="'+csrf_param+'" value="'+csrf_token+'" type="hidden" />',
-			file_field = '<input type="file" name="answers['+ id + ']>';
-	if ($(dom_id).val() == '')	return;
-  form.hide()
-      .append(metadata_input)
-      .append(file_field)
-      .appendTo('body');
-	$(dom_id + "-spinner").show();
-  form.submit();
-	return false
-}
+//= require fe/fe.public.nojquery.js