diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-31 23:00:07 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-31 23:00:07 +0200 |
| commit | c000520add375da94d75d24f05ceb34ef0538475 (patch) | |
| tree | 90b38fee5561c4ba23683dc8019d2d4ac2bedbc8 | |
| parent | 93c310f66b42e2090f3abeaa814aaa487ed8f16a (diff) | |
| parent | 48679eeff884ce564f7a5ceb7db1b6c64e5dcb67 (diff) | |
| download | forums-c000520add375da94d75d24f05ceb34ef0538475.tar forums-c000520add375da94d75d24f05ceb34ef0538475.tar.gz forums-c000520add375da94d75d24f05ceb34ef0538475.tar.bz2 forums-c000520add375da94d75d24f05ceb34ef0538475.tar.xz forums-c000520add375da94d75d24f05ceb34ef0538475.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12641] Use jQuery's trim() method. IE8 does not support the native one
| -rw-r--r-- | phpBB/adm/style/admin.js | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/forum_fn.js | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index 7bda86e1e3..a839e7e0e2 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -75,7 +75,7 @@ function parse_document(container) var cell = $(this), colspan = parseInt(cell.attr('colspan')), dfn = cell.attr('data-dfn'), - text = dfn ? dfn : cell.text().trim(); + text = dfn ? dfn : $.trim(cell.text()); if (text == ' ') text = ''; colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan; @@ -114,7 +114,7 @@ function parse_document(container) cells.each(function() { var cell = $(this), colspan = parseInt(cell.attr('colspan')), - text = cell.text().trim(); + text = $.trim(cell.text()); if (headersLength <= column) { return; diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index a4ede51f4b..52293a8f2a 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -517,7 +517,7 @@ function parse_document(container) block = $this.find('dt .responsive-show:last-child'); } else { - first = (block.text().trim().length == 0); + first = ($.trim(block.text()).length == 0); } // Copy contents of each column @@ -570,7 +570,7 @@ function parse_document(container) block = $this.find('dt .responsive-show:last-child'); } else { - first = (block.text().trim().length == 0); + first = ($.trim(block.text()).length == 0); } // Copy contents of each column @@ -648,7 +648,7 @@ function parse_document(container) cells.each(function() { var cell = $(this), colspan = parseInt(cell.attr('colspan')), - text = cell.text().trim(); + text = $.trim(cell.text()); if (headersLength <= column) { return; |