incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [2/2] git commit: [#4257] Ugly hack to fix Access Denied error in IE
Date Wed, 22 Jan 2014 17:11:02 GMT
[#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 <cjohns@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/37cfa403
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/37cfa403
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/37cfa403

Branch: refs/heads/cj/4257
Commit: 37cfa4039e00bb028b580940c318fafc89f9bf8d
Parents: c816fe8
Author: Cory Johns <cjohns@slashdotmedia.com>
Authored: Wed Jan 22 17:05:58 2014 +0000
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Wed Jan 22 17:06:10 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/37cfa403/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


Mime
View raw message