yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP installer refactor, use ClientDependency on Image Uploader

Browse Source 
[TFS Changeset #77165]
This commit is contained in:
starfighter83
2010-09-14 08:36:00 +00:00
parent bab260c032
commit ad165945e3
2 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx
View File

@@ -1,4 +1,6 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ImageUploader.aspx.cs" Inherits="umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule.ImageUploader" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -26,9 +28,14 @@
-->
</style>
<script type="text/javascript" src="../../../../umbraco_client/ui/jquery.js"></script>
<script type="text/javascript" src="../../../../umbraco_client/ui/jqueryui.js"></script>
<script type="text/javascript" src="../../../../umbraco_client/mousewheel/jquery.mousewheel.js"></script>
<cc1:UmbracoClientDependencyLoader runat="server" id="ClientLoader" />
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient"
Priority="0" />
<umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/jqueryui.js" PathNameAlias="UmbracoClient"
Priority="1" />
<umb:JsInclude ID="JsInclude3" runat="server" FilePath="mousewheel/jquery.mousewheel.js" PathNameAlias="UmbracoClient"
Priority="2" />
<script type="text/javascript">

27
umbraco/presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.designer.cs generated
View File

@@ -12,6 +12,33 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule {
public partial class ImageUploader {
/// <summary>
/// JsInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
/// <summary>
/// JsInclude2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::ClientDependency.Core.Controls.JsInclude JsInclude2;
/// <summary>
/// JsInclude3 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::ClientDependency.Core.Controls.JsInclude JsInclude3;
/// <summary>
/// form1 control.
/// </summary>