Merge pull request #16454 from nextcloud/bugfix/noid/sharelink-should…

…nt-open-menu-automatically Dont show menu automatically when share link is clicked
nextcloud · Sep 4, 2019 · 2fdf946 · 2fdf946
2 parents 4be862f + 1993984
commit 2fdf946
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/core/js/dist/share_backend.js b/core/js/dist/share_backend.js
diff --git a/core/js/dist/share_backend.js.map b/core/js/dist/share_backend.js.map
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
@@ -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() {

diff --git a/tests/acceptance/features/bootstrap/FilesAppSharingContext.php b/tests/acceptance/features/bootstrap/FilesAppSharingContext.php
@@ -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");
-		}
 	}
 
 	/**