Skip to content
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

Dont show menu automatically when share link is clicked #16454

Merged
merged 2 commits into from
Sep 4, 2019
Merged

Dont show menu automatically when share link is clicked #16454

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
53aa73d
Dont show menu automatically when share link is clicked
GretaD Jul 18, 2019
1993984
Adjust acceptance tests to changes in link share menu behaviour
GretaD Jul 29, 2019
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
2 changes: 1 addition & 1 deletion core/js/dist/share_backend.js
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions core/js/sharedialoglinkshareview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,11 +243,6 @@
if (newShareId) {
var shares = self.$el.find('li[data-share-id]');
var $newShare = self.$el.find('li[data-share-id="'+newShareId+'"]');
// only open the menu by default if this is the first share
if ($newShare && shares.length === 1) {
var $menu = $newShare.find('.popovermenu');
OC.showMenu(null, $menu);
}
}
},
error: function() {
Expand Down
8 changes: 0 additions & 8 deletions tests/acceptance/features/bootstrap/FilesAppSharingContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,6 @@ public function iShareTheLinkFor($fileName) {
$this->actor->find(FileListContext::shareActionForFile(FilesAppContext::currentSectionMainView(), $fileName), 10)->click();

$this->actor->find(self::shareLinkAddNewButton(), 5)->click();

// Wait until the menu was opened after the share creation to continue.
if (!WaitFor::elementToBeEventuallyShown(
$this->actor,
self::shareLinkMenu(),
$timeout = 5 * $this->actor->getFindTimeoutMultiplier())) {
PHPUnit_Framework_Assert::fail("The share link menu is not open yet after $timeout seconds");
}
}

/**
Expand Down