lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-27 04:19:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.9-int' into 1.x

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-04-25 10:31:55 +02:00
parent 21d80434e8 20adb3bf51
commit c9d30d6cc2
12 changed files with 136 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Layouts/Views/ElementEditor.cshtml
View File

@@ -43,7 +43,7 @@
html: LayoutEditor.decode("@Url.Encode(Model.ElementHtml)"),
isTemplated: false
},
elementEditorModel: LayoutEditor.decode("@Html.Raw(Url.Encode(Model.ElementEditorModel.ToJson()))")
elementEditorModel: JSON.parse(LayoutEditor.decode("@Html.Raw(Url.Encode(Model.ElementEditorModel.ToJson()))"))
};
window.parent.currentDialog.trigger("command", payload);