Commit a68dee97 by Don Mitchell

Got rid of datepair as it was generating a jquery bug but also not

doing what we wanted.
parent 54cc8760
...@@ -126,13 +126,16 @@ CMS.Views.Settings.Details = Backbone.View.extend({ ...@@ -126,13 +126,16 @@ CMS.Views.Settings.Details = Backbone.View.extend({
var div = this.$el.find(elementName); var div = this.$el.find(elementName);
var datefield = $(div).find(".date"); var datefield = $(div).find(".date");
var timefield = $(div).find(".time"); var timefield = $(div).find(".time");
var savefield = function(event) { var savefield = function() {
cacheModel.save(fieldName, new Date(datefield.datepicker('getDate').getTime() cacheModel.save(fieldName, new Date(datefield.datepicker('getDate').getTime()
+ timefield.timepicker("getSecondsFromMidnight") * 1000)); + timefield.timepicker("getSecondsFromMidnight") * 1000));
}; };
// instrument as date and time pickers
timefield.timepicker();
// FIXME being called 2x on each change. Was trapping datepicker onSelect b4 but change to datepair broke that // FIXME being called 2x on each change. Was trapping datepicker onSelect b4 but change to datepair broke that
datefield.on('change', savefield); datefield.datepicker({ onSelect : savefield });
timefield.on('changeTime', savefield); timefield.on('changeTime', savefield);
datefield.datepicker('setDate', this.model.get(fieldName)); datefield.datepicker('setDate', this.model.get(fieldName));
......
...@@ -216,20 +216,20 @@ from contentstore import utils ...@@ -216,20 +216,20 @@ from contentstore import utils
<span class="detail">Important steps and segments of your course</span> <span class="detail">Important steps and segments of your course</span>
</header> </header>
<div class="row row-col2 datepair"> <div class="row row-col2">
<h4 class="label">Course Dates:</h4> <h4 class="label">Course Dates:</h4>
<div class="field"> <div class="field">
<div class="input multi multi-inline" id="course-start"> <div class="input multi multi-inline" id="course-start">
<div class="group"> <div class="group">
<label for="course-start-date">Start Date</label> <label for="course-start-date">Start Date</label>
<input type="text" class="start-date date start" id="course-start-date" placeholder="MM/DD/YYYY" autocomplete="off"> <input type="text" class="start-date date start datepicker" id="course-start-date" placeholder="MM/DD/YYYY" autocomplete="off">
<span class="tip tip-stacked">First day the course begins</span> <span class="tip tip-stacked">First day the course begins</span>
</div> </div>
<div class="group"> <div class="group">
<label for="course-start-time">Start Time</label> <label for="course-start-time">Start Time</label>
<input type="text" class="time start" id="course-start-time" value="" placeholder="HH:MM" autocomplete="off"> <input type="text" class="time start timepicker" id="course-start-time" value="" placeholder="HH:MM" autocomplete="off">
<span class="tip tip-stacked">(UTC/GMT -5 hours)</span> <span class="tip tip-stacked">(UTC/GMT -5 hours)</span>
</div> </div>
</div> </div>
...@@ -252,7 +252,7 @@ from contentstore import utils ...@@ -252,7 +252,7 @@ from contentstore import utils
</div> </div>
</div> </div>
<div class="row row-col2 datepair"> <div class="row row-col2">
<h4 class="label">Enrollment Dates:</h4> <h4 class="label">Enrollment Dates:</h4>
<div class="field"> <div class="field">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment