Various small improvements

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
nextcloud · Apr 13, 2020 · b9981fd · b9981fd
1 parent bd38b31
commit b9981fd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/js/admin.js b/js/admin.js
@@ -198,7 +198,8 @@
 					}
 
 					$icon
-						.prop('title', compatReason)
+						.tooltip('dispose')
+						.attr('title', compatReason)
 						.tooltip();
 				}
 			});

diff --git a/js/personal.js b/js/personal.js
@@ -156,7 +156,7 @@
 					.attr('data-timestamp', time)
 					.text(OC.Util.relativeModifiedDate(time))
 					.addClass('has-tooltip')
-					.prop('title', OC.Util.formatDate(time))
+					.attr('title', OC.Util.formatDate(time))
 					.tooltip();
 			});
 		},

diff --git a/js/pico.js b/js/pico.js
@@ -151,7 +151,7 @@
 		 */
 		_content: function ($template, vars, replaceContent) {
 			var $baseElement = $($template.data('replaces') || $template.data('appendTo') || this.$element),
-				$content = $template.octemplate(vars || {});
+				$content = $template.octemplate(vars || {}) || $();
 
 			$baseElement.find('.has-tooltip').tooltip('hide');
 			$content.find('.has-tooltip').tooltip();

diff --git a/lib/Files/StorageFolder.php b/lib/Files/StorageFolder.php
@@ -27,6 +27,7 @@
 use OC\Files\Utils\Scanner;
 use OC\ForbiddenException;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Files\AlreadyExistsException;
 use OCP\Files\Folder as OCFolder;
 use OCP\Files\InvalidPathException;
 use OCP\Files\NotPermittedException;
@@ -134,6 +135,10 @@ public function get(string $path): NodeInterface
 	 */
 	public function newFolder(string $path): FolderInterface
 	{
+		if ($this->exists($path)) {
+			throw new AlreadyExistsException();
+		}
+
 		$basePath = $this->getBasePath($path);
 		return new StorageFolder($this->node->newFolder($path), $basePath);
 	}
@@ -143,6 +148,10 @@ public function newFolder(string $path): FolderInterface
 	 */
 	public function newFile(string $path): FileInterface
 	{
+		if ($this->exists($path)) {
+			throw new AlreadyExistsException();
+		}
+
 		$basePath = $this->getBasePath($path);
 		return new StorageFile($this->node->newFile($path), $basePath);
 	}

diff --git a/lib/Service/PicoService.php b/lib/Service/PicoService.php
@@ -215,8 +215,7 @@ private function loadPicoPlugins(Pico $pico)
 			require_once($pluginFile);
 		};
 
-		$plugins = $this->pluginsService->getPlugins();
-		foreach ($plugins as $pluginData) {
+		foreach ($this->pluginsService->getPlugins() as $pluginData) {
 			if ($pluginData['compat']) {
 				$pluginFile = $pluginData['name'] . '/' . $pluginData['name'] . '.php';
 				$includeClosure($this->pluginsService->getPluginsPath() . '/' . $pluginFile);