From 44cff2300967f966bef89eac15ccd66d481efaa8 Mon Sep 17 00:00:00 2001 From: Sam Georges Date: Wed, 10 Sep 2014 07:25:11 +1000 Subject: [PATCH] Fixes #604 where code editor has been forcibly removed --- modules/cms/assets/js/october.cmspage.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/cms/assets/js/october.cmspage.js b/modules/cms/assets/js/october.cmspage.js index 8749a97c8..1785e11a8 100644 --- a/modules/cms/assets/js/october.cmspage.js +++ b/modules/cms/assets/js/october.cmspage.js @@ -439,12 +439,13 @@ function addTokenExpanderToEditor(pane, $form) { var group = $('[data-field-name=markup]', pane), editor = $('[data-control=codeeditor]', group), - toolbar = editor.codeEditor('getToolbar'), canExpand = false - if (editor.data('oc.tokenexpander')) + if (!editor.length || editor.data('oc.tokenexpander')) return + var toolbar = editor.codeEditor('getToolbar') + editor.tokenExpander() var breakButton = $('
  • ').prop({ 'class': 'tokenexpander-button' }).append(