diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-09-20 14:16:01 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-09-20 14:16:01 +0200 |
| commit | 20982df71e02e3526438368168e402eeb043d6ea (patch) | |
| tree | f4529a0d9958e0db05225f1e1e1a91a3bdb16f40 /phpBB/assets/javascript/core.js | |
| parent | 26f6f6208b65b4355a40add4c86013d9a8e085dd (diff) | |
| parent | ff6d590b3693c5a20f1626664bb92bb18f384d3a (diff) | |
| download | forums-20982df71e02e3526438368168e402eeb043d6ea.tar forums-20982df71e02e3526438368168e402eeb043d6ea.tar.gz forums-20982df71e02e3526438368168e402eeb043d6ea.tar.bz2 forums-20982df71e02e3526438368168e402eeb043d6ea.tar.xz forums-20982df71e02e3526438368168e402eeb043d6ea.zip | |
Merge pull request #3851 from hanakin/ticket/12769
[ticket/12769] Font-Awesome Integration & Icon overhaul
Diffstat (limited to 'phpBB/assets/javascript/core.js')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 6285a16734..6a008ba1ec 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -957,12 +957,6 @@ phpbb.addAjaxCallback('toggle_link', function() { $anchor.each(function() { var $this = $(this); - // Toggle link text - toggleText = $this.attr('data-toggle-text'); - $this.attr('data-toggle-text', $this.text()); - $this.attr('title', $.trim(toggleText)); - $this.text(toggleText); - // Toggle link url toggleUrl = $this.attr('data-toggle-url'); $this.attr('data-toggle-url', $this.attr('href')); @@ -970,8 +964,14 @@ phpbb.addAjaxCallback('toggle_link', function() { // Toggle class of link parent toggleClass = $this.attr('data-toggle-class'); - $this.attr('data-toggle-class', $this.parent().attr('class')); - $this.parent().attr('class', toggleClass); + $this.attr('data-toggle-class', $this.children().attr('class')); + $this.children('.icon').attr('class', toggleClass); + + // Toggle link text + toggleText = $this.attr('data-toggle-text'); + $this.attr('data-toggle-text', $this.children('span').text()); + $this.attr('title', $.trim(toggleText)); + $this.children('span').text(toggleText); }); }); |