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

ItemsComponentModel #179

Merged
merged 23 commits into from
Jun 26, 2018
Merged

ItemsComponentModel #179

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2ef1a03
remove maintainer comment
lc-thomasberger Feb 2, 2018
7233489
split into model and view
lc-thomasberger Feb 2, 2018
6e2e9fc
set stage on change event for active item in collection
lc-thomasberger Feb 5, 2018
34c5aff
remove NarrativeModel
lc-thomasberger Feb 6, 2018
99c9c5f
refactor animation
lc-thomasberger Feb 7, 2018
0796892
rename method to setActiveItem
lc-thomasberger Feb 8, 2018
c472ee1
updated to add review
lc-thomasberger Feb 20, 2018
a29859a
added review
lc-thomasberger Mar 20, 2018
80c870b
added review
lc-thomasberger Mar 21, 2018
7b9c9fb
switch to _children, tranisition strapline-header
lc-thomasberger May 28, 2018
d56ea09
Merge branch 'master' into items
oliverfoster May 29, 2018
11078e7
handle visited state
lc-thomasberger May 30, 2018
4cbe8ca
Merge branch 'items' of https://github.com/adaptlearning/adapt-contri…
lc-thomasberger May 30, 2018
b2c479b
use
lc-thomasberger Jun 5, 2018
29ec474
resolve conflict
lc-thomasberger Jun 5, 2018
9b89d5a
fix #2100
lc-thomasberger Jun 5, 2018
3cb171c
remove .narrative-item-title rules
lc-thomasberger Jun 5, 2018
cc5b804
added review
lc-thomasberger Jun 12, 2018
afdac59
add review
lc-thomasberger Jun 19, 2018
60f9ea6
update
lc-thomasberger Jun 19, 2018
7b69b76
add review
lc-thomasberger Jun 20, 2018
e4806b0
update _isInitial
lc-thomasberger Jun 21, 2018
585b5ea
fix styling for _hasNavigationInTextArea option
lc-thomasberger Jun 26, 2018
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
21 changes: 9 additions & 12 deletions js/narrativeView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ define([
this.checkIfResetOnRevisit();
this._isInitial = true;
this.calculateWidths();
_.bindAll(this, 'onTransitionEnd');
},

clamp: function(number, min, max) {
Copy link
Contributor

Choose a reason for hiding this comment

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

this function isn't needed

return Math.max(min, Math.min(number, max));
},

onItemsActiveChange: function(item, _isActive) {
Expand Down Expand Up @@ -177,15 +180,11 @@ define([
if (Adapt.config.get('_disableAnimation')) {
this.onTransitionEnd();
} else {
$sliderElm.on('transitionend', this.onTransitionEnd);
$sliderElm.one('transitionend', this.onTransitionEnd.bind(this));
}
},

onTransitionEnd: function(event) {
if (event) {
$(event.currentTarget).off('transitionend', this.onTransitionEnd);
}

var index = this.model.getActiveItem().get('_index');
if (this.model.get('_isDesktop')) {
if (!this._isInitial) {
Expand Down Expand Up @@ -265,13 +264,11 @@ define([
var numberOfItems = this.model.get('_children').length;

if ($(event.currentTarget).hasClass('narrative-control-right')) {
stage++;
this.model.setActiveItem(stage);
this.model.setActiveItem(stage+=1);
Copy link
Contributor

Choose a reason for hiding this comment

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

could you change to this.model.setActiveItem(++stage);? the pre-increment operator is pretty standard JS

} else if ($(event.currentTarget).hasClass('narrative-control-left')) {
stage--;
this.model.setActiveItem(stage);
this.model.setActiveItem(stage-=1);
Copy link
Contributor

Choose a reason for hiding this comment

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

could you change to this.model.setActiveItem(--stage);? the pre-decrement operator is pretty standard JS

}
stage = (stage + numberOfItems) % numberOfItems;
stage = this.clamp(stage, 0, numberOfItems);
Copy link
Contributor

Choose a reason for hiding this comment

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

I really think you can delete this line as stage is a local variable and this is the last line of the function

},

onProgressClicked: function(event) {
Expand Down Expand Up @@ -301,7 +298,7 @@ define([

setupEventListeners: function() {
if (this.model.get('_setCompletionOn') === 'inview') {
this.$('.component-widget').on('inview', _.bind(this.inview, this));
this.$('.component-widget').on('inview', this.inview.bind(this));
}
},

Expand Down