Commit 8a91bc7
committed
Make sure 'Load More' stories group correctly
1 parent 43f12bd commit 8a91bc7
3 files changed
Lines changed: 20 additions & 15 deletions
File tree
- client
- javascripts/components/modules
- stylesheets/foundation
- views/news
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -37,20 +37,23 @@ JS.Modules.LoadStories = (function() { | |||
| 37 | 37 | ||
| 38 | 38 | var _appendStories = function(data) { | |
| 39 | 39 | var stories = data.flow, | |
| 40 | + lastDay = _settings.$button.data('last-day'), | ||
| 40 | 41 | markup = ''; | |
| 41 | 42 | ||
| 42 | 43 | for (group in stories) { | |
| 43 | 44 | ||
| 44 | - markup += | ||
| 45 | - '<li class="list-item list-item--header bdrbl pbs">' + | ||
| 46 | - '<span class="mrs por pot2n">' + | ||
| 47 | - '<span class="srt">calendar</span>' + | ||
| 48 | - '<svg class="icon" width="16" height="16">' + | ||
| 49 | - '<use xlink:href="#icon-calendar"></use>' + | ||
| 50 | - '</svg>' + | ||
| 51 | - '</span>' + | ||
| 52 | - '<span>' + group + '</span>' + | ||
| 53 | - '</li>'; | ||
| 45 | + if ( lastDay !== group ) { | ||
| 46 | + markup += | ||
| 47 | + '<li class="list-item list-item--header bdrbl pbs">' + | ||
| 48 | + '<span class="mrs por pot2n">' + | ||
| 49 | + '<span class="srt">calendar</span>' + | ||
| 50 | + '<svg class="icon" width="16" height="16">' + | ||
| 51 | + '<use xlink:href="#icon-calendar"></use>' + | ||
| 52 | + '</svg>' + | ||
| 53 | + '</span>' + | ||
| 54 | + '<span>' + group + '</span>' + | ||
| 55 | + '</li>'; | ||
| 56 | + } | ||
| 54 | 57 | ||
| 55 | 58 | stories[group].forEach(function(story) { | |
| 56 | 59 | markup += | |
@@ -132,7 +135,7 @@ JS.Modules.LoadStories = (function() { | |||
| 132 | 135 | var isMoreStories = data.more; | |
| 133 | 136 | ||
| 134 | 137 | if (!isMoreStories) { | |
| 135 | - _settings.$button.addClass(_settings.hiddenClass); | ||
| 138 | + _settings.$button.parent().addClass(_settings.hiddenClass); | ||
| 136 | 139 | } | |
| 137 | 140 | }; | |
| 138 | 141 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -40,6 +40,8 @@ | |||
| 40 | 40 | border-bottom: $b-border !important | |
| 41 | 41 | .bdrbl | |
| 42 | 42 | border-bottom: $b-border-l !important | |
| 43 | + .bdrtl | ||
| 44 | + border-top: $b-border-l !important | ||
| 43 | 45 | ||
| 44 | 46 | // ------------------------------------- | |
| 45 | 47 | // Display | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -41,8 +41,8 @@ block content | |||
| 41 | 41 | ||
| 42 | 42 | a.btn.btn--a.db.dib--s.fr--l(href='/news/new') New Post | |
| 43 | 43 | ||
| 44 | - .js-loadFeed | ||
| 45 | - ul.list.list--l.list--divided.list--divided--l.bdrbl.mbl.pbxl.js-loadFeed-list | ||
| 44 | + .mbxl.js-loadFeed | ||
| 45 | + ul.list.list--l.list--divided.list--divided--l.js-loadFeed-list | ||
| 46 | 46 | ||
| 47 | 47 | - for group, title in flow_collection | |
| 48 | 48 | ||
@@ -76,8 +76,8 @@ block content | |||
| 76 | 76 | p.mbf= story.body | |
| 77 | 77 | ||
| 78 | 78 | if more | |
| 79 | - .well.well--l.mbl.mbxl--m.tac | ||
| 80 | - button.btn.js-loadFeed-btn Load More | ||
| 79 | + .well.well--l.mbl.mbxl--m.bdrtl.ptl.tac | ||
| 80 | + button.btn.js-loadFeed-btn(data-last-day=lastDay) Load More | ||
| 81 | 81 | ||
| 82 | 82 | .g-b.g-b--m--2of5.sector.sector--b | |
| 83 | 83 | .well.well--l.well--m--xl | |
0 commit comments