From af57cc12e4fbe5c2626670dae6ed00394645b51b Mon Sep 17 00:00:00 2001
From: starfighter83 <unknown@kiln.example.com>
Date: Fri, 19 Nov 2010 13:32:36 +0000
Subject: [PATCH] WIP skinning, fixes #29503 and #29502

[TFS Changeset #80230]
---
 umbraco/cms/businesslogic/skinning/dependencies/Image.cs    | 5 ++++-
 .../LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs    | 2 +-
 .../LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs   | 6 +++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/umbraco/cms/businesslogic/skinning/dependencies/Image.cs b/umbraco/cms/businesslogic/skinning/dependencies/Image.cs
index 0201a6a608..3840164d7b 100644
--- a/umbraco/cms/businesslogic/skinning/dependencies/Image.cs
+++ b/umbraco/cms/businesslogic/skinning/dependencies/Image.cs
@@ -24,6 +24,7 @@ namespace umbraco.cms.businesslogic.skinning.dependencies
 
 
             iu = new ImageUploader();
+            
             _value = new List<object>();
         }
         
@@ -33,7 +34,7 @@ namespace umbraco.cms.businesslogic.skinning.dependencies
             {
                 iu.TextMode = System.Web.UI.WebControls.TextBoxMode.SingleLine;
                 iu.CssClass = "image";
-                iu.ID = "imageupload";
+
 
                 int w;
 
@@ -57,6 +58,8 @@ namespace umbraco.cms.businesslogic.skinning.dependencies
             }
         }
 
+
+
         public override List<Object> Values
         {
             get
diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
index 7d64e22141..e7795760c1 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
@@ -44,7 +44,7 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
                     Image1.ImageUrl = this.ResolveUrl("~/media/upload/" + g) + "/" + FileUpload1.FileName;
                     Image.Value = Image1.ImageUrl;
 
-                    if (!string.IsNullOrEmpty(Request["w"]) && !string.IsNullOrEmpty(Request["h"]))
+                    if ((!string.IsNullOrEmpty(Request["w"]) && Request["w"].ToString() != "0") && (!string.IsNullOrEmpty(Request["h"]) && Request["h"].ToString() != "0"))
                     {
 
                         if (Convert.ToInt32(Request["w"]) > MaxWidth || Convert.ToInt32(Request["h"]) > MaxHeight)
diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
index b130285970..92ad6ddc14 100644
--- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
+++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
@@ -62,18 +62,22 @@ namespace umbraco.presentation.LiveEditing.Modules.SkinModule
             this.ph_dependencies.Controls.Clear();
             StringBuilder builder = new StringBuilder();
             builder.Append("\r\n  var hasSetTasksClientScriptsRun = false; \r\n                function setTasksClientScripts(){ \r\n                    if(hasSetTasksClientScriptsRun == false){");
-            
+
+            int c = 0;
             foreach (Dependency dependency in this.ActiveSkin.Dependencies)
             {
                 if (dependency.DependencyType != null)
                 {
                     this.sDependencies.Add(dependency);
                     Control editor = dependency.DependencyType.Editor;
+                    editor.ID = "depcontrol" + c;
                     this.ph_dependencies.addProperty(dependency.Label, editor);
                     foreach (Task task in dependency.Tasks)
                     {
                         builder.Append(task.TaskType.PreviewClientScript(editor.ClientID, dependency.DependencyType.ClientSidePreviewEventType(), dependency.DependencyType.ClientSideGetValueScript()));
                     }
+
+                    c++;
                 }
             }
             builder.Append("hasSetTasksClientScriptsRun = true; }}");