From a890d45cb6e91f35c0ddc0595109839fa003f46c Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 25 Sep 2015 16:42:57 +1000 Subject: [PATCH] FIX: disable cloaked view while running ios positioning hack --- app/assets/javascripts/discourse/lib/safari-hacks.js.es6 | 4 ++++ .../javascripts/discourse/views/cloaked-collection.js.es6 | 3 +++ 2 files changed, 7 insertions(+) diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 index f8caf53de0e..cda3a60467a 100644 --- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 +++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 @@ -35,6 +35,8 @@ function positioningWorkaround($fixedElement) { if (evt) { evt.target.removeEventListener('blur', blurred); } + + $('body').removeData('disable-cloaked-view'); }; var blurred = _.debounce(blurredNow, 250); @@ -58,6 +60,8 @@ function positioningWorkaround($fixedElement) { originalScrollTop = $(window).scrollTop(); // take care of body + + $('body').data('disable-cloaked-view',true); $('#main-outlet').hide(); $('header').hide(); diff --git a/app/assets/javascripts/discourse/views/cloaked-collection.js.es6 b/app/assets/javascripts/discourse/views/cloaked-collection.js.es6 index a00c4fa13dd..b15e5c60a64 100644 --- a/app/assets/javascripts/discourse/views/cloaked-collection.js.es6 +++ b/app/assets/javascripts/discourse/views/cloaked-collection.js.es6 @@ -237,6 +237,9 @@ const CloakedCollectionView = Ember.CollectionView.extend({ }, scrollTriggered() { + if ($('body').data('disable-cloaked-view')) { + return; + } Em.run.scheduleOnce('afterRender', this, 'scrolled'); },