From e2ca5d058df85c1903a4276fa4ef85cb44a71ebd Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 12 Apr 2010 23:05:43 +0000 Subject: [PATCH] BUGFIX: Fixed CMS Editor loading in AssetAdmin (from r97638) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102521 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- javascript/HtmlEditorField.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/javascript/HtmlEditorField.js b/javascript/HtmlEditorField.js index e082082a8..625c4ea7c 100644 --- a/javascript/HtmlEditorField.js +++ b/javascript/HtmlEditorField.js @@ -11,7 +11,7 @@ /** * On page refresh load the initial images (in root) */ - if($("#FolderImages").length > 0) loadImages(); + if($("#FolderImages").length > 0 && $("body.CMSMain").length > 0) loadImages(); /** * Show / Hide the Upload Form @@ -55,7 +55,7 @@ * * */ - function loadImages(sel) { + function loadImages() { console.debug(this); $.get('admin/EditorToolbar/ImageForm', { action_callfieldmethod: "1",