diff options
| author | Callum Macrae <callum@lynxphp.com> | 2011-10-22 16:37:35 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:09:20 +0200 |
| commit | 81200236052333f88bbf6ecf0c2198080481c07a (patch) | |
| tree | 2018395b9a5820530b069e45213a3c321a6571e0 /phpBB | |
| parent | 95659ba92c01a3cf4c654568e9a59ba554558a7e (diff) | |
| download | forums-81200236052333f88bbf6ecf0c2198080481c07a.tar forums-81200236052333f88bbf6ecf0c2198080481c07a.tar.gz forums-81200236052333f88bbf6ecf0c2198080481c07a.tar.bz2 forums-81200236052333f88bbf6ecf0c2198080481c07a.tar.xz forums-81200236052333f88bbf6ecf0c2198080481c07a.zip | |
[ticket/10271] data-ajax="false" is now ignored.
PHPBB3-10271
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/ajax.js | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ajax.js | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js index 2fdabd2a80..cb3289b936 100644 --- a/phpBB/adm/style/ajax.js +++ b/phpBB/adm/style/ajax.js @@ -74,8 +74,11 @@ phpbb.add_ajax_callback('row_delete', function(el) { $('[data-ajax]').each(function() { var $this = $(this); - var fn = ($this.data('ajax') !== 'true') ? $this.data('ajax') : null; - phpbb.ajaxify({selector: this}, $this.data('refresh') !== undefined, fn); + if ($this.data('ajax') !== 'false') + { + var fn = ($this.data('ajax') !== 'true') ? $this.data('ajax') : null; + phpbb.ajaxify({selector: this}, $this.data('refresh') !== undefined, fn); + } }); diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 4fd4cd32f5..ca720f77eb 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -45,8 +45,11 @@ phpbb.add_ajax_callback('zebra', function(el, res) { $('[data-ajax]').each(function() { var $this = $(this); - var fn = ($this.data('ajax') !== 'true') ? $this.data('ajax') : null; - phpbb.ajaxify({selector: this}, $this.data('refresh') !== undefined, fn); + if ($this.data('ajax') !== 'false') + { + var fn = ($this.data('ajax') !== 'true') ? $this.data('ajax') : null; + phpbb.ajaxify({selector: this}, $this.data('refresh') !== undefined, fn); + } }); |