From d76bdb80a9b60029754569160cd46fba7dda4fc2 Mon Sep 17 00:00:00 2001 From: starfighter83 Date: Tue, 28 Sep 2010 09:59:27 +0000 Subject: [PATCH] WIP installer refactor, moving some js around [TFS Changeset #77556] --- umbraco/presentation/umbraco.presentation.csproj | 4 ++-- .../umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs | 2 +- .../Modules/SkinModule/{ => js}/SkinModuleShowOnStartup.js | 0 .../LiveEditing/Modules/SkinModule}/js/initcolorpicker.js | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/{ => js}/SkinModuleShowOnStartup.js (100%) rename umbraco/presentation/{umbraco_client/colorpicker => umbraco/LiveEditing/Modules/SkinModule}/js/initcolorpicker.js (100%) diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj index d69875f021..e6dd3ebcb2 100644 --- a/umbraco/presentation/umbraco.presentation.csproj +++ b/umbraco/presentation/umbraco.presentation.csproj @@ -1628,7 +1628,7 @@ - + @@ -1661,7 +1661,7 @@ - + diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs index 17178623b8..438b60237a 100644 --- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs +++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs @@ -67,7 +67,7 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule true); - ClientDependencyLoader.Instance.RegisterDependency(500, "LiveEditing/Modules/SkinModule/SkinModuleShowOnStartup.js", "UmbracoRoot", ClientDependencyType.Javascript); + ClientDependencyLoader.Instance.RegisterDependency(500, "LiveEditing/Modules/SkinModule/js/SkinModuleShowOnStartup.js", "UmbracoRoot", ClientDependencyType.Javascript); } } } diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModuleShowOnStartup.js b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/SkinModuleShowOnStartup.js similarity index 100% rename from umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModuleShowOnStartup.js rename to umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/SkinModuleShowOnStartup.js diff --git a/umbraco/presentation/umbraco_client/colorpicker/js/initcolorpicker.js b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/initcolorpicker.js similarity index 100% rename from umbraco/presentation/umbraco_client/colorpicker/js/initcolorpicker.js rename to umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/js/initcolorpicker.js