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.

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

Fix to ignore anchor points #1467

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 41 additions & 3 deletions lib/models/__tests__/summary.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,17 @@ describe('Summary', function() {
},
{
title: 'My Second Article',
ref: 'article.md'
ref: 'article1.md',
articles: [
{
title: 'Article with anchor',
ref: 'article1.md#anchor'
}
]
},
{
title: 'My Third Article',
ref: 'article2.md'
},
{
title: 'Article without ref'
Expand Down Expand Up @@ -40,7 +50,7 @@ describe('Summary', function() {
var part = summary.getByLevel('1');

expect(part).toBeDefined();
expect(part.getArticles().size).toBe(4);
expect(part.getArticles().size).toBe(5);
});

it('can return a Part (2)', function() {
Expand Down Expand Up @@ -68,7 +78,7 @@ describe('Summary', function() {
});

it('return correct article', function() {
var article = summary.getByPath('article.md');
var article = summary.getByPath('article1.md');

expect(article).toBeDefined();
expect(article.getTitle()).toBe('My Second Article');
Expand All @@ -89,6 +99,34 @@ describe('Summary', function() {
});
});
});

describe('getNextArticle', function() {
it('return next article', function() {
var nextArticle = summary.getNextArticle('1.1');

expect(nextArticle.getLevel()).toBe('1.2');
});

it('ignore anchor article', function() {
var nextArticle = summary.getNextArticle('1.2');

expect(nextArticle.getLevel()).toBe('1.3');
});
});

describe('getPrevArticle', function() {
it('return prev article', function() {
var prevArticle = summary.getPrevArticle('1.2');

expect(prevArticle.getLevel()).toBe('1.1');
});

it('ignore anchor article', function() {
var prevArticle = summary.getPrevArticle('1.3');

expect(prevArticle.getLevel()).toBe('1.2');
});
});
});


19 changes: 19 additions & 0 deletions lib/models/__tests__/summaryArticle.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,25 @@ describe('SummaryArticle', function() {
expect(article.isFile(file)).toBe(false);
});
});

describe('hasAnchor', function() {
it('must return false when ref does not have anchor', function() {
var article = SummaryArticle.create({
ref: 'hello.md'
}, '1.1');

expect(article.hasAnchor()).toBe(false);
});

it('must return true when has anchor', function() {
var article = SummaryArticle.create({
ref: 'hello.md#world'
}, '1.1');

expect(article.hasAnchor()).toBe(true);
});
});

});


12 changes: 9 additions & 3 deletions lib/models/summary.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,13 @@ Summary.prototype.getNextArticle = function(current) {
var wasPrev = false;

return this.getArticle(function(article) {
if (wasPrev) return true;
if (wasPrev && !article.hasAnchor()) {
return true;
}

wasPrev = article.getLevel() == level;
if (!wasPrev) {
wasPrev = article.getLevel() == level;
}
return false;
});
};
Expand All @@ -127,7 +131,9 @@ Summary.prototype.getPrevArticle = function(current) {
return true;
}

prev = article;
if (!article.hasAnchor()) {
prev = article;
}
return false;
});

Expand Down
10 changes: 10 additions & 0 deletions lib/models/summaryArticle.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,16 @@ SummaryArticle.prototype.getAnchor = function() {
return anchor;
};

/**
* Has anchor for this article
*
* @return {Boolean}
*/
SummaryArticle.prototype.hasAnchor = function() {
var ref = this.getRef();
return (ref.search('#') !== -1);
};

/**
* Create a new level for a new child article
*
Expand Down