Merge branch 'wip/halcyon-db-datasource' of https://github.com/octobercms/october into wip/halcyon-db-datasource

2018-12-16 09:44:01 -06:00 · 2018-12-16 09:44:01 -06:00 · 42f3ecfa19
parent 5f78fd4df9 52fe8586e3
commit 42f3ecfa19
1 changed files with 6 additions and 1 deletions
--- 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()
    }