diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-05-30 12:41:24 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-05-30 12:41:24 +0200 |
| commit | e9601813c17d55f2d2daf63300559c7df347954c (patch) | |
| tree | cc650acca8a1f90b4095a3298d9c8c7e4a42d9b4 /phpBB/styles/prosilver/template/ajax.js | |
| parent | 03cb588ac63ccd924db26d82f269541d2d8df9ba (diff) | |
| parent | d6cd90d3258387493da813a1251252c57344c405 (diff) | |
| download | forums-e9601813c17d55f2d2daf63300559c7df347954c.tar forums-e9601813c17d55f2d2daf63300559c7df347954c.tar.gz forums-e9601813c17d55f2d2daf63300559c7df347954c.tar.bz2 forums-e9601813c17d55f2d2daf63300559c7df347954c.tar.xz forums-e9601813c17d55f2d2daf63300559c7df347954c.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/posting_body.html
Diffstat (limited to 'phpBB/styles/prosilver/template/ajax.js')
| -rw-r--r-- | phpBB/styles/prosilver/template/ajax.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 168efff4b4..1d95fa42fa 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -42,8 +42,8 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) { /** * This callback will mark all topic icons read * -* @param update_topic_links bool Whether "Mark topics read" links should be -* updated. Defaults to true. +* @param {bool} [update_topic_links=true] Whether "Mark topics read" links +* should be updated. Defaults to true. */ phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) { var readTitle = res.NO_UNREAD_POSTS; @@ -138,9 +138,9 @@ phpbb.markNotifications = function($popup, unreadCount) { } // Update page title - $('title').text( - (unreadCount ? '(' + unreadCount + ')' : '') + $('title').text().replace(/(\(([0-9])\))/, '') - ); + var $title = $('title'); + var originalTitle = $title.text().replace(/(\((\d+)\))/, ''); + $title.text((unreadCount ? '(' + unreadCount + ')' : '') + originalTitle); }; // This callback finds the post from the delete link, and removes it. @@ -205,7 +205,7 @@ phpbb.addAjaxCallback('vote_poll', function(res) { // Set min-height to prevent the page from jumping when the content changes var updatePanelHeight = function (height) { - var height = (typeof height === 'undefined') ? panel.find('.inner').outerHeight() : height; + height = (typeof height === 'undefined') ? panel.find('.inner').outerHeight() : height; panel.css('min-height', height); }; updatePanelHeight(); @@ -378,7 +378,7 @@ $('#member_search').click(function () { */ $(function() { phpbb.resizeTextArea($('textarea:not(#message-box textarea, .no-auto-resize)'), {minHeight: 75, maxHeight: 250}); - phpbb.resizeTextArea($('#message-box textarea')); + phpbb.resizeTextArea($('textarea', '#message-box')); }); |