Skip to content

Move app menu to vue #33728

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
juliusknorr merged 8 commits into from
Aug 31, 2022
Merged

Move app menu to vue #33728

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5b4708c
Move app menu to vue
juliusknorr Aug 27, 2022
e8193c2
Fix focus border and adjust active app indicator
juliusknorr Aug 29, 2022
09d8214
Use resize observer
juliusknorr Aug 30, 2022
3ad4e82
Address some more accessibility concerns
juliusknorr Aug 30, 2022
bff4c86
Compile assets
nextcloud-command Aug 31, 2022
ac2d885
Adjust acceptance tests to changes in app menu
danxuliu Aug 31, 2022
aa85e1c
Fix jsunit failures
juliusknorr Aug 31, 2022
ad8fadf
Fix active app indicator position
juliusknorr Aug 31, 2022
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
Prev Previous commit
Next Next commit
Fix jsunit failures 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Aug 31, 2022
commit aa85e1c2afccdd210fdeeda3bae1999f9a62c15c
42 changes: 0 additions & 42 deletions core/js/tests/specs/coreSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,48 +308,6 @@ describe('Core base tests', function() {
expect(OC.generateUrl('apps/files/download{file}')).toEqual(OC.getRootPath() + '/index.php/apps/files/download%7Bfile%7D');
});
});
describe('Main menu mobile toggle', function() {
var clock;
var $toggle;
var $navigation;

beforeEach(function() {
jQuery.fx.off = true;
clock = sinon.useFakeTimers();
$('#testArea').append('<div id="header">' +
'<a class="menutoggle header-appname-container" href="#">' +
'<h1 class="header-appname"></h1>' +
'<div class="icon-caret"></div>' +
'</a>' +
'</div>' +
'<div id="navigation"></div>');
$toggle = $('#header').find('.menutoggle');
$navigation = $('#navigation');
});
afterEach(function() {
jQuery.fx.off = false;
clock.restore();
$(document).off('ajaxError');
});
it('Sets up menu toggle', function() {
window.initCore();
expect($navigation.hasClass('menu')).toEqual(true);
});
it('Clicking menu toggle toggles navigation in', function() {
window.initCore();
// fore show more apps icon since otherwise it would be hidden since no icons are available
clock.tick(1 * 1000);
$('#more-apps').show();

expect($navigation.is(':visible')).toEqual(false);
$toggle.click();
clock.tick(1 * 1000);
expect($navigation.is(':visible')).toEqual(true);
$toggle.click();
clock.tick(1 * 1000);
expect($navigation.is(':visible')).toEqual(false);
});
});
describe('Util', function() {
describe('computerFileSize', function() {
it('correctly parses file sizes from a human readable formated string', function() {
Expand Down
3 changes: 2 additions & 1 deletion core/src/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ import { setUp as setUpMainMenu } from './components/MainMenu'
import { setUp as setUpUserMenu } from './components/UserMenu'
import PasswordConfirmation from './OC/password-confirmation'

const breakpointMobileWidth = getComputedStyle(document.documentElement).getPropertyValue('--breakpoint-mobile')
// keep in sync with core/css/variables.scss
const breakpointMobileWidth = 1024
Copy link
Contributor

@szaimen szaimen Aug 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure about this... yet another place where we need to maintain this number...

Copy link
Member Author

@juliusknorr juliusknorr Aug 31, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is breaking the jsunit tests it seems, so I only reverted to the previous state. Something to look into at some later point.


const initLiveTimestamps = () => {
// Update live timestamps every 30 seconds
Expand Down
4 changes: 2 additions & 2 deletions dist/core-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.