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

Merge

Browse Source
This commit is contained in:
Shannon Deminick
2012-10-18 07:17:20 +05:00
parent 7d8524dd55 4c667a6a3e
commit c0f7493e70
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -2188,9 +2188,9 @@
<Content Include="config\log4net.config" />
<Content Include="config\FileSystemProviders.config" />
<Content Include="config\EmbeddedMedia.config" />
<Content Include="web.config">
<None Include="web.config">
<SubType>Designer</SubType>
</Content>
</None>
<None Include="web.Template.BODENKO-04.Debug.config">
<DependentUpon>Web.Template.config</DependentUpon>
<SubType>Designer</SubType>

5
src/umbraco.controls/TreePicker/BaseTreePicker.cs
View File

@@ -141,13 +141,14 @@ namespace umbraco.uicontrols.TreePicker
/// </summary>
protected virtual void RenderJSComponents()
{
const string scriptKey = "BaseTreePickerScripts";
if (ScriptManager.GetCurrent(Page).IsInAsyncPostBack)
{
ScriptManager.RegisterStartupScript(this, this.GetType(), this.GetType().ToString(), BaseTreePickerScripts.BaseTreePicker, true);
ScriptManager.RegisterStartupScript(this, this.GetType(), scriptKey, BaseTreePickerScripts.BaseTreePicker, true);
}
else
{
Page.ClientScript.RegisterClientScriptBlock(typeof(BaseTreePicker), this.GetType().ToString(), BaseTreePickerScripts.BaseTreePicker, true);
Page.ClientScript.RegisterClientScriptBlock(typeof(BaseTreePicker), scriptKey, BaseTreePickerScripts.BaseTreePicker, true);
}
}