You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2014/01/23 18:30:48 UTC
[6/9] git commit: [#4257] Ugly hack to fix Access Denied error in IE
[#4257] Ugly hack to fix Access Denied error in IE
It seems that some combination of IE11, jQuery 1.8.0, and possibly
something else on our page, doing $('<li>elem</li>') causes IE to raise
an "Access denied" error claiming that we're attempting cross-site
javascript iframe access. However, doing $('#elem').append('<li>elem</li>')
works fine. I'd prefer to upgrade jQuery but this is a quicker work-around.
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/a3c5bf7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/a3c5bf7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/a3c5bf7f
Branch: refs/heads/master
Commit: a3c5bf7f2328c21303f17a6a1f1aeffb7fab02d2
Parents: c77b366
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Wed Jan 22 17:05:58 2014 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Thu Jan 23 17:28:04 2014 +0000
----------------------------------------------------------------------
.../forgeactivity/nf/activity/js/activity.js | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a3c5bf7f/ForgeActivity/forgeactivity/nf/activity/js/activity.js
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/nf/activity/js/activity.js b/ForgeActivity/forgeactivity/nf/activity/js/activity.js
index f6807d7..80b79d8 100644
--- a/ForgeActivity/forgeactivity/nf/activity/js/activity.js
+++ b/ForgeActivity/forgeactivity/nf/activity/js/activity.js
@@ -164,16 +164,21 @@ $(function() {
}
var newerText = newer ? 'newer' : 'older';
$.get(url, function(html) {
- var $html = $(html);
var $timeline = $('.timeline');
- var newPage = $html.data('page');
+ var empty = html.match(/^\s*$/);
+ var newestPage = newer && $('.timeline li:first').data('page') <= 1;
var limit = $('.timeline').data('limit');
+ var fullPage = true;
saveScrollPosition();
- if ($html.length < limit || newPage == 0) {
+ if (!empty) {
+ $timeline[newer ? 'prepend' : 'append'](html);
+ var newPage = $timeline.find('li:' + (newer ? 'first' : 'last')).data('page');
+ fullPage = $timeline.find('li:timeline-page('+newPage+')').length == limit;
+ pageOut(!newer);
+ }
+ if (empty || !fullPage || newestPage) {
makeNoMore(newer);
}
- $timeline[newer ? 'prepend' : 'append']($html);
- pageOut(!newer);
if (ASOptions.useShowMore) {
// this has to be here instead of showMoreLink handler to
// ensure that scroll changes between added / removed content