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

Merge pull request #4943 from novaugust/navigation_deletion_#4928

Browse source 
Fix navigation deletion
This commit is contained in:
Hannah Wolfe 2015-02-24 18:01:01 +00:00
commit 174b0ea9f2
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
core/client/controllers/settings/navigation.js
View file

@ -18,11 +18,13 @@ NavigationController = Ember.Controller.extend({
return url.slice(-1) !== '/' ? url + '/' : url; return url.slice(-1) !== '/' ? url + '/' : url;
}), }),
navigationItems: Ember.computed('model.navigation', function () { navigationItems: Ember.computed('model.navigation', function (key, value) {
var navItems, if (arguments.length > 1) {
lastItem, return value.sortBy('order');
order = 0; }
var order = 0,
navItems,
lastItem;
try { try {
navItems = JSON.parse(this.get('model.navigation') || [{}]); navItems = JSON.parse(this.get('model.navigation') || [{}]);
} catch (e) { } catch (e) {
@ -45,7 +47,7 @@ NavigationController = Ember.Controller.extend({
return navItems; return navItems;
}), }),
navigationItemsObserver: Ember.observer('navigationItems.[]', function () { updateLastNavItem: Ember.observer('navigationItems.[]', function () {
var navItems = this.get('navigationItems'); var navItems = this.get('navigationItems');
navItems.forEach(function (item, index, items) { navItems.forEach(function (item, index, items) {
@ -57,13 +59,12 @@ NavigationController = Ember.Controller.extend({
}); });
}), }),
// called by the view after items have been rearranged
updateOrder: function (indexes) { updateOrder: function (indexes) {
var navItems = this.get('navigationItems'), var navItems = this.get('navigationItems');
order = 0;
indexes.forEach(function (index) { indexes.forEach(function (index, newOrder) {
navItems[index].set('order', order); navItems.objectAt(index).set('order', newOrder);
order = order + 1; // Increment order order by one
}); });
}, },
@ -82,18 +83,18 @@ NavigationController = Ember.Controller.extend({
if (!item) { if (!item) {
return; return;
} }
var deletedItemOrder = item.get('order'),
navItems = this.get('navigationItems');
this.get('navigationItems').removeObject(item); navItems.removeAt(navItems.indexOf(item));
var navItems = this.get('navigationItems'),
order = 0;
navItems.forEach(function (item) { navItems.forEach(function (item) {
if (!item.last) { // Make sure we never apply an `order` attr to the last item if (!item.last && item.get('order') > deletedItemOrder) {
item.set('order', order); item.decrementProperty('order');
order = order + 1; // Increment order order by one
} }
}); });
this.set('navigationItems', navItems);
}, },
updateUrl: function (url, navItem) { updateUrl: function (url, navItem) {
@ -153,7 +154,7 @@ NavigationController = Ember.Controller.extend({
return {label: label, url: url, order: order}; return {label: label, url: url, order: order};
}).compact(); }).compact();
// Sort JSON so nav items are stored in the correct order order // Sort JSON so nav items are stored in the correct order
navSetting.sort(function (a, b) { navSetting.sort(function (a, b) {
return a.order - b.order; return a.order - b.order;
}); });