Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Merge pull request #4934 from PaulAdamDavis/fix-nav-order-metadata

Browse source 
Add `order` property when parsing Navigation JSON
This commit is contained in:
Hannah Wolfe 2015-02-23 23:39:06 +00:00
commit f8e936150f
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ghost/admin/assets/sass/layouts/settings.scss
View file

@ -403,7 +403,11 @@
// &.last-navigation-item { // &.last-navigation-item {
&:last-child { &:last-child {
padding-left: 27px; // .navigation-item-drag-handle width + horizontal padding padding-left: 27px; // simulate .navigation-item-drag-handle width + horizontal padding
.navigation-item-drag-handle {
display: none;
}
} }
} }

11
ghost/admin/controllers/settings/navigation.js
View file

@ -20,7 +20,8 @@ NavigationController = Ember.Controller.extend({
navigationItems: Ember.computed('model.navigation', function () { navigationItems: Ember.computed('model.navigation', function () {
var navItems, var navItems,
lastItem; lastItem,
order = 0;
try { try {
navItems = JSON.parse(this.get('model.navigation') || [{}]); navItems = JSON.parse(this.get('model.navigation') || [{}]);
@ -29,6 +30,8 @@ NavigationController = Ember.Controller.extend({
} }
navItems = navItems.map(function (item) { navItems = navItems.map(function (item) {
item.order = order;
order = order + 1;
return NavItem.create(item); return NavItem.create(item);
}); });
@ -86,8 +89,10 @@ NavigationController = Ember.Controller.extend({
order = 0; order = 0;
navItems.forEach(function (item) { navItems.forEach(function (item) {
item.set('order', order); if (!item.last) { // Make sure we never apply an `order` attr to the last item
order = order + 1; // Increment order order by one item.set('order', order);
order = order + 1; // Increment order order by one
}
}); });
}, },