DO NOT DOWNLOAD. DOWNLOAD LATEST STABLE FROM RELEASE TAB
Fixes 26360 (Content doesn't load on clean install 4.1b2) Fixes some tree, pickers and live editing issues. [TFS Changeset #64360]
This commit is contained in:
@@ -4,6 +4,8 @@ using System.Linq;
|
||||
using System.Text;
|
||||
using umbraco.uicontrols.TreePicker;
|
||||
using umbraco.interfaces;
|
||||
using System.Web.UI;
|
||||
using umbraco.presentation;
|
||||
|
||||
namespace umbraco.editorControls
|
||||
{
|
||||
@@ -44,7 +46,10 @@ namespace umbraco.editorControls
|
||||
{
|
||||
base.OnLoad(e);
|
||||
|
||||
if (!Page.IsPostBack)
|
||||
//need to check if this is an async postback in live editing, because if it is, we need to set the value
|
||||
if ((ScriptManager.GetCurrent(Page).IsInAsyncPostBack
|
||||
&& UmbracoContext.Current.LiveEditingContext.Enabled)
|
||||
|| !Page.IsPostBack)
|
||||
{
|
||||
ItemIdValue.Value = StoredItemId != -1 ? StoredItemId.ToString() : "";
|
||||
}
|
||||
@@ -68,7 +73,6 @@ namespace umbraco.editorControls
|
||||
|
||||
public void Save()
|
||||
{
|
||||
//_text = helper.Request(this.ClientID);
|
||||
if (ItemIdValue.Value.Trim() != "")
|
||||
_data.Value = ItemIdValue.Value.Trim();
|
||||
else
|
||||
|
||||
@@ -96,6 +96,7 @@ namespace umbraco.editorControls
|
||||
/// </summary>
|
||||
protected override void RenderJSComponents()
|
||||
{
|
||||
base.RenderJSComponents();
|
||||
|
||||
if (ScriptManager.GetCurrent(Page).IsInAsyncPostBack)
|
||||
{
|
||||
|
||||
@@ -19,9 +19,19 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
|
||||
return $("#" + this._itemIdValueClientID).val();
|
||||
},
|
||||
|
||||
LaunchPicker: function() {
|
||||
LaunchPicker: function(e) {
|
||||
var _this = this;
|
||||
UmbClientMgr.openModalWindow(this._itemPickerUrl, this._label, this._showHeader, this._width, this._height, 30, 0, ['#cancelbutton'], function(e) { _this.SaveSelection(e); });
|
||||
|
||||
var aBetterEventObject = jQuery.Event(e);
|
||||
// Now you can do what you want: (Cross-browser)
|
||||
aBetterEventObject.preventDefault()
|
||||
aBetterEventObject.isDefaultPrevented()
|
||||
aBetterEventObject.stopPropagation()
|
||||
aBetterEventObject.isPropagationStopped()
|
||||
aBetterEventObject.stopImmediatePropagation()
|
||||
aBetterEventObject.isImmediatePropagationStopped()
|
||||
return false;
|
||||
},
|
||||
|
||||
SaveSelection: function(e) {
|
||||
|
||||
Reference in New Issue
Block a user