diff options
Diffstat (limited to 'apps/files_external')
-rw-r--r-- | apps/files_external/js/rollingqueue.js | 4 | ||||
-rw-r--r-- | apps/files_external/js/statusmanager.js | 6 | ||||
-rw-r--r-- | apps/files_external/lib/Lib/Storage/AmazonS3.php | 3 | ||||
-rw-r--r-- | apps/files_external/lib/Lib/Storage/SFTP.php | 4 | ||||
-rw-r--r-- | apps/files_external/lib/Lib/Storage/SMB.php | 2 | ||||
-rw-r--r-- | apps/files_external/lib/Lib/Storage/Swift.php | 4 |
6 files changed, 16 insertions, 7 deletions
diff --git a/apps/files_external/js/rollingqueue.js b/apps/files_external/js/rollingqueue.js index 58cb0fb22f0..53e11cb1219 100644 --- a/apps/files_external/js/rollingqueue.js +++ b/apps/files_external/js/rollingqueue.js @@ -70,7 +70,7 @@ var RollingQueue = function (functionList, queueWindow, callback) { throw "functionList must be an array"; } - for (i = 0; i < this.queueWindow; i++) { + for (var i = 0; i < this.queueWindow; i++) { this.launchNext(); } }; @@ -134,4 +134,4 @@ if (!OCA.External.StatusManager) { OCA.External.StatusManager.RollingQueue = RollingQueue; -})();
\ No newline at end of file +})(); diff --git a/apps/files_external/js/statusmanager.js b/apps/files_external/js/statusmanager.js index 91974f2d04d..437e9178d24 100644 --- a/apps/files_external/js/statusmanager.js +++ b/apps/files_external/js/statusmanager.js @@ -12,6 +12,8 @@ * */ +/** @global Handlebars */ + if (!OCA.External) { OCA.External = {}; } @@ -502,7 +504,7 @@ OCA.External.StatusManager.Utils = { trFolder = $('#fileList tr[data-file=\"' + OCA.External.StatusManager.Utils.jqSelEscape(folder) + '\"]'); } trFolder.removeClass('externalErroredRow').removeClass('externalDisabledRow'); - tdChilds = trFolder.find("td:first-child div.thumbnail"); + var tdChilds = trFolder.find("td:first-child div.thumbnail"); tdChilds.each(function () { var thisElement = $(this); thisElement.css('background-image', thisElement.data('oldImage')); @@ -525,7 +527,7 @@ OCA.External.StatusManager.Utils = { }); } else { file = $("#fileList tr[data-file=\"" + this.jqSelEscape(filename) + "\"] > td:first-child div.thumbnail"); - parentTr = file.parents('tr:first'); + var parentTr = file.parents('tr:first'); route = OCA.External.StatusManager.Utils.getIconRoute(parentTr); parentTr.attr("data-icon", route); file.css('background-image', "url(" + route + ")").css('display', 'none').css('display', 'inline'); diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index 4bb4312a54f..d67db9858ca 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -74,6 +74,9 @@ class AmazonS3 extends \OC\Files\Storage\Common { */ private $rescanDelay = 10; + /** @var string */ + private $id; + /** * @param string $path * @return string correctly encoded path diff --git a/apps/files_external/lib/Lib/Storage/SFTP.php b/apps/files_external/lib/Lib/Storage/SFTP.php index c058cb98483..3be7a801229 100644 --- a/apps/files_external/lib/Lib/Storage/SFTP.php +++ b/apps/files_external/lib/Lib/Storage/SFTP.php @@ -49,8 +49,8 @@ class SFTP extends \OC\Files\Storage\Common { private $auth; /** - * @var SFTP - */ + * @var \phpseclib\Net\SFTP + */ protected $client; /** diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php index 9f74aa881e0..e677f8c9eba 100644 --- a/apps/files_external/lib/Lib/Storage/SMB.php +++ b/apps/files_external/lib/Lib/Storage/SMB.php @@ -221,7 +221,7 @@ class SMB extends \OC\Files\Storage\Common { /** * @param string $path * @param string $mode - * @return resource + * @return resource|false */ public function fopen($path, $mode) { $fullPath = $this->buildPath($path); diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php index d015e71f9d9..b7f833f9e72 100644 --- a/apps/files_external/lib/Lib/Storage/Swift.php +++ b/apps/files_external/lib/Lib/Storage/Swift.php @@ -68,6 +68,10 @@ class Swift extends \OC\Files\Storage\Common { * @var array */ private $params; + + /** @var string */ + private $id; + /** * @var array */ |