summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/federatedfilesharing/js/settings-personal.js4
-rw-r--r--apps/federation/js/settings-admin.js2
-rw-r--r--apps/files/js/newfilemenu.js2
-rw-r--r--apps/files/js/sidebarpreviewmanager.js2
-rw-r--r--apps/files_sharing/js/sharedfilelist.js4
-rw-r--r--core/js/jquery-showpassword.js2
-rw-r--r--core/js/l10n.js2
-rw-r--r--core/js/placeholder.js2
8 files changed, 11 insertions, 9 deletions
diff --git a/apps/federatedfilesharing/js/settings-personal.js b/apps/federatedfilesharing/js/settings-personal.js
index c954f74f323..407493640b1 100644
--- a/apps/federatedfilesharing/js/settings-personal.js
+++ b/apps/federatedfilesharing/js/settings-personal.js
@@ -28,7 +28,7 @@ $(document).ready(function() {
// Clipboard!
var clipboard = new Clipboard('.clipboardButton');
clipboard.on('success', function(e) {
- $input = $(e.trigger);
+ var $input = $(e.trigger);
$input.tooltip('hide')
.attr('data-original-title', t('core', 'Copied!'))
.tooltip('fixTitle')
@@ -41,7 +41,7 @@ $(document).ready(function() {
}, 3000);
});
clipboard.on('error', function (e) {
- $input = $(e.trigger);
+ var $input = $(e.trigger);
var actionMsg = '';
if (/iPhone|iPad/i.test(navigator.userAgent)) {
actionMsg = t('core', 'Not supported!');
diff --git a/apps/federation/js/settings-admin.js b/apps/federation/js/settings-admin.js
index 9e3ed763168..da3f3c2d1a0 100644
--- a/apps/federation/js/settings-admin.js
+++ b/apps/federation/js/settings-admin.js
@@ -77,7 +77,7 @@
console.log("typing away");
- url = $(this).val();
+ var url = $(this).val();
// toggle add-button visiblity based on input length
if ( url.length > 0 )
diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js
index 01a183a33a7..69450e97c2a 100644
--- a/apps/files/js/newfilemenu.js
+++ b/apps/files/js/newfilemenu.js
@@ -171,7 +171,7 @@
/* Find the right actionHandler that should be called.
* Actions is retrieved by using `actionSpec.id` */
- action = _.filter(self._menuItems, function(item) {
+ var action = _.filter(self._menuItems, function(item) {
return item.id == $target.attr('data-action');
}).pop();
action.actionHandler(newname);
diff --git a/apps/files/js/sidebarpreviewmanager.js b/apps/files/js/sidebarpreviewmanager.js
index 27ccd4fc405..69528ce4e43 100644
--- a/apps/files/js/sidebarpreviewmanager.js
+++ b/apps/files/js/sidebarpreviewmanager.js
@@ -9,7 +9,7 @@
*/
(function () {
- SidebarPreviewManager = function (fileList) {
+ var SidebarPreviewManager = function (fileList) {
this._fileList = fileList;
this._previewHandlers = {};
OC.Plugins.attach('OCA.Files.SidebarPreviewManager', this);
diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index 19250815bd6..3e2bcf59032 100644
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -90,7 +90,7 @@
var permission = fileData.permissions;
$tr.attr('data-share-permissions', permission);
}
-
+
// add row with expiration date for link only shares - influenced by _createRow of filelist
if (this._linksOnly) {
var expirationTimestamp = 0;
@@ -107,6 +107,8 @@
modifiedColor = 160;
}
+ var formatted;
+ var text;
if (expirationTimestamp > 0) {
formatted = OC.Util.formatDate(expirationTimestamp);
text = OC.Util.relativeModifiedDate(expirationTimestamp);
diff --git a/core/js/jquery-showpassword.js b/core/js/jquery-showpassword.js
index 5d518c78bcb..de18c8068be 100644
--- a/core/js/jquery-showpassword.js
+++ b/core/js/jquery-showpassword.js
@@ -25,7 +25,7 @@
var $element = $(element);
- $clone = $("<input />");
+ var $clone = $("<input />");
// Name added for JQuery Validation compatibility
// Element name is required to avoid script warning.
diff --git a/core/js/l10n.js b/core/js/l10n.js
index 52dd136e8f5..6027d42dca0 100644
--- a/core/js/l10n.js
+++ b/core/js/l10n.js
@@ -167,7 +167,7 @@ OC.L10N = {
* @private
*/
_getPlural: function(number) {
- locale = OC.getLocale();
+ var locale = OC.getLocale();
if ('pt_BR' === locale) {
// temporary set a locale for brazilian
locale = 'xbr';
diff --git a/core/js/placeholder.js b/core/js/placeholder.js
index 7c1bd724550..04c2ca88401 100644
--- a/core/js/placeholder.js
+++ b/core/js/placeholder.js
@@ -91,7 +91,7 @@
var palette = new Array();
palette.push(color1);
var step = stepCalc(steps, [color1, color2])
- for (i = 1; i < steps; i++) {
+ for (var i = 1; i < steps; i++) {
var r = parseInt(color1.r + (step[0] * i));
var g = parseInt(color1.g + (step[1] * i));
var b = parseInt(color1.b + (step[2] * i));