Skip to content

Commit 10dd33a

Browse files
committed
Fix default ReactConfig and revert changing ReactSiteConfiguration.Configuration to readonly. References #35
1 parent e65a533 commit 10dd33a

File tree

3 files changed

+14
-17
lines changed

3 files changed

+14
-17
lines changed

build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ of patent rights can be found in the PATENTS file in the same directory.
1111
<PropertyGroup>
1212
<Major>1</Major>
1313
<Minor>1</Minor>
14-
<Build>0</Build>
14+
<Build>1</Build>
1515
<Revision>0</Revision>
1616
<DevNuGetServer>http://reactjs.net/packages/</DevNuGetServer>
1717
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\tools\MSBuildTasks</MSBuildCommunityTasksPath>

src/React.Web/Content/App_Start/ReactConfig.cs.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
{
99
public static void Configure()
1010
{
11-
ReactSiteConfiguration.Configuration = new ReactSiteConfiguration();
11+
// If you want to use fancy new ES6 features, uncomment this line:
12+
// See http://reactjs.net/guides/es6.html for more information.
13+
//ReactSiteConfiguration.Configuration.SetUseHarmony(true);
1214

1315
// If you want to use server-side rendering of React components,
1416
// add all the necessary JavaScript files here. This includes
1517
// your components as well as all of their dependencies.
16-
// See http://reactjs.net/ for more information.
17-
18-
// Example:
18+
// See http://reactjs.net/ for more information. Example:
1919
//ReactSiteConfiguration.Configuration
2020
// .AddScript("~/Scripts/First.jsx")
2121
// .AddScript("~/Scripts/Second.jsx");

src/React/ReactSiteConfiguration.cs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,21 @@ namespace React
1717
/// </summary>
1818
public class ReactSiteConfiguration : IReactSiteConfiguration
1919
{
20-
private static IReactSiteConfiguration _instance = new ReactSiteConfiguration();
21-
22-
/// <summary>
23-
/// All the scripts that have been added to this configuration
24-
/// </summary>
25-
private readonly IList<string> _scriptFiles = new List<string>();
26-
2720
/// <summary>
2821
/// Gets or sets the site-side configuration
2922
/// </summary>
30-
public static IReactSiteConfiguration Configuration
23+
public static IReactSiteConfiguration Configuration { get; set; }
24+
25+
static ReactSiteConfiguration()
3126
{
32-
get
33-
{
34-
return _instance;
35-
}
27+
Configuration = new ReactSiteConfiguration();
3628
}
3729

30+
/// <summary>
31+
/// All the scripts that have been added to this configuration
32+
/// </summary>
33+
private readonly IList<string> _scriptFiles = new List<string>();
34+
3835
/// <summary>
3936
/// Adds a script to the list of scripts that are executed. This should be called for all
4037
/// React components and their dependencies.

0 commit comments

Comments
 (0)