From 52fe8586e31e3454d7baa346737d822ead29e5e1 Mon Sep 17 00:00:00 2001 From: Farrow Date: Sat, 1 Dec 2018 18:36:40 +0000 Subject: [PATCH] Make Inspector element available outside of dragscroll contexts Credit to @Farrow. Update to the javascript cmsPage onInspectorShowing event handler to make it check whether the event target has a dragScroll attached to it (which it previously assumed it did). This allows the inspector to be used in other locations on the backend which are outside of a dragscroll without causing a javascript error. --- modules/cms/assets/js/october.cmspage.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/cms/assets/js/october.cmspage.js b/modules/cms/assets/js/october.cmspage.js index af1efc8a9..425a0bd48 100644 --- a/modules/cms/assets/js/october.cmspage.js +++ b/modules/cms/assets/js/october.cmspage.js @@ -386,7 +386,12 @@ } CmsPage.prototype.onInspectorShowing = function(ev, data) { - $(ev.currentTarget).closest('[data-control="toolbar"]').data('oc.dragScroll').goToElement(ev.currentTarget, data.callback) + var $dragScroll = $(ev.currentTarget).closest('[data-control="toolbar"]').data('oc.dragScroll') + if ($dragScroll) { + $dragScroll.goToElement(ev.currentTarget, data.callback) + } else { + data.callback(); + } ev.stopPropagation() }