From e34956d12fc082d9d1381ee342b2db963e6d1b03 Mon Sep 17 00:00:00 2001 From: starfighter83 Date: Fri, 18 Sep 2009 17:00:51 +0000 Subject: [PATCH] fixes MediaPickerService not found in canvas [TFS Changeset #59260] --- .../editorControls/mediapicker/mediaChooser.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/components/editorControls/mediapicker/mediaChooser.cs b/components/editorControls/mediapicker/mediaChooser.cs index d5034a67cd..8fde2e5cc5 100644 --- a/components/editorControls/mediapicker/mediaChooser.cs +++ b/components/editorControls/mediapicker/mediaChooser.cs @@ -78,11 +78,18 @@ namespace umbraco.editorControls ClientDependencyLoader.Instance.RegisterDependency("webservices/legacyAjaxCalls.asmx/js", "UmbracoRoot", ClientDependencyType.Javascript); // And a reference to the media picker calls - ScriptManager sm = ScriptManager.GetCurrent(base.Page); - ServiceReference webservicePath = new ServiceReference(GlobalSettings.Path + "/webservices/MediaPickerService.asmx"); + if (!UmbracoContext.Current.LiveEditingContext.Enabled) + { + ScriptManager sm = ScriptManager.GetCurrent(base.Page); + ServiceReference webservicePath = new ServiceReference(GlobalSettings.Path + "/webservices/MediaPickerService.asmx"); - if (!sm.Services.Contains(webservicePath)) - sm.Services.Add(webservicePath); + if (!sm.Services.Contains(webservicePath)) + sm.Services.Add(webservicePath); + } + else + { + ClientDependencyLoader.Instance.RegisterDependency("webservices/MediaPickerService.asmx/js", "UmbracoRoot", ClientDependencyType.Javascript); + } } protected override void Render(System.Web.UI.HtmlTextWriter writer)