Skip to content

Commit bb21ea9

Browse files
committed
Merge pull request #31 from 4nonym0us/patch-1
Update bundles to contain abp.moment.js
2 parents a91421b + 93531ce commit bb21ea9

File tree

1 file changed

+77
-76
lines changed

1 file changed

+77
-76
lines changed
Lines changed: 77 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,79 @@
1-
using System.Web.Optimization;
2-
3-
namespace AbpCompanyName.AbpProjectName.WebSpaAngular
4-
{
5-
public static class BundleConfig
6-
{
7-
public static void RegisterBundles(BundleCollection bundles)
8-
{
9-
bundles.IgnoreList.Clear();
10-
11-
//VENDOR RESOURCES
12-
13-
//~/Bundles/App/vendor/css
14-
bundles.Add(
15-
new StyleBundle("~/Bundles/App/vendor/css")
16-
.Include("~/Content/themes/base/all.css", new CssRewriteUrlTransform())
17-
.Include("~/Content/bootstrap-cosmo.min.css", new CssRewriteUrlTransform())
18-
.Include("~/Content/toastr.min.css")
19-
.Include("~/Scripts/sweetalert/sweet-alert.css")
20-
.Include("~/Content/flags/famfamfam-flags.css", new CssRewriteUrlTransform())
21-
.Include("~/Content/font-awesome.min.css", new CssRewriteUrlTransform())
22-
);
23-
24-
//~/Bundles/App/vendor/js
25-
bundles.Add(
26-
new ScriptBundle("~/Bundles/App/vendor/js")
27-
.Include(
28-
"~/Abp/Framework/scripts/utils/ie10fix.js",
29-
"~/Scripts/json2.min.js",
30-
31-
"~/Scripts/modernizr-2.8.3.js",
32-
33-
"~/Scripts/jquery-2.1.4.min.js",
34-
"~/Scripts/jquery-ui-1.11.4.min.js",
35-
36-
"~/Scripts/bootstrap.min.js",
37-
38-
"~/Scripts/moment-with-locales.min.js",
39-
"~/Scripts/jquery.blockUI.js",
40-
"~/Scripts/toastr.min.js",
41-
"~/Scripts/sweetalert/sweet-alert.min.js",
42-
"~/Scripts/others/spinjs/spin.js",
43-
"~/Scripts/others/spinjs/jquery.spin.js",
44-
45-
"~/Scripts/angular.min.js",
46-
"~/Scripts/angular-animate.min.js",
47-
"~/Scripts/angular-sanitize.min.js",
48-
"~/Scripts/angular-ui-router.min.js",
49-
"~/Scripts/angular-ui/ui-bootstrap.min.js",
50-
"~/Scripts/angular-ui/ui-bootstrap-tpls.min.js",
51-
"~/Scripts/angular-ui/ui-utils.min.js",
52-
53-
"~/Abp/Framework/scripts/abp.js",
54-
"~/Abp/Framework/scripts/libs/abp.jquery.js",
55-
"~/Abp/Framework/scripts/libs/abp.toastr.js",
1+
using System.Web.Optimization;
2+
3+
namespace AbpCompanyName.AbpProjectName.WebSpaAngular
4+
{
5+
public static class BundleConfig
6+
{
7+
public static void RegisterBundles(BundleCollection bundles)
8+
{
9+
bundles.IgnoreList.Clear();
10+
11+
//VENDOR RESOURCES
12+
13+
//~/Bundles/App/vendor/css
14+
bundles.Add(
15+
new StyleBundle("~/Bundles/App/vendor/css")
16+
.Include("~/Content/themes/base/all.css", new CssRewriteUrlTransform())
17+
.Include("~/Content/bootstrap-cosmo.min.css", new CssRewriteUrlTransform())
18+
.Include("~/Content/toastr.min.css")
19+
.Include("~/Scripts/sweetalert/sweet-alert.css")
20+
.Include("~/Content/flags/famfamfam-flags.css", new CssRewriteUrlTransform())
21+
.Include("~/Content/font-awesome.min.css", new CssRewriteUrlTransform())
22+
);
23+
24+
//~/Bundles/App/vendor/js
25+
bundles.Add(
26+
new ScriptBundle("~/Bundles/App/vendor/js")
27+
.Include(
28+
"~/Abp/Framework/scripts/utils/ie10fix.js",
29+
"~/Scripts/json2.min.js",
30+
31+
"~/Scripts/modernizr-2.8.3.js",
32+
33+
"~/Scripts/jquery-2.1.4.min.js",
34+
"~/Scripts/jquery-ui-1.11.4.min.js",
35+
36+
"~/Scripts/bootstrap.min.js",
37+
38+
"~/Scripts/moment-with-locales.min.js",
39+
"~/Scripts/jquery.blockUI.js",
40+
"~/Scripts/toastr.min.js",
41+
"~/Scripts/sweetalert/sweet-alert.min.js",
42+
"~/Scripts/others/spinjs/spin.js",
43+
"~/Scripts/others/spinjs/jquery.spin.js",
44+
45+
"~/Scripts/angular.min.js",
46+
"~/Scripts/angular-animate.min.js",
47+
"~/Scripts/angular-sanitize.min.js",
48+
"~/Scripts/angular-ui-router.min.js",
49+
"~/Scripts/angular-ui/ui-bootstrap.min.js",
50+
"~/Scripts/angular-ui/ui-bootstrap-tpls.min.js",
51+
"~/Scripts/angular-ui/ui-utils.min.js",
52+
53+
"~/Abp/Framework/scripts/abp.js",
54+
"~/Abp/Framework/scripts/libs/abp.jquery.js",
55+
"~/Abp/Framework/scripts/libs/abp.toastr.js",
5656
"~/Abp/Framework/scripts/libs/abp.blockUI.js",
5757
"~/Abp/Framework/scripts/libs/abp.spin.js",
58-
"~/Abp/Framework/scripts/libs/abp.sweet-alert.js",
59-
"~/Abp/Framework/scripts/libs/angularjs/abp.ng.js"
60-
)
61-
);
62-
63-
//APPLICATION RESOURCES
64-
65-
//~/Bundles/App/Main/css
66-
bundles.Add(
67-
new StyleBundle("~/Bundles/App/Main/css")
68-
.IncludeDirectory("~/App/Main", "*.css", true)
69-
);
70-
71-
//~/Bundles/App/Main/js
72-
bundles.Add(
73-
new ScriptBundle("~/Bundles/App/Main/js")
74-
.IncludeDirectory("~/App/Main", "*.js", true)
75-
);
76-
}
77-
}
78-
}
58+
"~/Abp/Framework/scripts/libs/abp.sweet-alert.js",
59+
"~/Abp/Framework/scripts/libs/abp.moment.js",
60+
"~/Abp/Framework/scripts/libs/angularjs/abp.ng.js"
61+
)
62+
);
63+
64+
//APPLICATION RESOURCES
65+
66+
//~/Bundles/App/Main/css
67+
bundles.Add(
68+
new StyleBundle("~/Bundles/App/Main/css")
69+
.IncludeDirectory("~/App/Main", "*.css", true)
70+
);
71+
72+
//~/Bundles/App/Main/js
73+
bundles.Add(
74+
new ScriptBundle("~/Bundles/App/Main/js")
75+
.IncludeDirectory("~/App/Main", "*.js", true)
76+
);
77+
}
78+
}
79+
}

0 commit comments

Comments
 (0)