Skip to content

Fix settings papercuts #115

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.

Sign up for GitHub

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

Merged
nickvergessen merged 2 commits into from
Aug 8, 2018
Merged

Fix settings papercuts #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d96ef7
Use OC.Settings.rebuildNavigation
juliusknorr Aug 6, 2018
5cea4f5
Make details hidden by default
juliusknorr Aug 6, 2018
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
82 changes: 1 addition & 81 deletions js/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,87 +320,7 @@
},

_rebuildNavigation: function() {
$.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php')).done(function(response){
if(response.status === 'success') {
var addedApps = {};
var navEntries = response.nav_entries;
var container = $('#apps ul');

// remove disabled apps
for (var i = 0; i < navEntries.length; i++) {
var entry = navEntries[i];
if(container.children('li[data-id="' + entry.id + '"]').length === 0) {
addedApps[entry.id] = true;
}
}
container.children('li[data-id]').each(function (index, el) {
var id = $(el).data('id');
// remove all apps that are not in the correct order
if (!navEntries[index] || (navEntries[index] && navEntries[index].id !== $(el).data('id'))) {
$(el).remove();
$('#appmenu li[data-id='+id+']').remove();
}
});

var previousEntry = {};
// add enabled apps to #navigation and #appmenu
for (var i = 0; i < navEntries.length; i++) {
var entry = navEntries[i];
if (container.children('li[data-id="' + entry.id + '"]').length === 0) {
var li = $('<li></li>');
li.attr('data-id', entry.id);
var img = '<svg width="16" height="16" viewBox="0 0 16 16">';
img += '<defs><filter id="invert"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" /></filter></defs>';
img += '<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="' + entry.icon + '" class="app-icon" /></svg>';
var a = $('<a></a>').attr('href', entry.href);
var filename = $('<span></span>');
var loading = $('<div class="icon-loading-dark"></div>').css('display', 'none');
filename.text(entry.name);
a.prepend(filename);
a.prepend(loading);
a.prepend(img);
li.append(a);

$('#navigation li[data-id=' + previousEntry.id + ']').after(li);

// draw attention to the newly added app entry
// by flashing it twice
if(addedApps[entry.id]) {
$('#header .menutoggle')
.animate({opacity: 0.5})
.animate({opacity: 1})
.animate({opacity: 0.5})
.animate({opacity: 1})
.animate({opacity: 0.75});
}
}

if ($('#appmenu').children('li[data-id="' + entry.id + '"]').length === 0) {
var li = $('<li></li>');
li.attr('data-id', entry.id);
var img = '<img src="' + entry.icon + '" class="app-icon">';
var a = $('<a></a>').attr('href', entry.href);
var filename = $('<span></span>');
var loading = $('<div class="icon-loading-dark"></div>').css('display', 'none');
filename.text(entry.name);
a.prepend(filename);
a.prepend(loading);
a.prepend(img);
li.append(a);
$('#appmenu li[data-id='+ previousEntry.id+']').after(li);
if(addedApps[entry.id]) {
li.animate({opacity: 0.5})
.animate({opacity: 1})
.animate({opacity: 0.5})
.animate({opacity: 1});
}
}
previousEntry = entry;
}

$(window).trigger('resize');
}
});
OC.Settings.Apps.rebuildNavigation();
}
}
})(OC, OCA, _, OC.Backbone);
Expand Down
3 changes: 2 additions & 1 deletion templates/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

style('external', 'style');
script('external', 'admin');
script('settings', 'apps');

/** @var array $_ */
/** @var \OCP\IL10N $l */
Expand All @@ -47,7 +48,7 @@
<input type="text" class="site-url trigger-save" name="site-url" value="{{url}}" placeholder="<?php p($l->t('URL')); ?>">
<a class="icon-more" href="#"></a>

<div class="options hidden-FIXME">
<div class="options hidden">
<div>
<label>
<span><?php p($l->t('Language')) ?></span>
Expand Down