Skip to content

E
edx-platform
Commit 8102bd51 by Peter Pinch
Options

Merge pull request #10906 from mitocw/refactor/aq/spacing_indentation_in_schedule.js 

Refactoring: Fixed indentation in ccx/schedule.js plus path of momemt.js for requireJs
parents f3285f78 a02ca255
Showing with 41 additions and 50 deletions
lms/static/js/ccx/schedule.js
......@@ -5,7 +5,6 @@ var edx = edx || {};
edx.ccx = edx.ccx || {};
edx.ccx.schedule = edx.ccx.schedule || {};
var self;
edx.ccx.schedule.reloadPage = function() {
......@@ -21,15 +20,12 @@ var edx = edx || {};
category: '',
hidden: false,
children: []
},
}
});
edx.ccx.schedule.Schedule = Backbone.Collection.extend({
model: edx.ccx.schedule.UnitModel,
url: 'ccx_schedule'
});
edx.ccx.schedule.ScheduleView = Backbone.View.extend({
......@@ -66,8 +62,7 @@ var edx = edx || {};
$('#add-unit-button').prop('disabled', false);
self.set_datetime('start', chapter.start);
self.set_datetime('due', chapter.due);
}
else {
} else {
self.sequential_select.html('').prop('disabled', true);
}
});
......@@ -83,8 +78,7 @@ var edx = edx || {};
self.vertical_select.prop('disabled', false);
self.set_datetime('start', sequential.start);
self.set_datetime('due', sequential.due);
}
else {
} else {
self.vertical_select.html('').prop('disabled', true);
}
});
......@@ -146,19 +140,21 @@ var edx = edx || {};
event.preventDefault();
self.save();
});
},
}, // end initialization
render: function() {
self.schedule = this.schedule_collection.toJSON();
self.hidden = this.pruned(self.schedule, function(node) {
return node.hidden || node.category !== 'vertical';});
return node.hidden || node.category !== 'vertical';
});
this.showing = this.pruned(self.schedule, function(node) {
return !node.hidden;});
return !node.hidden;
});
// schedule_template defined globally in ccx\schedule.html
/* globals schedule_template */
this.$el.html(schedule_template({chapters: this.showing}));
$('table.ccx-schedule .sequential,.vertical').hide();
$('table.ccx-schedule .unit .toggle-collapse').on('click', this.toggle_collapse);
//
// Hidden hover fields for empty date fields
$('table.ccx-schedule .date button').each(function() {
if ($(this).text().trim() === gettext("Click to change")) {
......@@ -195,7 +191,6 @@ var edx = edx || {};
self.render();
});
// Show or hide form
if (this.hidden.length) {
// Populate chapters select, depopulate others
......@@ -207,8 +202,7 @@ var edx = edx || {};
$('form#add-unit').show();
$('#all-units-added').hide();
$('#add-unit-button').prop('disabled', true);
}
else {
} else {
$('form#add-unit').hide();
$('#all-units-added').show();
}
......@@ -218,21 +212,22 @@ var edx = edx || {};
$('#dirty-schedule').show();
$('html, body').animate(
{ scrollTop: $('#dirty-schedule').offset().top },
'slow', function() {$('#dirty-schedule').focus();}
);
'slow', function() {$('#dirty-schedule').focus();
});
} else {
$('#dirty-schedule').hide();
}
else {$('#dirty-schedule').hide();}
$('#ajax-error').hide();
return this;
},
}, // end render
save: function() {
self.schedule_collection.set(self.schedule);
var button = $('#dirty-schedule #save-changes');
button.prop('disabled', true).text(gettext("Saving"));
// save_url defined globally in ccx\schedule.html
/* globals save_url */
$.ajax({
url: save_url,
type: 'POST',
......@@ -255,7 +250,7 @@ var edx = edx || {};
button.prop('disabled', false).text(gettext("Save changes"));
}
});
},
}, // end save
hide: function(unit) {
if (unit !== undefined) {
......@@ -291,7 +286,8 @@ var edx = edx || {};
var time = $('form#add-unit input[name=' + which + '_time]').val();
time = _.isEmpty(time) ? "00:00" : time;
if (date && time) {
return date + ' ' + time; }
return date + ' ' + time;
}
return null;
},
......@@ -314,7 +310,9 @@ var edx = edx || {};
schedule_apply: function(nodes, f) {
nodes.map(function(node) {
f(node);
if (node !== undefined && node.children !== undefined) { self.schedule_apply(node.children, f); }
if (node !== undefined && node.children !== undefined) {
self.schedule_apply(node.children, f);
}
});
},
......@@ -323,10 +321,11 @@ var edx = edx || {};
.map(function(node) {
var copy = {};
$.extend(copy, node);
if (node.children) {copy.children = self.pruned(node.children, filter);}
if (node.children) {
copy.children = self.pruned(node.children, filter);
}
return copy;
})
.filter(function(node) {
}).filter(function(node) {
return node.children === undefined || node.children.length;
});
},
......@@ -341,8 +340,7 @@ var edx = edx || {};
$(this).find(".fa-caret-down").removeClass('fa-caret-down').addClass('fa-caret-right');
row.removeClass('expanded').addClass('collapsed');
children.hide();
}
else {
} else {
$(this).attr('aria-expanded', 'true');
$(this).find(".fa-caret-right").removeClass('fa-caret-right').addClass('fa-caret-down');
row.removeClass('collapsed').addClass('expanded');
......@@ -352,6 +350,7 @@ var edx = edx || {};
children.show();
}
},
expandAll : function() {
$('table.ccx-schedule > tbody > tr').each(function() {
var row = $(this);
......@@ -367,6 +366,7 @@ var edx = edx || {};
}
});
},
collapseAll: function() {
$('table.ccx-schedule > tbody > tr').each(function() {
var row = $(this);
......@@ -377,8 +377,8 @@ var edx = edx || {};
$('table.ccx-schedule .sequential,.vertical').hide();
}
});
},
enterNewDate: function(what) {
return function() {
var row = $(this).closest('tr');
......@@ -387,10 +387,9 @@ var edx = edx || {};
.data('location', row.data('location'));
modal.find('h2').text(
what === 'due' ? gettext("Enter Due Date and Time") :
gettext("Enter Start Date and Time"));
gettext("Enter Start Date and Time")
);
modal.focus();
$(document).on('focusin', function(event) {
try {
if (!_.isUndefined(event.target.closest('.modal').id) &&
......@@ -412,10 +411,8 @@ var edx = edx || {};
parts = unit[what] ? unit[what].split(' ') : ['', ''],
date = parts[0],
time = parts[1];
modal.find('input[name=date]').val(date);
modal.find('input[name=time]').val(time);
modal.find('form').off('submit').on('submit', function(event) {
event.preventDefault();
var date = $(this).find('input[name=date]').val(),
......@@ -452,21 +449,21 @@ var edx = edx || {};
function find_in(seq, location) {
for (var i = 0; i < seq.length; i++) {
if (seq[i].location === location) {
return seq[i];}
}}
return seq[i];
}
}
}
var units = [],
unit = find_in(tree, chapter);
units[units.length] = unit;
if (sequential) {
units[units.length] = unit = find_in(unit.children, sequential);
if (vertical) {
units[units.length] = unit = find_in(unit.children, vertical);}
units[units.length] = unit = find_in(unit.children, vertical);
}
}
return units;
},
get_children: function(row) {
var depth = $(row).data('depth');
return $(row).nextUntil(
......@@ -475,11 +472,5 @@ var edx = edx || {};
})
);
}
});
})(jQuery, _, Backbone, gettext);
lms/static/lms/js/require-config.js
......@@ -36,7 +36,7 @@
"annotator_1.2.9": "js/vendor/edxnotes/annotator-full.min",
"date": "js/vendor/date",
"moment": "js/vendor/moment.min",
"moment-with-locales": "js/vendor/moment-with-locales.min",
"moment-with-locales": "xmodule_js/common_static/js/vendor/moment-with-locales.min",
"text": "js/vendor/requirejs/text",
"logger": "js/src/logger",
"backbone": "js/vendor/backbone-min",
......
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