From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 15 Jul 2014 20:36:17 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2:web/BigFore into develop
X-Git-Tag: v1.0^2~12
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=a36b2b712d84e93f05d50be473bbcddb4d6aacf3;p=web%2FBigFore.git

Merge branch 'develop' of cvs2:web/BigFore into develop

Conflicts:
	libjs/golfersSelect.js
	priceQuoteForm.inc
---

a36b2b712d84e93f05d50be473bbcddb4d6aacf3
diff --cc libjs/golfersSelect.js
index c1d7e7f,e0843a4..ff1812c
--- a/libjs/golfersSelect.js
+++ b/libjs/golfersSelect.js
@@@ -1,5 -1,5 +1,6 @@@
  /*	=========================	*/
 -//	This script is for the No. Golfers select bug on 
 +//	This script is for the No. Golfers select bug on
++//	This script is for the No. Golfers select bug on
  //	the 3rd page of the price quote form.
  //	basically pear isn't setting defaults to the elements
  //	in the element grid if its within a controller page (multipage form controller)
@@@ -77,7 -77,4 +78,6 @@@ var golfersSelect 
  	}
  };
  
 -Event.observe(window, 'load', golfersSelect.init);
 +$(function(){
 +    golfersSelect.init();
 +});
- //Event.observe(window, 'load', golfersSelect.init);