From 8d2b26daea98b243ad227946553aa7b261b217df Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Tue, 5 Aug 2014 23:26:22 -0400 Subject: [PATCH] Restore original display after window resizing. fixes #3597 --- core/client/controllers/posts.js | 5 +++++ core/client/views/posts.js | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/core/client/controllers/posts.js b/core/client/controllers/posts.js index a7db12c6a9..bf2c8f1d60 100644 --- a/core/client/controllers/posts.js +++ b/core/client/controllers/posts.js @@ -75,6 +75,11 @@ var PostsController = Ember.ArrayController.extend(PaginationControllerMixin, { }, actions: { + resetContentPreview: function () { + $('.content-list').removeAttr('style'); + $('.content-preview').removeAttr('style'); + }, + showContentPreview: function () { $('.content-list').animate({right: '100%', left: '-100%', 'margin-right': '15px'}, 300); $('.content-preview').animate({right: '0', left: '0', 'margin-left': '0'}, 300); diff --git a/core/client/views/posts.js b/core/client/views/posts.js index da9b34162c..d3f2105302 100644 --- a/core/client/views/posts.js +++ b/core/client/views/posts.js @@ -1,4 +1,4 @@ -import {responsiveAction} from 'ghost/utils/mobile'; +import {mobileQuery, responsiveAction} from 'ghost/utils/mobile'; var PostsView = Ember.View.extend({ target: Ember.computed.alias('controller'), @@ -8,6 +8,13 @@ var PostsView = Ember.View.extend({ mobileInteractions: function () { Ember.run.scheduleOnce('afterRender', this, function () { var self = this; + + $(window).resize(function () { + if (!mobileQuery.matches) { + self.send('resetContentPreview'); + } + }); + // ### Show content preview when swiping left on content list $('.manage').on('click', '.content-list ol li', function (event) { responsiveAction(event, '(max-width: 800px)', function () {