diff options
| author | Julius Härtl <jus@bitgrid.net> | 2017-06-27 19:40:25 +0300 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2017-06-27 19:40:25 +0300 |
| commit | d702f9d6f61ad19a1c3d9deb5fd173651111b66f (patch) | |
| tree | ee319bf1a53e06a51068580486299431bc59334b | |
| parent | 71cf17f74e758f1b1ccd9011cf4671e3c30f5e6a (diff) | |
Fix sorting in settings and bugs with the new app menufix-sorting
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | js/apporder.js | 8 | ||||
| -rw-r--r-- | templates/admin.php | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/js/apporder.js b/js/apporder.js index 6c5c16d..288fd5f 100644 --- a/js/apporder.js +++ b/js/apporder.js @@ -4,7 +4,7 @@ $(function () { if (!app_menu.length) return; - app_menu.hide(); + app_menu.css('opacity', '0'); var mapMenu = function(parent, order) { available_apps = {}; @@ -32,7 +32,9 @@ $(function () { } mapMenu($('#appmenu'), order); mapMenu($('#apps').find('ul'), order); - app_menu.show(); + $(window).trigger('resize'); + app_menu.css('opacity', '1'); + }); // Sorting inside settings @@ -49,7 +51,7 @@ $(function () { url = OC.generateUrl('/apps/apporder/savePersonal'); } $("#appsorter").children().each(function (i, el) { - var item = $(el).find('a').attr('href'); + var item = $(el).find('p').data("url"); items.push(item) }); var json = JSON.stringify(items); diff --git a/templates/admin.php b/templates/admin.php index 7299195..213a615 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -8,7 +8,7 @@ <?php foreach($_['nav'] as $entry) { ?> <li> <img class="app-icon svg" alt="" src="<?php print_unescaped($entry['icon']); ?>"> - <p> + <p data-url="<?php p($entry['href']); ?>"> <?php echo $entry['name']; ?> </p> </li> |