Merge branch '3.0.2-wip' of github.com:ExactTarget/fuelux into 3.0.2-wip

ExactTarget · Sep 12, 2014 · 49f9186 · 49f9186
2 parents d285a61 + 4728028
commit 49f9186
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/js/scheduler.js b/js/scheduler.js
@@ -75,7 +75,7 @@
 		else {
 			this.$repeatIntervalSpinbox.spinbox({ 'min': 1 });
 		}
-		this.$endAfter.spinbox();
+		this.$endAfter.spinbox({ 'value': 1, 'min': 1 });
 		this.$endDate.datepicker();
 		this.$element.find('.radio-custom').radio();
 
@@ -451,14 +451,14 @@
 					}
 					item = 'weekly';
 				}else if(recur.FREQ==='MONTHLY'){
-					this.$element.find('.repeat-monthly input').removeClass('checked');
+					this.$element.find('.repeat-monthly input, .repeat-monthly label.radio-custom').removeClass('checked');
 					if(recur.BYMONTHDAY){
 						temp = this.$element.find('.repeat-monthly-date');
-						temp.find('input').addClass('checked');
-						temp.find('.select').selectlist('selectByValue', recur.BYMONTHDAY);
+						temp.find('input, label.radio-custom').addClass('checked');
+						temp.find('.selectlist').selectlist('selectByValue', recur.BYMONTHDAY);
 					}else if(recur.BYDAY){
 						temp = this.$element.find('.repeat-monthly-day');
-						temp.find('input').addClass('checked');
+						temp.find('input, label.radio-custom').addClass('checked');
 						if(recur.BYSETPOS){
 							temp.find('.month-day-pos').selectlist('selectByValue', recur.BYSETPOS);
 						}

diff --git a/markup/scheduler.html b/markup/scheduler.html
@@ -513,7 +513,7 @@ <h2 class="header">Year</h2>
 					<li data-value="2"><a href="#">Second</a></li>
 					<li data-value="3"><a href="#">Third</a></li>
 					<li data-value="4"><a href="#">Fourth</a></li>
-					<li data-value="5"><a href="#">Last</a></li>
+					<li data-value="-1"><a href="#">Last</a></li>
 				</ul>
 				<input type="text" aria-hidden="true" readonly="readonly" name="yearlyDateSelectlist" class="hidden hidden-field">
 			</div>