mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Fixed some typos and corrected TinyMce dependency listings.
This commit is contained in:
@@ -25,7 +25,6 @@ using Orchard.Tests.Stubs;
|
|||||||
using Orchard.Tests.Utility;
|
using Orchard.Tests.Utility;
|
||||||
using Orchard.WebApi.Routes;
|
using Orchard.WebApi.Routes;
|
||||||
using IModelBinderProvider = Orchard.Mvc.ModelBinders.IModelBinderProvider;
|
using IModelBinderProvider = Orchard.Mvc.ModelBinders.IModelBinderProvider;
|
||||||
using Orchard.Tasks;
|
|
||||||
|
|
||||||
namespace Orchard.Tests.Environment {
|
namespace Orchard.Tests.Environment {
|
||||||
[TestFixture]
|
[TestFixture]
|
||||||
@@ -139,8 +138,6 @@ namespace Orchard.Tests.Environment {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[Test, Ignore("containers are disposed when calling BeginRequest, maybe by the StubVirtualPathMonitor")]
|
[Test, Ignore("containers are disposed when calling BeginRequest, maybe by the StubVirtualPathMonitor")]
|
||||||
public void NormalDependenciesShouldBeUniquePerRequestContainer() {
|
public void NormalDependenciesShouldBeUniquePerRequestContainer() {
|
||||||
var host = _lifetime.Resolve<IOrchardHost>();
|
var host = _lifetime.Resolve<IOrchardHost>();
|
||||||
|
@@ -206,7 +206,7 @@ Features:
|
|||||||
Category: Content types
|
Category: Content types
|
||||||
AnotherWiki Editor:
|
AnotherWiki Editor:
|
||||||
Description: A rich editor for wiki contents.
|
Description: A rich editor for wiki contents.
|
||||||
Dependencies: TinyMCE, AnotherWiki
|
Dependencies: TinyMce, AnotherWiki
|
||||||
Category: Input methods
|
Category: Input methods
|
||||||
AnotherWiki DistributionList:
|
AnotherWiki DistributionList:
|
||||||
Description: Sends e-mail alerts when wiki contents gets published.
|
Description: Sends e-mail alerts when wiki contents gets published.
|
||||||
@@ -241,7 +241,7 @@ Features:
|
|||||||
Assert.That(featureDescriptor.Description, Is.EqualTo("A rich editor for wiki contents."));
|
Assert.That(featureDescriptor.Description, Is.EqualTo("A rich editor for wiki contents."));
|
||||||
Assert.That(featureDescriptor.Category, Is.EqualTo("Input methods"));
|
Assert.That(featureDescriptor.Category, Is.EqualTo("Input methods"));
|
||||||
Assert.That(featureDescriptor.Dependencies.Count(), Is.EqualTo(2));
|
Assert.That(featureDescriptor.Dependencies.Count(), Is.EqualTo(2));
|
||||||
Assert.That(featureDescriptor.Dependencies.Contains("TinyMCE"));
|
Assert.That(featureDescriptor.Dependencies.Contains("TinyMce"));
|
||||||
Assert.That(featureDescriptor.Dependencies.Contains("AnotherWiki"));
|
Assert.That(featureDescriptor.Dependencies.Contains("AnotherWiki"));
|
||||||
break;
|
break;
|
||||||
case "AnotherWiki DistributionList":
|
case "AnotherWiki DistributionList":
|
||||||
@@ -287,7 +287,7 @@ Category: Content types
|
|||||||
Features:
|
Features:
|
||||||
AnotherWiki Editor:
|
AnotherWiki Editor:
|
||||||
Description: A rich editor for wiki contents.
|
Description: A rich editor for wiki contents.
|
||||||
Dependencies: TinyMCE, AnotherWiki
|
Dependencies: TinyMce, AnotherWiki
|
||||||
Category: Input methods
|
Category: Input methods
|
||||||
AnotherWiki DistributionList:
|
AnotherWiki DistributionList:
|
||||||
Description: Sends e-mail alerts when wiki contents gets published.
|
Description: Sends e-mail alerts when wiki contents gets published.
|
||||||
@@ -323,7 +323,7 @@ Features:
|
|||||||
Assert.That(featureDescriptor.Description, Is.EqualTo("A rich editor for wiki contents."));
|
Assert.That(featureDescriptor.Description, Is.EqualTo("A rich editor for wiki contents."));
|
||||||
Assert.That(featureDescriptor.Category, Is.EqualTo("Input methods"));
|
Assert.That(featureDescriptor.Category, Is.EqualTo("Input methods"));
|
||||||
Assert.That(featureDescriptor.Dependencies.Count(), Is.EqualTo(2));
|
Assert.That(featureDescriptor.Dependencies.Count(), Is.EqualTo(2));
|
||||||
Assert.That(featureDescriptor.Dependencies.Contains("TinyMCE"));
|
Assert.That(featureDescriptor.Dependencies.Contains("TinyMce"));
|
||||||
Assert.That(featureDescriptor.Dependencies.Contains("AnotherWiki"));
|
Assert.That(featureDescriptor.Dependencies.Contains("AnotherWiki"));
|
||||||
break;
|
break;
|
||||||
case "AnotherWiki DistributionList":
|
case "AnotherWiki DistributionList":
|
||||||
|
@@ -207,7 +207,7 @@ Features:
|
|||||||
Category: Content types
|
Category: Content types
|
||||||
AnotherWiki Editor:
|
AnotherWiki Editor:
|
||||||
Description: A rich editor for wiki contents.
|
Description: A rich editor for wiki contents.
|
||||||
Dependencies: TinyMCE, AnotherWiki
|
Dependencies: TinyMce, AnotherWiki
|
||||||
Category: Input methods
|
Category: Input methods
|
||||||
AnotherWiki DistributionList:
|
AnotherWiki DistributionList:
|
||||||
Description: Sends e-mail alerts when wiki contents gets published.
|
Description: Sends e-mail alerts when wiki contents gets published.
|
||||||
@@ -243,7 +243,7 @@ Features:
|
|||||||
Assert.That(featureDescriptor.Description, Is.EqualTo("A rich editor for wiki contents."));
|
Assert.That(featureDescriptor.Description, Is.EqualTo("A rich editor for wiki contents."));
|
||||||
Assert.That(featureDescriptor.Category, Is.EqualTo("Input methods"));
|
Assert.That(featureDescriptor.Category, Is.EqualTo("Input methods"));
|
||||||
Assert.That(featureDescriptor.Dependencies.Count(), Is.EqualTo(2));
|
Assert.That(featureDescriptor.Dependencies.Count(), Is.EqualTo(2));
|
||||||
Assert.That(featureDescriptor.Dependencies.Contains("TinyMCE"));
|
Assert.That(featureDescriptor.Dependencies.Contains("TinyMce"));
|
||||||
Assert.That(featureDescriptor.Dependencies.Contains("AnotherWiki"));
|
Assert.That(featureDescriptor.Dependencies.Contains("AnotherWiki"));
|
||||||
break;
|
break;
|
||||||
case "AnotherWiki DistributionList":
|
case "AnotherWiki DistributionList":
|
||||||
|
@@ -10,7 +10,7 @@ Features:
|
|||||||
Orchard.Layouts:
|
Orchard.Layouts:
|
||||||
Name: Layouts
|
Name: Layouts
|
||||||
Description: Provides tools to create layouts.
|
Description: Provides tools to create layouts.
|
||||||
Dependencies: Common, Orchard.jQuery, Orchard.Forms, Orchard.Tokens, Orchard.MediaLibrary, TinyMCE
|
Dependencies: Common, Orchard.jQuery, Orchard.Forms, Orchard.Tokens, Orchard.MediaLibrary, TinyMce
|
||||||
Category: Layout
|
Category: Layout
|
||||||
Orchard.Layouts.Snippets:
|
Orchard.Layouts.Snippets:
|
||||||
Name: Layout Snippets
|
Name: Layout Snippets
|
||||||
|
@@ -15,7 +15,7 @@ using Orchard.Logging;
|
|||||||
using Orchard.Utility.Extensions;
|
using Orchard.Utility.Extensions;
|
||||||
|
|
||||||
namespace Orchard.Environment {
|
namespace Orchard.Environment {
|
||||||
// All the event handlers that DefaultOrchardHost implements have to be declared in OrchardStarter
|
// All the event handlers that DefaultOrchardHost implements have to be declared in OrchardStarter.
|
||||||
public class DefaultOrchardHost : IOrchardHost, IShellSettingsManagerEventHandler, IShellDescriptorManagerEventHandler {
|
public class DefaultOrchardHost : IOrchardHost, IShellSettingsManagerEventHandler, IShellDescriptorManagerEventHandler {
|
||||||
private readonly IHostLocalRestart _hostLocalRestart;
|
private readonly IHostLocalRestart _hostLocalRestart;
|
||||||
private readonly IShellSettingsManager _shellSettingsManager;
|
private readonly IShellSettingsManager _shellSettingsManager;
|
||||||
|
@@ -16,7 +16,7 @@ namespace Orchard.Environment.Descriptor {
|
|||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Alters databased information to match information passed as arguments.
|
/// Alters databased information to match information passed as arguments.
|
||||||
/// Prior SerialNumber used for optomistic concurrency, and an exception
|
/// Prior SerialNumber used for optimistic concurrency, and an exception
|
||||||
/// should be thrown if the number in storage doesn't match what's provided.
|
/// should be thrown if the number in storage doesn't match what's provided.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
void UpdateShellDescriptor(
|
void UpdateShellDescriptor(
|
||||||
|
@@ -119,7 +119,7 @@ namespace Orchard.Environment {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void CompileDirectory(CompilationContext context, string viewDirectory) {
|
private void CompileDirectory(CompilationContext context, string viewDirectory) {
|
||||||
// Prevent processing of the same directories multiple times (sligh performance optimization,
|
// Prevent processing of the same directories multiple times (slight performance optimization,
|
||||||
// as the build manager second call to compile a view is essentially a "no-op".
|
// as the build manager second call to compile a view is essentially a "no-op".
|
||||||
if (context.ProcessedDirectories.Contains(viewDirectory))
|
if (context.ProcessedDirectories.Contains(viewDirectory))
|
||||||
return;
|
return;
|
||||||
|
Reference in New Issue
Block a user