Skip to content

Commit 2dad3e9

Browse files
author
Rafael J. Staib
committed
Solve a problem on the example page
1 parent af3976a commit 2dad3e9

File tree

80 files changed

+23368
-33892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+23368
-33892
lines changed

‎JSteps.v11.suo

27.5 KB
Binary file not shown.

‎JSteps/App_Start/BundleConfig.cs

+32-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
using System.Web;
1+
using System.Collections.Generic;
2+
using System.IO;
3+
using System.Web;
24
using System.Web.Optimization;
35

46
namespace JSteps
@@ -8,16 +10,21 @@ public class BundleConfig
810
// For more information on Bundling, visit http://go.microsoft.com/fwlink/?LinkId=254725
911
public static void RegisterBundles(BundleCollection bundles)
1012
{
13+
BundleTable.EnableOptimizations = true;
14+
1115
bundles.Add(new ScriptBundle("~/Scripts/html5shiv")
1216
.Include("~/Scripts/html5shiv.js"));
1317

14-
bundles.Add(GetBaseScripts("~/Scripts/Base"));
18+
bundles.Add(GetBaseScripts("~/Scripts/Base")
19+
.AddFooterScripts());
1520
bundles.Add(GetBaseScripts("~/Scripts/Extended")
16-
.Include("~/Scripts/prettify.js"));
21+
.Include("~/Scripts/prettify.js")
22+
.AddFooterScripts());
1723
bundles.Add(GetBaseScripts("~/Scripts/Examples")
1824
.Include("~/Scripts/jquery.steps.js")
1925
.Include("~/Scripts/jquery.validate.js")
20-
.Include("~/Scripts/prettify.js"));
26+
.Include("~/Scripts/prettify.js")
27+
.AddFooterScripts());
2128

2229
bundles.Add(GetBaseStyles("~/Content/Base"));
2330
bundles.Add(GetBaseStyles("~/Content/Extended")
@@ -29,20 +36,34 @@ public static void RegisterBundles(BundleCollection bundles)
2936

3037
private static Bundle GetBaseScripts(string virtualPath)
3138
{
32-
return new ScriptBundle(virtualPath)
39+
return new ScriptBundle(virtualPath) { Orderer = new BundleOrderer() }
3340
.Include("~/Scripts/jquery-{version}.js")
34-
.Include("~/Scripts/bootstrap.js")
35-
.Include("~/Scripts/viewport-fix-mobile-ie10.js")
36-
.Include("~/Scripts/social.js")
37-
.Include("~/Scripts/tracking.js");
41+
.Include("~/Scripts/bootstrap.js");
3842
}
3943

4044
private static Bundle GetBaseStyles(string virtualPath)
4145
{
42-
return new StyleBundle(virtualPath)
46+
return new StyleBundle(virtualPath) { Orderer = new BundleOrderer() }
4347
.Include("~/Content/bootstrap.css")
44-
.Include("~/Content/viewport-fix-mobile-ie10.css")
4548
.Include("~/Content/custom.css");
4649
}
4750
}
51+
52+
public static class BundleExtensions
53+
{
54+
public static Bundle AddFooterScripts(this Bundle bundle)
55+
{
56+
return bundle.Include("~/Scripts/social.js")
57+
.Include("~/Scripts/tracking.js");
58+
}
59+
}
60+
61+
public class BundleOrderer
62+
: IBundleOrderer
63+
{
64+
public IEnumerable<BundleFile> OrderFiles(BundleContext context, IEnumerable<BundleFile> files)
65+
{
66+
return files;
67+
}
68+
}
4869
}

‎JSteps/Content/viewport-fix-mobile-ie10.css

-5
This file was deleted.

‎JSteps/JSteps.csproj

+40-38
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<IISExpressWindowsAuthentication />
2222
<IISExpressUseClassicPipelineMode />
2323
<TargetFrameworkProfile />
24+
<WebGreaseLibPath>..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
2425
</PropertyGroup>
2526
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2627
<DebugSymbols>true</DebugSymbols>
@@ -42,7 +43,15 @@
4243
<Prefer32Bit>false</Prefer32Bit>
4344
</PropertyGroup>
4445
<ItemGroup>
46+
<Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
47+
<SpecificVersion>False</SpecificVersion>
48+
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
49+
</Reference>
4550
<Reference Include="Microsoft.CSharp" />
51+
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
52+
<SpecificVersion>False</SpecificVersion>
53+
<HintPath>..\packages\Newtonsoft.Json.5.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
54+
</Reference>
4655
<Reference Include="System" />
4756
<Reference Include="System.Data" />
4857
<Reference Include="System.Data.DataSetExtensions" />
@@ -55,7 +64,35 @@
5564
<Reference Include="System.Web.Extensions" />
5665
<Reference Include="System.Web" />
5766
<Reference Include="System.Web.Abstractions" />
67+
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<Private>True</Private>
69+
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll</HintPath>
70+
</Reference>
71+
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72+
<Private>True</Private>
73+
<HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll</HintPath>
74+
</Reference>
75+
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76+
<SpecificVersion>False</SpecificVersion>
77+
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.0\lib\net40\System.Web.Optimization.dll</HintPath>
78+
</Reference>
79+
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80+
<Private>True</Private>
81+
<HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
82+
</Reference>
5883
<Reference Include="System.Web.Routing" />
84+
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85+
<Private>True</Private>
86+
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
87+
</Reference>
88+
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
89+
<Private>True</Private>
90+
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
91+
</Reference>
92+
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
93+
<Private>True</Private>
94+
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
95+
</Reference>
5996
<Reference Include="System.Xml" />
6097
<Reference Include="System.Configuration" />
6198
<Reference Include="System.Web.Services" />
@@ -71,9 +108,6 @@
71108
<Private>True</Private>
72109
<HintPath>..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.0\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll</HintPath>
73110
</Reference>
74-
<Reference Include="Newtonsoft.Json">
75-
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
76-
</Reference>
77111
<Reference Include="System.Net.Http">
78112
<Private>True</Private>
79113
<HintPath>..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll</HintPath>
@@ -91,40 +125,13 @@
91125
<Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92126
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.20710.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
93127
</Reference>
94-
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
95-
<Private>True</Private>
96-
<HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
97-
</Reference>
98-
<Reference Include="System.Web.Optimization">
99-
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.0.0\lib\net40\System.Web.Optimization.dll</HintPath>
100-
</Reference>
101128
<Reference Include="System.Web.Providers">
102129
<HintPath>..\packages\Microsoft.AspNet.Providers.Core.1.2\lib\net40\System.Web.Providers.dll</HintPath>
103130
</Reference>
104-
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
105-
<Private>True</Private>
106-
<HintPath>..\packages\Microsoft.AspNet.Razor.2.0.20715.0\lib\net40\System.Web.Razor.dll</HintPath>
107-
</Reference>
108-
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109-
<Private>True</Private>
110-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
111-
</Reference>
112-
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
113-
<Private>True</Private>
114-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
115-
</Reference>
116-
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117-
<Private>True</Private>
118-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
119-
</Reference>
120131
<Reference Include="System.Xml.Linq" />
121-
<Reference Include="WebGrease">
122-
<Private>True</Private>
123-
<HintPath>..\packages\WebGrease.1.3.0\lib\WebGrease.dll</HintPath>
124-
</Reference>
125-
<Reference Include="Antlr3.Runtime">
126-
<Private>True</Private>
127-
<HintPath>..\packages\WebGrease.1.3.0\lib\Antlr3.Runtime.dll</HintPath>
132+
<Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133+
<SpecificVersion>False</SpecificVersion>
134+
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
128135
</Reference>
129136
</ItemGroup>
130137
<ItemGroup>
@@ -157,7 +164,6 @@
157164
<Content Include="Content\images\me.png" />
158165
<Content Include="Content\images\social.png" />
159166
<Content Include="Content\prettify.css" />
160-
<Content Include="Content\viewport-fix-mobile-ie10.css" />
161167
<Content Include="github-btn.html" />
162168
<Content Include="Global.asax" />
163169
<Content Include="Content\custom.css" />
@@ -173,7 +179,6 @@
173179
<Content Include="Scripts\prettify.js" />
174180
<Content Include="Scripts\social.js" />
175181
<Content Include="Scripts\tracking.js" />
176-
<Content Include="Scripts\viewport-fix-mobile-ie10.js" />
177182
<Content Include="Web.config" />
178183
<Content Include="Web.Debug.config">
179184
<DependentUpon>Web.config</DependentUpon>
@@ -206,9 +211,6 @@
206211
<Content Include="Views\Donation\Success.cshtml" />
207212
<Content Include="Views\Examples\EmbeddedContent.cshtml" />
208213
<Content Include="Views\Documentation\Index.cshtml" />
209-
<Content Include="Scripts\jquery.steps.min.js.map">
210-
<DependentUpon>jquery.steps.js</DependentUpon>
211-
</Content>
212214
</ItemGroup>
213215
<PropertyGroup>
214216
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

0 commit comments

Comments
 (0)