diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-01 23:43:00 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-01 23:43:00 +0200 |
| commit | bb07dde9881368f5727133b73f6017deae4ff18d (patch) | |
| tree | d575bf34ed2d3db48658dcf1b53730cfa7431200 /core/js/js.js | |
| parent | 12976fb2e1f6a4d6a054ba2b620f0e7707ce2c69 (diff) | |
| parent | c7770265063045a8de69f4171236ffe33a22c87e (diff) | |
| download | nextcloud-server-bb07dde9881368f5727133b73f6017deae4ff18d.tar.gz nextcloud-server-bb07dde9881368f5727133b73f6017deae4ff18d.zip | |
Merge branch 'master' into convert-oc_config
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/js/js.js b/core/js/js.js index 08b429a555b..3904787c4e5 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -352,10 +352,10 @@ OC.Notification={ }, show: function(text) { if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){ - $('#notification').html(text); + $('#notification').text(text); $('#notification').fadeIn().css("display","inline"); }else{ - OC.Notification.queuedNotifications.push($(text).html()); + OC.Notification.queuedNotifications.push($('<div/>').text(text).html()); } }, isHidden: function() { |