From dcd73c5207b47a5e0ee7dc13849bec27cabdea55 Mon Sep 17 00:00:00 2001 From: starfighter83 Date: Tue, 14 Sep 2010 07:55:58 +0000 Subject: [PATCH] WIP installer refactor, update to image uploader, if width and height not supplied, skip crop step [TFS Changeset #77163] --- .../Modules/SkinModule/ImageUploader.aspx.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs index 36c3fa63ad..4f441fa154 100644 --- a/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs +++ b/umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs @@ -36,8 +36,16 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule { Image1.ImageUrl = this.ResolveUrl("~/media/upload/" + g) + "/" + FileUpload1.FileName; Image.Value = Image1.ImageUrl; - pnl_crop.Visible = true; - pnl_upload.Visible = false; + + if (!string.IsNullOrEmpty(Request["w"]) && !string.IsNullOrEmpty(Request["h"])) + { + pnl_crop.Visible = true; + pnl_upload.Visible = false; + } + else + { + Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "setimage", " $(function () { setImage(); })", true); + } } else throw new Exception("Not a valid image");