From a4de37efb9140cc429cbbaf1e7bfa1d88a4dd5b8 Mon Sep 17 00:00:00 2001 From: leekelleher Date: Mon, 20 Oct 2014 11:30:46 +0100 Subject: [PATCH] Fixes U4-5658 - Dictionary tree JS: 'openDictionary' defined in Languages tree --- .../umbraco.presentation/umbraco/Trees/loadDictionary.cs | 8 +++++--- .../umbraco.presentation/umbraco/Trees/loadLanguages.cs | 4 ---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs index ad7a41b51c..78f44a1e9b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs @@ -53,11 +53,13 @@ namespace umbraco public override void RenderJS(ref StringBuilder Javascript) { Javascript.Append( - @" + @" + function openDictionary() { + UmbClientMgr.contentFrame('settings/DictionaryItemList.aspx'); + } function openDictionaryItem(id) { UmbClientMgr.contentFrame('settings/editDictionaryItem.aspx?id=' + id); - } - "); + }"); } public override void Render(ref XmlTree tree) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadLanguages.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadLanguages.cs index 7dd10e3755..c43edff371 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadLanguages.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadLanguages.cs @@ -46,10 +46,6 @@ namespace umbraco @" function openLanguage(id) { UmbClientMgr.contentFrame('settings/editLanguage.aspx?id=' + id); -} - -function openDictionary() { - UmbClientMgr.contentFrame('settings/DictionaryItemList.aspx'); }"); }