js optimisations and style fixes
This commit is contained in:
parent
6806484c16
commit
a867b36e7f
|
@ -44,7 +44,7 @@ function t(app,text, vars){
|
||||||
return typeof r === 'string' || typeof r === 'number' ? r : a;
|
return typeof r === 'string' || typeof r === 'number' ? r : a;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
};
|
||||||
if( typeof( t.cache[app][text] ) !== 'undefined' ){
|
if( typeof( t.cache[app][text] ) !== 'undefined' ){
|
||||||
if(typeof vars === 'object') {
|
if(typeof vars === 'object') {
|
||||||
return _build(t.cache[app][text], vars);
|
return _build(t.cache[app][text], vars);
|
||||||
|
@ -247,7 +247,6 @@ var OC={
|
||||||
var popup = $('#appsettings_popup');
|
var popup = $('#appsettings_popup');
|
||||||
if(popup.length == 0) {
|
if(popup.length == 0) {
|
||||||
$('body').prepend('<div class="popup hidden" id="appsettings_popup"></div>');
|
$('body').prepend('<div class="popup hidden" id="appsettings_popup"></div>');
|
||||||
popup = $('#appsettings_popup');
|
|
||||||
popup.addClass(settings.hasClass('topright') ? 'topright' : 'bottomleft');
|
popup.addClass(settings.hasClass('topright') ? 'topright' : 'bottomleft');
|
||||||
}
|
}
|
||||||
if(popup.is(':visible')) {
|
if(popup.is(':visible')) {
|
||||||
|
@ -308,14 +307,16 @@ OC.Notification={
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
showHtml: function(html) {
|
showHtml: function(html) {
|
||||||
$('#notification').hide();
|
var notification = $('#notification');
|
||||||
$('#notification').html(html);
|
notification.hide();
|
||||||
$('#notification').fadeIn();
|
notification.html(html);
|
||||||
|
notification.fadeIn();
|
||||||
},
|
},
|
||||||
show: function(text) {
|
show: function(text) {
|
||||||
$('#notification').hide();
|
var notification = $('#notification');
|
||||||
$('#notification').text(text);
|
notification.hide();
|
||||||
$('#notification').fadeIn();
|
notification.text(text);
|
||||||
|
notification.fadeIn();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue