wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reuse selector

Browse source
This commit is contained in:
Lukas Reschke 2014-04-21 14:28:54 +02:00
parent 539cecbd63
commit 8fcffae1e2
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/js/js.js
View file

@ -397,7 +397,7 @@ var OC={
parts = queryString.replace(/\+/g, '%20').split('&');
for (var i = 0; i < parts.length; i++){
// split on first equal sign
var part = parts[i]
var part = parts[i];
pos = part.indexOf('=');
if (pos >= 0) {
components = [
@ -675,9 +675,10 @@ OC.Notification={
* @param {string} html Message to display
*/
showHtml: function(html) {
if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){
$('#notification').html(html);
$('#notification').fadeIn().css("display","inline");
var notification = $('#notification');
if((notification.filter('span.undo').length == 1) || OC.Notification.isHidden()){
notification.html(html);
notification.fadeIn().css("display","inline");
}else{
OC.Notification.queuedNotifications.push(html);
}
@ -688,9 +689,10 @@ OC.Notification={
* @param {string} text Message to display
*/
show: function(text) {
if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){
$('#notification').text(text);
$('#notification').fadeIn().css("display","inline");
var notification = $('#notification');
if((notification.filter('span.undo').length == 1) || OC.Notification.isHidden()){
notification.text(text);
notification.fadeIn().css("display","inline");
}else{
OC.Notification.queuedNotifications.push($('<div/>').text(text).html());
}