mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-08 21:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolves #288 Resolves #266 Fix the level dancing bug

Browse source
This commit is contained in:
Peter Cottle 2015-06-06 13:05:09 -07:00
parent 1e213b9ea0
commit 6ba36de6b7
3 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/js/views/levelDropdownView.js
View file

@ -281,7 +281,6 @@ var LevelDropdownView = ContainedBase.extend({
// also go find the series and update the about
_.each(this.seriesViews, function(view) {
if (view.levelIDs.indexOf(id) === -1) {
view.resetAbout();
return;
}
view.updateAboutForLevelID(id);
@ -354,8 +353,7 @@ var SeriesView = BaseView.extend({
template: _.template($('#series-view').html()),
events: {
'click div.levelIcon': 'click',
'mouseenter div.levelIcon': 'enterIcon',
'mouseleave div.levelIcon': 'leaveIcon'
'mouseenter div.levelIcon': 'enterIcon'
},
initialize: function(options) {
@ -365,7 +363,11 @@ var SeriesView = BaseView.extend({
this.levels = LevelStore.getLevelsInSequence(this.name);
this.levelIDs = [];
var firstLevelInfo = null;
_.each(this.levels, function(level) {
if (firstLevelInfo === null) {
firstLevelInfo = intl.getName(LevelStore.getLevel(level.id));
}
this.levelIDs.push(level.id);
}, this);
@ -375,6 +377,7 @@ var SeriesView = BaseView.extend({
this.JSON = {
displayName: intl.getIntlKey(this.info, 'displayName'),
about: intl.getIntlKey(this.info, 'about') || " ",
levelInfo: firstLevelInfo,
ids: this.levelIDs
};
@ -396,13 +399,8 @@ var SeriesView = BaseView.extend({
return $(element).attr('data-id');
},
resetAbout: function() {
this.$('p.about').text(intl.getIntlKey(this.info, 'about'))
.css('font-style', 'inherit');
},
setAbout: function(content) {
this.$('p.about').text(content).css('font-style', 'italic');
this.$('p.levelInfo').text(content);
},
enterIcon: function(ev) {
@ -412,11 +410,10 @@ var SeriesView = BaseView.extend({
updateAboutForLevelID: function(id) {
var level = LevelStore.getLevel(id);
this.setAbout(intl.getName(level));
},
leaveIcon: function() {
this.resetAbout();
// hack -- parse out the level number from
// the ID
var levelNumber = id.replace(/[^0-9]/g, '');
this.setAbout(levelNumber + ': ' + intl.getName(level));
},
click: function(ev) {