mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

js optimisations and style fixes

This commit is contained in:
Thomas Mueller 2013-01-06 10:41:07 +01:00
parent 6806484c16
commit a867b36e7f
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/js/js.js
View File

@ -37,14 +37,14 @@ function t(app,text, vars){
t.cache[app] = []; t.cache[app] = [];
} }
} }
var _build = function(text, vars) { var _build = function (text, vars) {
return text.replace(/{([^{}]*)}/g, return text.replace(/{([^{}]*)}/g,
function (a, b) { function (a, b) {
var r = vars[b]; var r = vars[b];
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();
} }
}; };