Fix a syntax error & have if-conds in an own line
This commit is contained in:
parent
aaf0fec9f5
commit
1348330c7d
|
@ -156,7 +156,9 @@ $(document).ready(function() {
|
||||||
// http://stackoverflow.com/a/6700/11236
|
// http://stackoverflow.com/a/6700/11236
|
||||||
var size = 0, key;
|
var size = 0, key;
|
||||||
for (key in obj) {
|
for (key in obj) {
|
||||||
if (obj.hasOwnProperty(key)) { size++; }
|
if (obj.hasOwnProperty(key)) {
|
||||||
|
size++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return size;
|
return size;
|
||||||
};
|
};
|
||||||
|
|
|
@ -131,7 +131,9 @@ var Files = Files || {};
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var preventDefault = false;
|
var preventDefault = false;
|
||||||
if ($.inArray(event.keyCode, keys) === -1) { keys.push(event.keyCode); }
|
if ($.inArray(event.keyCode, keys) === -1) {
|
||||||
|
keys.push(event.keyCode);
|
||||||
|
}
|
||||||
if (
|
if (
|
||||||
$.inArray(keyCodes.n, keys) !== -1 && ($.inArray(keyCodes.cmdFirefox, keys) !== -1 || $.inArray(keyCodes.cmdOpera, keys) !== -1 || $.inArray(keyCodes.leftCmdWebKit, keys) !== -1 || $.inArray(keyCodes.rightCmdWebKit, keys) !== -1 || $.inArray(keyCodes.ctrl, keys) !== -1 || event.ctrlKey)) {
|
$.inArray(keyCodes.n, keys) !== -1 && ($.inArray(keyCodes.cmdFirefox, keys) !== -1 || $.inArray(keyCodes.cmdOpera, keys) !== -1 || $.inArray(keyCodes.leftCmdWebKit, keys) !== -1 || $.inArray(keyCodes.rightCmdWebKit, keys) !== -1 || $.inArray(keyCodes.ctrl, keys) !== -1 || event.ctrlKey)) {
|
||||||
preventDefault = true; //new file/folder prevent browser from responding
|
preventDefault = true; //new file/folder prevent browser from responding
|
||||||
|
|
|
@ -51,7 +51,7 @@ $(document).ready(function() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add some form data to the upload handler
|
// Add some form data to the upload handler
|
||||||
var file_upload_param.formData = {
|
file_upload_param.formData = {
|
||||||
MAX_FILE_SIZE: $('#uploadMaxFilesize').val(),
|
MAX_FILE_SIZE: $('#uploadMaxFilesize').val(),
|
||||||
requesttoken: $('#publicUploadRequestToken').val(),
|
requesttoken: $('#publicUploadRequestToken').val(),
|
||||||
dirToken: $('#dirToken').val(),
|
dirToken: $('#dirToken').val(),
|
||||||
|
|
|
@ -79,9 +79,15 @@ var OCdialogs = {
|
||||||
title: title
|
title: title
|
||||||
}).data('path', '');
|
}).data('path', '');
|
||||||
|
|
||||||
if (modal === undefined) { modal = false; }
|
if (modal === undefined) {
|
||||||
if (multiselect === undefined) { multiselect = false; }
|
modal = false;
|
||||||
if (mimetype_filter === undefined) { mimetype_filter = ''; }
|
}
|
||||||
|
if (multiselect === undefined) {
|
||||||
|
multiselect = false;
|
||||||
|
}
|
||||||
|
if (mimetype_filter === undefined) {
|
||||||
|
mimetype_filter = '';
|
||||||
|
}
|
||||||
|
|
||||||
$('body').append(self.$filePicker);
|
$('body').append(self.$filePicker);
|
||||||
|
|
||||||
|
@ -155,7 +161,9 @@ var OCdialogs = {
|
||||||
message: content,
|
message: content,
|
||||||
type: dialog_type
|
type: dialog_type
|
||||||
});
|
});
|
||||||
if (modal === undefined) { modal = false; }
|
if (modal === undefined) {
|
||||||
|
modal = false;
|
||||||
|
}
|
||||||
$('body').append($dlg);
|
$('body').append($dlg);
|
||||||
var buttonlist = [];
|
var buttonlist = [];
|
||||||
switch (buttons) {
|
switch (buttons) {
|
||||||
|
@ -163,7 +171,9 @@ var OCdialogs = {
|
||||||
buttonlist = [{
|
buttonlist = [{
|
||||||
text: t('core', 'Yes'),
|
text: t('core', 'Yes'),
|
||||||
click: function(){
|
click: function(){
|
||||||
if (callback !== undefined) { callback(true); }
|
if (callback !== undefined) {
|
||||||
|
callback(true);
|
||||||
|
}
|
||||||
$(dialog_id).ocdialog('close');
|
$(dialog_id).ocdialog('close');
|
||||||
},
|
},
|
||||||
defaultButton: true
|
defaultButton: true
|
||||||
|
@ -171,7 +181,9 @@ var OCdialogs = {
|
||||||
{
|
{
|
||||||
text: t('core', 'No'),
|
text: t('core', 'No'),
|
||||||
click: function(){
|
click: function(){
|
||||||
if (callback !== undefined) { callback(false); }
|
if (callback !== undefined) {
|
||||||
|
callback(false);
|
||||||
|
}
|
||||||
$(dialog_id).ocdialog('close');
|
$(dialog_id).ocdialog('close');
|
||||||
}
|
}
|
||||||
}];
|
}];
|
||||||
|
@ -179,7 +191,9 @@ var OCdialogs = {
|
||||||
case OCdialogs.OK_BUTTON:
|
case OCdialogs.OK_BUTTON:
|
||||||
var functionToCall = function() {
|
var functionToCall = function() {
|
||||||
$(dialog_id).ocdialog('close');
|
$(dialog_id).ocdialog('close');
|
||||||
if(callback !== undefined) { callback(); }
|
if(callback !== undefined) {
|
||||||
|
callback();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
buttonlist[0] = {
|
buttonlist[0] = {
|
||||||
text: t('core', 'Ok'),
|
text: t('core', 'Ok'),
|
||||||
|
|
|
@ -166,7 +166,9 @@ var UserList = {
|
||||||
var c = Number(aa[x]), d = Number(bb[x]);
|
var c = Number(aa[x]), d = Number(bb[x]);
|
||||||
if (c === aa[x] && d === bb[x]) {
|
if (c === aa[x] && d === bb[x]) {
|
||||||
return c - d;
|
return c - d;
|
||||||
} else { return (aa[x] > bb[x]) ? 1 : -1; }
|
} else {
|
||||||
|
return (aa[x] > bb[x]) ? 1 : -1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return aa.length - bb.length;
|
return aa.length - bb.length;
|
||||||
|
|
Loading…
Reference in New Issue