lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 11:44:58 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.9.x' into dev

Browse Source 
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutDesignerHost.js
This commit is contained in:
sfmskywalker
2015-12-18 00:33:56 +01:00
parent 9bba785d42 da8898e946
commit 72aa82c048
10 changed files with 65 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutDesignerHost.js
View File

@@ -1,9 +1,9 @@
(function ($) {
var LayoutDesignerHost = function (element) {
var LayoutDesignerHost = function (element, layoutEditor) {
var self = this;
this.element = element;
this.element.data("layout-designer-host", this);
this.editor = window.layoutEditor;
this.editor = layoutEditor;
this.settings = {
antiForgeryToken: self.element.data("anti-forgery-token"),
editorDialogTitleFormat: self.element.data("editor-dialog-title-format"),
@@ -124,20 +124,6 @@
// Export types.
window.Orchard = window.Orchard || {};
window.Orchard.Layouts = window.Orchard.Layouts || {};
window.Orchard.Layouts.LayoutEditorHost = window.Orchard.Layouts.LayoutEditorHost || {};
window.Orchard.Layouts.LayoutDesignerHost = LayoutDesignerHost;
$(function () {
window.layoutDesignerHost = new LayoutDesignerHost($(".layout-designer"));
$(".layout-designer").each(function (e) {
var designer = $(this);
var dialog = designer.find(".layout-editor-help-dialog");
designer.find(".layout-editor-help-link").click(function (e) {
dialog.dialog({
modal: true,
width: 840
});
e.preventDefault();
});
});
});
})(jQuery);

14
src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/LayoutEditor.cshtml
View File

@@ -38,8 +38,20 @@
jQuery(function () {
var editorConfig = JSON.parse(LayoutEditor.decode("@Html.Raw(Url.Encode(Model.ConfigurationData))"));
var editorCanvasData = JSON.parse(LayoutEditor.decode("@Html.Raw(Url.Encode(Model.Data))"));
var layoutEditor = window.layoutEditor = new LayoutEditor.Editor(editorConfig, editorCanvasData);
window.layoutEditor = new LayoutEditor.Editor(editorConfig, editorCanvasData);
var host = new window.Orchard.Layouts.LayoutDesignerHost($(".layout-designer"), layoutEditor);
$(".layout-designer").each(function (e) {
var designer = $(this);
var dialog = designer.find(".layout-editor-help-dialog");
designer.find(".layout-editor-help-link").click(function (e) {
dialog.dialog({
modal: true,
width: 840
});
e.preventDefault();
});
});
});
</script>
}

2
src/Orchard.Web/Modules/Orchard.Redis/Caching/RedisCacheStorageProvider.cs
View File

@@ -54,7 +54,7 @@ namespace Orchard.Redis.Caching {
}
public void Remove(string key) {
Database.KeyDelete(key);
Database.KeyDelete(GetLocalizedKey(key));
}
public void Clear() {

4
src/Orchard/Localization/LocalizedString.cs
View File

@@ -78,5 +78,9 @@ namespace Orchard.Localization {
return string.Equals(_localized, that._localized);
}
public override object InitializeLifetimeService() {
// never expire the cross-AppDomain lease on this object
return null;
}
}
}

4
src/Orchard/Logging/OrchardLog4netLogger.cs
View File

@@ -421,5 +421,9 @@ namespace Orchard.Logging {
}
}
public override object InitializeLifetimeService() {
// never expire the cross-AppDomain lease on this object
return null;
}
}
}

24
src/Tools/Orchard/Host/CommandHost.cs
View File

@@ -2,6 +2,8 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.Remoting;
using System.Runtime.Remoting.Lifetime;
using System.Security;
using System.Web.Hosting;
using Orchard.Parameters;
@@ -32,28 +34,46 @@ namespace Orchard.Host {
[SecurityCritical]
public override object InitializeLifetimeService() {
// never expire the license
// never expire the cross-AppDomain lease on this object
return null;
}
private static void ExtendLifeTimeLeases(TextReader input, TextWriter output) {
// Orchard objects passed as parameters into this AppDomain should derive from MarshalByRefObject and have
// infinite lease timeouts by means of their InitializeLifetimeService overrides. For the input/output
// stream objects we approximate that behavior by immediately renewing the lease for 30 days.
ExtendLifeTimeLease(input);
ExtendLifeTimeLease(output);
}
private static void ExtendLifeTimeLease(MarshalByRefObject obj) {
if (RemotingServices.IsObjectOutOfAppDomain(obj)) {
var lease = (ILease)RemotingServices.GetLifetimeService(obj);
lease.Renew(TimeSpan.FromDays(30));
}
}
[SecuritySafeCritical]
void IRegisteredObject.Stop(bool immediate) {
HostingEnvironment.UnregisterObject(this);
}
public CommandReturnCodes StartSession(TextReader input, TextWriter output) {
ExtendLifeTimeLeases(input, output);
_agent = CreateAgent();
return StartHost(_agent, input, output);
}
public void StopSession(TextReader input, TextWriter output) {
if (_agent != null) {
ExtendLifeTimeLeases(input, output);
StopHost(_agent, input, output);
_agent = null;
}
}
public CommandReturnCodes RunCommand(TextReader input, TextWriter output, Logger logger, OrchardParameters args) {
ExtendLifeTimeLeases(input, output);
var agent = CreateAgent();
CommandReturnCodes result = (CommandReturnCodes)agent.GetType().GetMethod("RunSingleCommand").Invoke(agent, new object[] {
input,
@@ -66,6 +86,7 @@ namespace Orchard.Host {
}
public CommandReturnCodes RunCommandInSession(TextReader input, TextWriter output, Logger logger, OrchardParameters args) {
ExtendLifeTimeLeases(input, output);
CommandReturnCodes result = (CommandReturnCodes)_agent.GetType().GetMethod("RunCommand").Invoke(_agent, new object[] {
input,
output,
@@ -77,6 +98,7 @@ namespace Orchard.Host {
}
public CommandReturnCodes RunCommands(TextReader input, TextWriter output, Logger logger, IEnumerable<ResponseLine> responseLines) {
ExtendLifeTimeLeases(input, output);
var agent = CreateAgent();
CommandReturnCodes result = StartHost(agent, input, output);

5
src/Tools/Orchard/Logger.cs
View File

@@ -17,5 +17,10 @@ namespace Orchard {
_output.WriteLine(format, args);
}
}
public override object InitializeLifetimeService() {
// never expire the cross-AppDomain lease on this object
return null;
}
}
}

5
src/Tools/Orchard/OrchardParameters.cs
View File

@@ -10,5 +10,10 @@ namespace Orchard {
public IList<string> Arguments { get; set; }
public IList<string> ResponseFiles { get; set; }
public IDictionary<string, string> Switches { get; set; }
public override object InitializeLifetimeService() {
// never expire the cross-AppDomain lease on this object
return null;
}
}
}

5
src/Tools/Orchard/ResponseFiles/ResponseFileReader.cs
View File

@@ -10,6 +10,11 @@ namespace Orchard.ResponseFiles {
public string LineText { get; set; }
public int LineNumber { get; set; }
public string[] Args { get; set; }
public override object InitializeLifetimeService() {
// never expire the cross-AppDomain lease on this object
return null;
}
}
public class ResponseFileReader {