Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes sidebar update class #631

Merged
merged 2 commits into from
Apr 16, 2015
Merged

Removes sidebar update class #631

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
914481f
Removes sidebar update class
darylhedley Apr 10, 2015
4abbdfe
Removed fix for node v0.12
darylhedley Apr 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/core/sidebar/views/sidebarItemView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ define(function(require) {

resetButtons: function() {

var $buttonsSpans = this.$('.sidebar-updating').attr('disabled', false).find('span');
var $buttonsSpans = this.$('.sidebar-updating').removeClass('sidebar-updating').attr('disabled', false).find('span');
$buttonsSpans.eq(0).removeClass('display-none');
$buttonsSpans.eq(1).remove();
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/content/course/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ function initialize () {
var options = _.keys(req.body).length
? req.body
: req.query;
var options = JSON.stringify(options);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you could remove the var. Already declared in line above var options = _.keys(req.body).length.
+1 apart from that

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@darylhedley - actually, can you remove this bit? I think this is related to the issues with node v0.12, but we're only supporting 0.10.33 at the moment, and this workaround needs a closer look.

var search = options.search || {};
var self = this;
var orList = [];
Expand Down Expand Up @@ -77,7 +78,6 @@ function initialize () {
// force search to use only courses created by current user
var user = usermanager.getCurrentUser();
query.$and.push({ createdBy : user._id });

options.jsonOnly = true;
options.fields = DASHBOARD_COURSE_FIELDS.join(' ');

Expand Down