diff --git a/r2/r2/public/static/js/blogbutton.js b/r2/r2/public/static/js/blogbutton.js index e0daffbfe..752d31ec3 100644 --- a/r2/r2/public/static/js/blogbutton.js +++ b/r2/r2/public/static/js/blogbutton.js @@ -1,4 +1,6 @@ $(function() { + reddit.external_frame = true; + /* set default arrow behavior */ var state = null; function color(x) { diff --git a/r2/r2/public/static/js/jquery.reddit.js b/r2/r2/public/static/js/jquery.reddit.js index 960875959..007d7f5b6 100644 --- a/r2/r2/public/static/js/jquery.reddit.js +++ b/r2/r2/public/static/js/jquery.reddit.js @@ -167,7 +167,7 @@ $.request = function(op, parameters, worker_in, block, type, var action = op; var worker = worker_in; - if (rate_limit(op)) + if (rate_limit(op) || (window != window.top && !reddit.cnameframe && !reddit.external_frame)) return; /* we have a lock if we are not blocking or if we have gotten a lock */ diff --git a/r2/r2/templates/frametoolbar.html b/r2/r2/templates/frametoolbar.html index bab6c9884..ca39e2015 100644 --- a/r2/r2/templates/frametoolbar.html +++ b/r2/r2/templates/frametoolbar.html @@ -31,6 +31,7 @@ <%def name="javascript_run()"> ${parent.javascript_run()} + reddit.external_frame = true; toolbar = new toolbar_p("${panel_size('expanded')}", "${panel_size('collapsed')}");