Scrutinizer cleanup
This commit is contained in:
parent
c88c0b9a13
commit
9bc3f3cf30
|
@ -7,7 +7,9 @@ $(document).ready(function(){
|
|||
}
|
||||
};
|
||||
|
||||
$('#header .avatardiv').avatar(OC.currentUser, 32, undefined, true, callback);
|
||||
$('#header .avatardiv').avatar(
|
||||
OC.currentUser, 32, undefined, true, callback
|
||||
);
|
||||
// Personal settings
|
||||
$('#avatar .avatardiv').avatar(OC.currentUser, 128);
|
||||
}
|
||||
|
|
|
@ -42,10 +42,11 @@ if (!Array.prototype.filter) {
|
|||
for (var i = 0; i < len; i++) {
|
||||
if (i in this) {
|
||||
var val = this[i]; // in case fun mutates this
|
||||
if (fun.call(thisp, val, i, this))
|
||||
if (fun.call(thisp, val, i, this)) {
|
||||
res.push(val);
|
||||
}
|
||||
}
|
||||
}
|
||||
return res;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -20,10 +20,12 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* Wrapper for server side events (http://en.wikipedia.org/wiki/Server-sent_events)
|
||||
* Wrapper for server side events
|
||||
* (http://en.wikipedia.org/wiki/Server-sent_events)
|
||||
* includes a fallback for older browsers and IE
|
||||
*
|
||||
* Use server side events with caution, too many open requests can hang the server
|
||||
* use server side events with caution, to many open requests can hang the
|
||||
* server
|
||||
*/
|
||||
|
||||
/**
|
||||
|
@ -43,7 +45,7 @@ OC.EventSource=function(src,data){
|
|||
dataStr+='requesttoken='+oc_requesttoken;
|
||||
if(!this.useFallBack && typeof EventSource !='undefined'){
|
||||
var joinChar = '&';
|
||||
if(src.indexOf('?') == -1) {
|
||||
if(src.indexOf('?') === -1) {
|
||||
joinChar = '?';
|
||||
}
|
||||
this.source=new EventSource(src+joinChar+dataStr);
|
||||
|
@ -60,13 +62,13 @@ OC.EventSource=function(src,data){
|
|||
this.iframe.hide();
|
||||
|
||||
var joinChar = '&';
|
||||
if(src.indexOf('?') == -1) {
|
||||
if(src.indexOf('?') === -1) {
|
||||
joinChar = '?';
|
||||
}
|
||||
this.iframe.attr('src',src+joinChar+'fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr);
|
||||
$('body').append(this.iframe);
|
||||
this.useFallBack=true;
|
||||
OC.EventSource.iframeCount++
|
||||
OC.EventSource.iframeCount++;
|
||||
}
|
||||
//add close listener
|
||||
this.listen('__internal__',function(data){
|
||||
|
|
|
@ -35,11 +35,18 @@
|
|||
});
|
||||
|
||||
$(document).on('keydown keyup', function(event) {
|
||||
if(event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) {
|
||||
if (
|
||||
event.target !== self.$dialog.get(0) &&
|
||||
self.$dialog.find($(event.target)).length === 0
|
||||
) {
|
||||
return;
|
||||
}
|
||||
// Escape
|
||||
if(event.keyCode === 27 && event.type === 'keydown' && self.options.closeOnEscape) {
|
||||
if (
|
||||
event.keyCode === 27 &&
|
||||
event.type === 'keydown' &&
|
||||
self.options.closeOnEscape
|
||||
) {
|
||||
event.stopImmediatePropagation();
|
||||
self.close();
|
||||
return false;
|
||||
|
@ -52,7 +59,10 @@
|
|||
return false;
|
||||
}
|
||||
// If no button is selected we trigger the primary
|
||||
if(self.$buttonrow && self.$buttonrow.find($(event.target)).length === 0) {
|
||||
if (
|
||||
self.$buttonrow &&
|
||||
self.$buttonrow.find($(event.target)).length === 0
|
||||
) {
|
||||
var $button = self.$buttonrow.find('button.primary');
|
||||
if($button) {
|
||||
$button.trigger('click');
|
||||
|
|
|
@ -23,7 +23,10 @@ if (typeof oc_webroot === "undefined") {
|
|||
oc_webroot = oc_webroot.substr(0, oc_webroot.lastIndexOf('/'));
|
||||
}
|
||||
}
|
||||
if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") {
|
||||
if (
|
||||
oc_debug !== true || typeof console === "undefined" ||
|
||||
typeof console.log === "undefined"
|
||||
) {
|
||||
if (!window.console) {
|
||||
window.console = {};
|
||||
}
|
||||
|
@ -37,7 +40,8 @@ if (oc_debug !== true || typeof console === "undefined" || typeof console.log ==
|
|||
function initL10N(app) {
|
||||
if (!( t.cache[app] )) {
|
||||
$.ajax(OC.filePath('core', 'ajax', 'translations.php'), {
|
||||
async: false,//todo a proper solution for this without sync ajax calls
|
||||
// TODO a proper solution for this without sync ajax calls
|
||||
async: false,
|
||||
data: {'app': app},
|
||||
type: 'POST',
|
||||
success: function (jsondata) {
|
||||
|
|
|
@ -46,7 +46,7 @@ ListView.prototype={
|
|||
$.each(this.hoverElement,function(index,collumn){
|
||||
$.each(collumn,function(index,element){
|
||||
var html='<a href="#" title="'+element.title+'" class="hoverElement"/>';
|
||||
var element=$(html);
|
||||
element=$(html);
|
||||
element.append($('<img src="'+element.icon+'"/>'));
|
||||
element.click(element.callback);
|
||||
tr.children('td.'+collumn).append(element);
|
||||
|
@ -59,9 +59,9 @@ ListView.prototype={
|
|||
hoverHandelerOut:function(tr){
|
||||
tr.find('*.hoverElement').remove();
|
||||
},
|
||||
addHoverElement:function(collumn,icon,title,callback){
|
||||
if(!this.hoverElements[collumn]){
|
||||
this.hoverElements[collumn]=[];
|
||||
addHoverElement:function(column,icon,title,callback){
|
||||
if(!this.hoverElements[column]){
|
||||
this.hoverElements[column]=[];
|
||||
}
|
||||
this.hoverElements[row].push({icon:icon,callback:callback,title:title});
|
||||
},
|
||||
|
|
|
@ -1,14 +1,19 @@
|
|||
/**
|
||||
* @param 'createCallback' A function to be called when a new entry is created. Two arguments are supplied to this function:
|
||||
* The select element used and the value of the option. If the function returns false addition will be cancelled. If it returns
|
||||
* @param 'createCallback' A function to be called when a new entry is created.
|
||||
* Two arguments are supplied to this function:
|
||||
* The select element used and the value of the option. If the function
|
||||
* returns false addition will be cancelled. If it returns
|
||||
* anything else it will be used as the value of the newly added option.
|
||||
* @param 'createText' The placeholder text for the create action.
|
||||
* @param 'title' The title to show if no options are selected.
|
||||
* @param 'checked' An array containing values for options that should be checked. Any options which are already selected will be added to this array.
|
||||
* @param 'checked' An array containing values for options that should be
|
||||
* checked. Any options which are already selected will be added to this array.
|
||||
* @param 'labels' The corresponding labels to show for the checked items.
|
||||
* @param 'oncheck' Callback function which will be called when a checkbox/radiobutton is selected. If the function returns false the input will be unchecked.
|
||||
* @param 'oncheck' Callback function which will be called when a
|
||||
* checkbox/radiobutton is selected. If the function returns false the input will be unchecked.
|
||||
* @param 'onuncheck' @see 'oncheck'.
|
||||
* @param 'singleSelect' If true radiobuttons will be used instead of checkboxes.
|
||||
* @param 'singleSelect' If true radiobuttons will be used instead of
|
||||
* checkboxes.
|
||||
*/
|
||||
(function( $ ){
|
||||
var multiSelectId=-1;
|
||||
|
@ -32,12 +37,18 @@
|
|||
$.extend(settings,options);
|
||||
$.each(this.children(),function(i,option) {
|
||||
// If the option is selected, but not in the checked array, add it.
|
||||
if($(option).attr('selected') && settings.checked.indexOf($(option).val()) === -1) {
|
||||
if (
|
||||
$(option).attr('selected') &&
|
||||
settings.checked.indexOf($(option).val()) === -1
|
||||
) {
|
||||
settings.checked.push($(option).val());
|
||||
settings.labels.push($(option).text().trim());
|
||||
}
|
||||
// If the option is in the checked array but not selected, select it.
|
||||
else if(settings.checked.indexOf($(option).val()) !== -1 && !$(option).attr('selected')) {
|
||||
else if (
|
||||
settings.checked.indexOf($(option).val()) !== -1 &&
|
||||
!$(option).attr('selected')
|
||||
) {
|
||||
$(option).attr('selected', 'selected');
|
||||
settings.labels.push($(option).text().trim());
|
||||
}
|
||||
|
@ -104,7 +115,7 @@
|
|||
var label=$('<label/>');
|
||||
label.attr('for',id);
|
||||
label.text(element.text() || item);
|
||||
if(settings.checked.indexOf(item)!=-1 || checked) {
|
||||
if(settings.checked.indexOf(item) !== -1 || checked) {
|
||||
input.attr('checked', true);
|
||||
}
|
||||
if(checked){
|
||||
|
@ -154,7 +165,10 @@
|
|||
button.children('span').first().text(settings.labels.length > 0
|
||||
? settings.labels.join(', ')
|
||||
: settings.title);
|
||||
var newOuterWidth=Math.max((button.outerWidth()-2),settings.minOuterWidth)+'px';
|
||||
var newOuterWidth=Math.max(
|
||||
(button.outerWidth()-2),
|
||||
settings.minOuterWidth
|
||||
)+'px';
|
||||
var newWidth=Math.max(button.width(),settings.minWidth);
|
||||
var pos=button.position();
|
||||
button.css('width',oldWidth);
|
||||
|
@ -184,7 +198,7 @@
|
|||
input.css('width',button.innerWidth());
|
||||
button.parent().data('preventHide',true);
|
||||
input.keypress(function(event) {
|
||||
if(event.keyCode == 13) {
|
||||
if(event.keyCode === 13) {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
var value = $(this).val();
|
||||
|
@ -265,9 +279,9 @@
|
|||
}
|
||||
list.append(list.find('li.creator'));
|
||||
var pos=button.position();
|
||||
if(($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height())
|
||||
&& $(document).height() - button.offset().top > (button.offset().top+button.outerHeight() + list.children().length * button.height()))
|
||||
|| $(document).height()/2 > button.offset().top
|
||||
if(($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height()) &&
|
||||
$(document).height() - button.offset().top > (button.offset().top+button.outerHeight() + list.children().length * button.height())) ||
|
||||
$(document).height()/2 > button.offset().top
|
||||
) {
|
||||
list.css({
|
||||
top:pos.top+button.outerHeight()-5,
|
||||
|
|
|
@ -38,7 +38,14 @@ var OCdialogs = {
|
|||
* @param modal make the dialog modal
|
||||
*/
|
||||
alert:function(text, title, callback, modal) {
|
||||
this.message(text, title, 'alert', OCdialogs.OK_BUTTON, callback, modal);
|
||||
this.message(
|
||||
text,
|
||||
title,
|
||||
'alert',
|
||||
OCdialogs.OK_BUTTON,
|
||||
callback,
|
||||
modal
|
||||
);
|
||||
},
|
||||
/**
|
||||
* displays info dialog
|
||||
|
@ -59,7 +66,14 @@ var OCdialogs = {
|
|||
* @param modal make the dialog modal
|
||||
*/
|
||||
confirm:function(text, title, callback, modal) {
|
||||
this.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal);
|
||||
this.message(
|
||||
text,
|
||||
title,
|
||||
'notice',
|
||||
OCdialogs.YES_NO_BUTTONS,
|
||||
callback,
|
||||
modal
|
||||
);
|
||||
},
|
||||
/**
|
||||
* displays prompt dialog
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
/**
|
||||
* jQuery plugin for micro templates
|
||||
*
|
||||
* Strings are automatically escaped, but that can be disabled by setting escapeFunction to null.
|
||||
* Strings are automatically escaped, but that can be disabled by setting
|
||||
* escapeFunction to null.
|
||||
*
|
||||
* Usage examples:
|
||||
*
|
||||
|
@ -11,13 +12,15 @@
|
|||
* var htmlStr = '<p>Welcome back {user}</p>';
|
||||
* $(htmlStr).octemplate({user: 'John Q. Public'}, {escapeFunction: null});
|
||||
*
|
||||
* Be aware that the target string must be wrapped in an HTML element for the plugin to work. The following won't work:
|
||||
* Be aware that the target string must be wrapped in an HTML element for the
|
||||
* plugin to work. The following won't work:
|
||||
*
|
||||
* var textStr = 'Welcome back {user}';
|
||||
* $(textStr).octemplate({user: 'John Q. Public'});
|
||||
*
|
||||
* For anything larger than one-liners, you can use a simple $.get() ajax request to get the template,
|
||||
* or you can embed them it the page using the text/template type:
|
||||
* For anything larger than one-liners, you can use a simple $.get() ajax
|
||||
* request to get the template, or you can embed them it the page using the
|
||||
* text/template type:
|
||||
*
|
||||
* <script id="contactListItemTemplate" type="text/template">
|
||||
* <tr class="contact" data-id="{id}">
|
||||
|
|
|
@ -72,7 +72,10 @@ $(document).ready(function() {
|
|||
$('input[type="radio"]').first().click();
|
||||
}
|
||||
|
||||
if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){
|
||||
if (
|
||||
currentDbType === 'sqlite' ||
|
||||
(dbtypes.sqlite && currentDbType === undefined)
|
||||
){
|
||||
$('#datadirContent').hide(250);
|
||||
$('#databaseBackend').hide(250);
|
||||
$('#databaseField').hide(250);
|
||||
|
|
|
@ -7,16 +7,22 @@ OC.Share={
|
|||
statuses:{},
|
||||
droppedDown:false,
|
||||
/**
|
||||
* Loads ALL share statuses from server, stores them in OC.Share.statuses then
|
||||
* calls OC.Share.updateIcons() to update the files "Share" icon to "Shared"
|
||||
* according to their share status and share type.
|
||||
* Loads ALL share statuses from server, stores them in
|
||||
* OC.Share.statuses then calls OC.Share.updateIcons() to update the
|
||||
* files "Share" icon to "Shared" according to their share status and
|
||||
* share type.
|
||||
*
|
||||
* @param itemType item type
|
||||
* @param fileList file list instance, defaults to OCA.Files.App.fileList
|
||||
*/
|
||||
loadIcons:function(itemType, fileList) {
|
||||
// Load all share icons
|
||||
$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) {
|
||||
$.get(
|
||||
OC.filePath('core', 'ajax', 'share.php'),
|
||||
{
|
||||
fetch: 'getItemsSharedStatuses',
|
||||
itemType: itemType
|
||||
}, function(result) {
|
||||
if (result && result.status === 'success') {
|
||||
OC.Share.statuses = {};
|
||||
$.each(result.data, function(item, data) {
|
||||
|
@ -24,7 +30,8 @@ OC.Share={
|
|||
});
|
||||
OC.Share.updateIcons(itemType, fileList);
|
||||
}
|
||||
});
|
||||
}
|
||||
);
|
||||
},
|
||||
/**
|
||||
* Updates the files' "Share" icons according to the known
|
||||
|
@ -214,7 +221,8 @@ OC.Share={
|
|||
}
|
||||
OC.dialogs.alert(msg, t('core', 'Error while sharing'));
|
||||
}
|
||||
});
|
||||
}
|
||||
);
|
||||
},
|
||||
unshare:function(itemType, itemSource, shareType, shareWith, callback) {
|
||||
$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'unshare', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith }, function(result) {
|
||||
|
|
|
@ -84,5 +84,5 @@
|
|||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
};
|
||||
})(jQuery);
|
||||
|
|
|
@ -1,7 +1,13 @@
|
|||
OC.Tags= {
|
||||
edit:function(type, cb) {
|
||||
if(!type && !this.type) {
|
||||
throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') };
|
||||
throw {
|
||||
name: 'MissingParameter',
|
||||
message: t(
|
||||
'core',
|
||||
'The object type is not specified.'
|
||||
)
|
||||
};
|
||||
}
|
||||
type = type ? type : this.type;
|
||||
var self = this;
|
||||
|
@ -25,11 +31,23 @@ OC.Tags= {
|
|||
});
|
||||
self.deleteButton = {
|
||||
text: t('core', 'Delete'),
|
||||
click: function() {self._deleteTags(self, type, self._selectedIds())}
|
||||
click: function() {
|
||||
self._deleteTags(
|
||||
self,
|
||||
type,
|
||||
self._selectedIds()
|
||||
);
|
||||
}
|
||||
};
|
||||
self.addButton = {
|
||||
text: t('core', 'Add'),
|
||||
click: function() {self._addTag(self, type, self.$taginput.val())}
|
||||
click: function() {
|
||||
self._addTag(
|
||||
self,
|
||||
type,
|
||||
self.$taginput.val()
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
self._fillTagList(type, self.$taglist);
|
||||
|
@ -184,7 +202,10 @@ OC.Tags= {
|
|||
type = type ? type : this.type;
|
||||
var defer = $.Deferred(),
|
||||
self = this,
|
||||
url = OC.generateUrl('/tags/{type}/favorite/{id}/', {type: type, id: id});
|
||||
url = OC.generateUrl(
|
||||
'/tags/{type}/favorite/{id}/',
|
||||
{type: type, id: id}
|
||||
);
|
||||
$.post(url, function(response) {
|
||||
if(response.status === 'success') {
|
||||
defer.resolve(response);
|
||||
|
@ -208,7 +229,10 @@ OC.Tags= {
|
|||
type = type ? type : this.type;
|
||||
var defer = $.Deferred(),
|
||||
self = this,
|
||||
url = OC.generateUrl('/tags/{type}/unfavorite/{id}/', {type: type, id: id});
|
||||
url = OC.generateUrl(
|
||||
'/tags/{type}/unfavorite/{id}/',
|
||||
{type: type, id: id}
|
||||
);
|
||||
$.post(url, function(response) {
|
||||
if(response.status === 'success') {
|
||||
defer.resolve();
|
||||
|
|
|
@ -89,7 +89,8 @@ window.oc_defaults = {};
|
|||
"Content-Type": "application/json"
|
||||
},
|
||||
'{"data": [], "plural_form": "nplurals=2; plural=(n != 1);"}'
|
||||
]);
|
||||
]
|
||||
);
|
||||
|
||||
// make it globally available, so that other tests can define
|
||||
// custom responses
|
||||
|
|
|
@ -7,4 +7,5 @@ $(document).ready(function () {
|
|||
if ($loginForm.length) {
|
||||
$loginForm.find('input#submit').prop('disabled', false);
|
||||
}
|
||||
});
|
||||
}
|
||||
);
|
||||
|
|
Loading…
Reference in New Issue