diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-07-27 19:51:47 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-07-27 19:51:47 +0200 |
| commit | 82d9803aa85ca88462a3a6249eec2ba5e8c9bc0d (patch) | |
| tree | 4f8c1eb085344230194bf10e61948b958dfb2724 | |
| parent | 09d00afcc38aa92142dfa134039a3ea782747bed (diff) | |
| parent | e94f24c8217d0a8837fd245292169e68c640c2c7 (diff) | |
| download | forums-82d9803aa85ca88462a3a6249eec2ba5e8c9bc0d.tar forums-82d9803aa85ca88462a3a6249eec2ba5e8c9bc0d.tar.gz forums-82d9803aa85ca88462a3a6249eec2ba5e8c9bc0d.tar.bz2 forums-82d9803aa85ca88462a3a6249eec2ba5e8c9bc0d.tar.xz forums-82d9803aa85ca88462a3a6249eec2ba5e8c9bc0d.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12843] Fix Mark forums read browser console error
| -rw-r--r-- | phpBB/assets/javascript/core.js | 12 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ajax.js | 11 |
2 files changed, 12 insertions, 11 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index b905c4c82d..388f31698f 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -48,6 +48,18 @@ phpbb.clearLoadingTimeout = function() { } }; + +/** +* Close popup alert after a specified delay +* +* @param int Delay in ms until darkenwrapper's click event is triggered +*/ +phpbb.closeDarkenWrapper = function(delay) { + phpbbAlertTimer = setTimeout(function() { + $('#darkenwrapper').trigger('click'); + }, delay); +}; + /** * Display a simple alert similar to JSs native alert(). * diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 70bc703582..649a384418 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -2,17 +2,6 @@ "use strict"; -/** -* Close popup alert after a specified delay -* -* @param int Delay in ms until darkenwrapper's click event is triggered -*/ -phpbb.closeDarkenWrapper = function(delay) { - phpbbAlertTimer = setTimeout(function() { - $('#darkenwrapper').trigger('click'); - }, delay); -}; - // This callback will mark all forum icons read phpbb.addAjaxCallback('mark_forums_read', function(res) { var readTitle = res.NO_UNREAD_POSTS; |