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 | 48679eeff884ce564f7a5ceb7db1b6c64e5dcb67 (patch) | |
| tree | 51725dc6cbb5222cc10840f78a49ca875233051a /phpBB | |
| parent | 9c2687ddc9ba7071f7c98c118203f96a412e3d1b (diff) | |
| parent | 6a00ff3fa666aad8a52f3f2cb5197e32a825f61e (diff) | |
| download | forums-48679eeff884ce564f7a5ceb7db1b6c64e5dcb67.tar forums-48679eeff884ce564f7a5ceb7db1b6c64e5dcb67.tar.gz forums-48679eeff884ce564f7a5ceb7db1b6c64e5dcb67.tar.bz2 forums-48679eeff884ce564f7a5ceb7db1b6c64e5dcb67.tar.xz forums-48679eeff884ce564f7a5ceb7db1b6c64e5dcb67.zip | |
Merge pull request #2529 from prototech/ticket/12641
[ticket/12641] Use jQuery's trim() method. IE8 does not support the native one.
* prototech/ticket/12641:
[ticket/12641] Use jQuery's trim() method. IE8 does not support the native one
Diffstat (limited to 'phpBB')
| -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; |