Skip to content

Commit 51dcc28

Browse files
rxturrxtur
committed
jQuery updated to 2.1.4 along with few other JS libraries
1 parent 67f666a commit 51dcc28

25 files changed

Lines changed: 8061 additions & 6498 deletions

‎BlogEngine/BlogEngine.NET/Account/account.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<meta name="description" content="Account Login Membership User Password" />
99
<link href='http://fonts.googleapis.com/css?family=Roboto:400,300' rel='stylesheet' type='text/css'> <link href="../Content/bootstrap.min.css" rel="stylesheet" />
1010
<link href="account.css" rel="stylesheet" />
11-
<script src="../Scripts/jquery-2.1.1.min.js"></script>
11+
<script src="../Scripts/jquery-2.1.4.min.js"></script>
1212
<script type="text/javascript" src="account.js"></script>
1313
<meta charset="utf-8" />
1414
<meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1" />

‎BlogEngine/BlogEngine.NET/Account/account.master.designer.cs‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ public static void Initialize(HttpContext context)
4141
ScriptManager.ScriptResourceMapping.AddDefinition("jquery",
4242
new ScriptResourceDefinition
4343
{
44-
Path = "~/Scripts/jquery-2.1.1.min.js",
45-
DebugPath = "~/Scripts/jquery-2.1.1.js",
46-
CdnPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-2.1.1.min.js",
47-
CdnDebugPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-2.1.1.js"
44+
Path = "~/Scripts/jquery-2.1.4.min.js",
45+
DebugPath = "~/Scripts/jquery-2.1.4.js",
46+
CdnPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-2.1.4.min.js",
47+
CdnDebugPath = "http://ajax.microsoft.com/ajax/jQuery/jquery-2.1.4.js"
4848
});
4949

5050
_initializedAlready = true;
@@ -108,7 +108,7 @@ static void RegisterBundles(BundleCollection bundles)
108108

109109
bundles.Add(
110110
new ScriptBundle("~/scripts/blogadmin")
111-
.Include("~/Scripts/jquery-2.1.1.js")
111+
.Include("~/Scripts/jquery-{version}.js")
112112
.Include("~/Scripts/jquery.form.js")
113113
.Include("~/Scripts/jquery.validate.js")
114114
.Include("~/Scripts/toastr.js")
@@ -150,7 +150,7 @@ static void RegisterBundles(BundleCollection bundles)
150150

151151
bundles.Add(
152152
new ScriptBundle("~/scripts/wysiwyg")
153-
.Include("~/scripts/jquery-2.1.1.js")
153+
.Include("~/scripts/jquery-{version}.js")
154154
.Include("~/scripts/jquery.form.js")
155155
.Include("~/scripts/jquery.validate.js")
156156
.Include("~/scripts/toastr.js")

‎BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj‎

Lines changed: 49 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -593,13 +593,23 @@
593593
<Content Include="packages.config" />
594594
<Content Include="Content\images\blog\ext.png" />
595595
<Content Include="Content\images\blog\pkg.png" />
596+
<Content Include="fonts\fontawesome-webfont.woff" />
597+
<Content Include="fonts\fontawesome-webfont.ttf" />
598+
<Content Include="fonts\fontawesome-webfont.eot" />
599+
<Content Include="fonts\FontAwesome.otf" />
596600
<Content Include="Scripts\angular-animate.js" />
597601
<Content Include="Scripts\angular-animate.min.js" />
602+
<Content Include="Scripts\angular-aria.js" />
603+
<Content Include="Scripts\angular-aria.min.js" />
598604
<Content Include="Scripts\angular-cookies.js" />
599605
<Content Include="Scripts\angular-cookies.min.js" />
600606
<Content Include="Scripts\angular-csp.css" />
601607
<Content Include="Scripts\angular-loader.js" />
602608
<Content Include="Scripts\angular-loader.min.js" />
609+
<Content Include="Scripts\angular-message-format.js" />
610+
<Content Include="Scripts\angular-message-format.min.js" />
611+
<Content Include="Scripts\angular-messages.js" />
612+
<Content Include="Scripts\angular-messages.min.js" />
603613
<Content Include="Scripts\angular-mocks.js" />
604614
<Content Include="Scripts\angular-resource.js" />
605615
<Content Include="Scripts\angular-resource.min.js" />
@@ -612,24 +622,9 @@
612622
<Content Include="Scripts\angular-touch.min.js" />
613623
<Content Include="Scripts\angular.js" />
614624
<Content Include="Scripts\angular.min.js" />
615-
<Content Include="Content\toastr.scss" />
616-
<Content Include="Content\toastr.less" />
617-
<Content Include="fonts\fontawesome-webfont.woff" />
618-
<Content Include="fonts\fontawesome-webfont.ttf" />
619-
<Content Include="fonts\fontawesome-webfont.eot" />
620-
<Content Include="fonts\FontAwesome.otf" />
621625
<Content Include="Scripts\bootstrap.js" />
622626
<Content Include="Scripts\bootstrap.min.js" />
623627
<Content Include="Scripts\contact.js" />
624-
<Content Include="Scripts\errors.json" />
625-
<Content Include="Scripts\angular-touch.min.js.map" />
626-
<Content Include="Scripts\angular-sanitize.min.js.map" />
627-
<Content Include="Scripts\angular-route.min.js.map" />
628-
<Content Include="Scripts\angular-resource.min.js.map" />
629-
<Content Include="Scripts\angular-loader.min.js.map" />
630-
<Content Include="Scripts\angular-cookies.min.js.map" />
631-
<Content Include="Scripts\angular-animate.min.js.map" />
632-
<Content Include="Scripts\angular.min.js.map" />
633628
<Content Include="Custom\Themes\Standard-2014\fonts\glyphicons-halflings-regular.eot" />
634629
<Content Include="Custom\Themes\Standard-2014\fonts\glyphicons-halflings-regular.ttf" />
635630
<Content Include="Custom\Themes\Standard-2014\fonts\glyphicons-halflings-regular.woff" />
@@ -644,10 +639,23 @@
644639
<Content Include="fonts\glyphicons-halflings-regular.eot" />
645640
<Content Include="Content\bootstrap.css.map" />
646641
<Content Include="Content\bootstrap-theme.css.map" />
642+
<Content Include="Content\toastr.scss" />
643+
<Content Include="Content\toastr.less" />
647644
<None Include="Properties\PublishProfiles\Local IIS.pubxml" />
648645
<None Include="Properties\PublishProfiles\zoo - FTP.pubxml" />
649646
<None Include="Properties\PublishProfiles\zoo - Web Deploy.pubxml" />
650-
<None Include="Scripts\jquery-2.1.1.intellisense.js" />
647+
<Content Include="Scripts\errors.json" />
648+
<Content Include="Scripts\angular.min.js.map" />
649+
<Content Include="Scripts\angular-touch.min.js.map" />
650+
<Content Include="Scripts\angular-sanitize.min.js.map" />
651+
<Content Include="Scripts\angular-route.min.js.map" />
652+
<Content Include="Scripts\angular-resource.min.js.map" />
653+
<Content Include="Scripts\angular-messages.min.js.map" />
654+
<Content Include="Scripts\angular-message-format.min.js.map" />
655+
<Content Include="Scripts\angular-loader.min.js.map" />
656+
<Content Include="Scripts\angular-cookies.min.js.map" />
657+
<Content Include="Scripts\angular-aria.min.js.map" />
658+
<Content Include="Scripts\angular-animate.min.js.map" />
651659
<Content Include="Scripts\i18n\angular-locale_aa-dj.js" />
652660
<Content Include="Scripts\i18n\angular-locale_aa-er.js" />
653661
<Content Include="Scripts\i18n\angular-locale_aa-et.js" />
@@ -711,6 +719,8 @@
711719
<Content Include="Scripts\i18n\angular-locale_bez.js" />
712720
<Content Include="Scripts\i18n\angular-locale_bg-bg.js" />
713721
<Content Include="Scripts\i18n\angular-locale_bg.js" />
722+
<Content Include="Scripts\i18n\angular-locale_bm-latn-ml.js" />
723+
<Content Include="Scripts\i18n\angular-locale_bm-latn.js" />
714724
<Content Include="Scripts\i18n\angular-locale_bm-ml.js" />
715725
<Content Include="Scripts\i18n\angular-locale_bm.js" />
716726
<Content Include="Scripts\i18n\angular-locale_bn-bd.js" />
@@ -766,6 +776,8 @@
766776
<Content Include="Scripts\i18n\angular-locale_de.js" />
767777
<Content Include="Scripts\i18n\angular-locale_dje-ne.js" />
768778
<Content Include="Scripts\i18n\angular-locale_dje.js" />
779+
<Content Include="Scripts\i18n\angular-locale_dsb-de.js" />
780+
<Content Include="Scripts\i18n\angular-locale_dsb.js" />
769781
<Content Include="Scripts\i18n\angular-locale_dua-cm.js" />
770782
<Content Include="Scripts\i18n\angular-locale_dua.js" />
771783
<Content Include="Scripts\i18n\angular-locale_dyo-sn.js" />
@@ -799,8 +811,6 @@
799811
<Content Include="Scripts\i18n\angular-locale_en-cx.js" />
800812
<Content Include="Scripts\i18n\angular-locale_en-dg.js" />
801813
<Content Include="Scripts\i18n\angular-locale_en-dm.js" />
802-
<Content Include="Scripts\i18n\angular-locale_en-dsrt-us.js" />
803-
<Content Include="Scripts\i18n\angular-locale_en-dsrt.js" />
804814
<Content Include="Scripts\i18n\angular-locale_en-er.js" />
805815
<Content Include="Scripts\i18n\angular-locale_en-fj.js" />
806816
<Content Include="Scripts\i18n\angular-locale_en-fk.js" />
@@ -836,6 +846,7 @@
836846
<Content Include="Scripts\i18n\angular-locale_en-mt.js" />
837847
<Content Include="Scripts\i18n\angular-locale_en-mu.js" />
838848
<Content Include="Scripts\i18n\angular-locale_en-mw.js" />
849+
<Content Include="Scripts\i18n\angular-locale_en-my.js" />
839850
<Content Include="Scripts\i18n\angular-locale_en-na.js" />
840851
<Content Include="Scripts\i18n\angular-locale_en-nf.js" />
841852
<Content Include="Scripts\i18n\angular-locale_en-ng.js" />
@@ -983,6 +994,7 @@
983994
<Content Include="Scripts\i18n\angular-locale_gl-es.js" />
984995
<Content Include="Scripts\i18n\angular-locale_gl.js" />
985996
<Content Include="Scripts\i18n\angular-locale_gsw-ch.js" />
997+
<Content Include="Scripts\i18n\angular-locale_gsw-fr.js" />
986998
<Content Include="Scripts\i18n\angular-locale_gsw-li.js" />
987999
<Content Include="Scripts\i18n\angular-locale_gsw.js" />
9881000
<Content Include="Scripts\i18n\angular-locale_gu-in.js" />
@@ -1005,6 +1017,8 @@
10051017
<Content Include="Scripts\i18n\angular-locale_hr-ba.js" />
10061018
<Content Include="Scripts\i18n\angular-locale_hr-hr.js" />
10071019
<Content Include="Scripts\i18n\angular-locale_hr.js" />
1020+
<Content Include="Scripts\i18n\angular-locale_hsb-de.js" />
1021+
<Content Include="Scripts\i18n\angular-locale_hsb.js" />
10081022
<Content Include="Scripts\i18n\angular-locale_hu-hu.js" />
10091023
<Content Include="Scripts\i18n\angular-locale_hu.js" />
10101024
<Content Include="Scripts\i18n\angular-locale_hy-am.js" />
@@ -1079,6 +1093,8 @@
10791093
<Content Include="Scripts\i18n\angular-locale_ky.js" />
10801094
<Content Include="Scripts\i18n\angular-locale_lag-tz.js" />
10811095
<Content Include="Scripts\i18n\angular-locale_lag.js" />
1096+
<Content Include="Scripts\i18n\angular-locale_lb-lu.js" />
1097+
<Content Include="Scripts\i18n\angular-locale_lb.js" />
10821098
<Content Include="Scripts\i18n\angular-locale_lg-ug.js" />
10831099
<Content Include="Scripts\i18n\angular-locale_lg.js" />
10841100
<Content Include="Scripts\i18n\angular-locale_lkt-us.js" />
@@ -1122,12 +1138,10 @@
11221138
<Content Include="Scripts\i18n\angular-locale_mn.js" />
11231139
<Content Include="Scripts\i18n\angular-locale_mr-in.js" />
11241140
<Content Include="Scripts\i18n\angular-locale_mr.js" />
1125-
<Content Include="Scripts\i18n\angular-locale_ms-bn.js" />
11261141
<Content Include="Scripts\i18n\angular-locale_ms-latn-bn.js" />
11271142
<Content Include="Scripts\i18n\angular-locale_ms-latn-my.js" />
11281143
<Content Include="Scripts\i18n\angular-locale_ms-latn-sg.js" />
11291144
<Content Include="Scripts\i18n\angular-locale_ms-latn.js" />
1130-
<Content Include="Scripts\i18n\angular-locale_ms-my.js" />
11311145
<Content Include="Scripts\i18n\angular-locale_ms.js" />
11321146
<Content Include="Scripts\i18n\angular-locale_mt-mt.js" />
11331147
<Content Include="Scripts\i18n\angular-locale_mt.js" />
@@ -1196,6 +1210,10 @@
11961210
<Content Include="Scripts\i18n\angular-locale_pt-st.js" />
11971211
<Content Include="Scripts\i18n\angular-locale_pt-tl.js" />
11981212
<Content Include="Scripts\i18n\angular-locale_pt.js" />
1213+
<Content Include="Scripts\i18n\angular-locale_qu-bo.js" />
1214+
<Content Include="Scripts\i18n\angular-locale_qu-ec.js" />
1215+
<Content Include="Scripts\i18n\angular-locale_qu-pe.js" />
1216+
<Content Include="Scripts\i18n\angular-locale_qu.js" />
11991217
<Content Include="Scripts\i18n\angular-locale_rm-ch.js" />
12001218
<Content Include="Scripts\i18n\angular-locale_rm.js" />
12011219
<Content Include="Scripts\i18n\angular-locale_rn-bi.js" />
@@ -1224,6 +1242,7 @@
12241242
<Content Include="Scripts\i18n\angular-locale_sbp.js" />
12251243
<Content Include="Scripts\i18n\angular-locale_se-fi.js" />
12261244
<Content Include="Scripts\i18n\angular-locale_se-no.js" />
1245+
<Content Include="Scripts\i18n\angular-locale_se-se.js" />
12271246
<Content Include="Scripts\i18n\angular-locale_se.js" />
12281247
<Content Include="Scripts\i18n\angular-locale_seh-mz.js" />
12291248
<Content Include="Scripts\i18n\angular-locale_seh.js" />
@@ -1242,6 +1261,8 @@
12421261
<Content Include="Scripts\i18n\angular-locale_sk.js" />
12431262
<Content Include="Scripts\i18n\angular-locale_sl-si.js" />
12441263
<Content Include="Scripts\i18n\angular-locale_sl.js" />
1264+
<Content Include="Scripts\i18n\angular-locale_smn-fi.js" />
1265+
<Content Include="Scripts\i18n\angular-locale_smn.js" />
12451266
<Content Include="Scripts\i18n\angular-locale_sn-zw.js" />
12461267
<Content Include="Scripts\i18n\angular-locale_sn.js" />
12471268
<Content Include="Scripts\i18n\angular-locale_so-dj.js" />
@@ -1276,6 +1297,7 @@
12761297
<Content Include="Scripts\i18n\angular-locale_sv-fi.js" />
12771298
<Content Include="Scripts\i18n\angular-locale_sv-se.js" />
12781299
<Content Include="Scripts\i18n\angular-locale_sv.js" />
1300+
<Content Include="Scripts\i18n\angular-locale_sw-cd.js" />
12791301
<Content Include="Scripts\i18n\angular-locale_sw-ke.js" />
12801302
<Content Include="Scripts\i18n\angular-locale_sw-tz.js" />
12811303
<Content Include="Scripts\i18n\angular-locale_sw-ug.js" />
@@ -1356,6 +1378,8 @@
13561378
<Content Include="Scripts\i18n\angular-locale_xog.js" />
13571379
<Content Include="Scripts\i18n\angular-locale_yav-cm.js" />
13581380
<Content Include="Scripts\i18n\angular-locale_yav.js" />
1381+
<Content Include="Scripts\i18n\angular-locale_yi-001.js" />
1382+
<Content Include="Scripts\i18n\angular-locale_yi.js" />
13591383
<Content Include="Scripts\i18n\angular-locale_yo-bj.js" />
13601384
<Content Include="Scripts\i18n\angular-locale_yo-ng.js" />
13611385
<Content Include="Scripts\i18n\angular-locale_yo.js" />
@@ -1376,10 +1400,11 @@
13761400
<Content Include="Scripts\i18n\angular-locale_zh.js" />
13771401
<Content Include="Scripts\i18n\angular-locale_zu-za.js" />
13781402
<Content Include="Scripts\i18n\angular-locale_zu.js" />
1379-
<Content Include="Scripts\jquery-2.1.1.js" />
1380-
<Content Include="Scripts\jquery-2.1.1.min.js" />
1381-
<Content Include="Scripts\jquery-2.1.1.min.map" />
1403+
<None Include="Scripts\jquery-2.1.4.intellisense.js" />
1404+
<Content Include="Scripts\jquery-2.1.4.js" />
1405+
<Content Include="Scripts\jquery-2.1.4.min.js" />
13821406
<Content Include="Scripts\jquery.cookie.js" />
1407+
<Content Include="Scripts\jquery-2.1.4.min.map" />
13831408
<None Include="Scripts\jquery.validate-vsdoc.js" />
13841409
<Content Include="Scripts\jquery.validate.js" />
13851410
<Content Include="Scripts\jquery.validate.min.js" />
@@ -1491,10 +1516,9 @@
14911516
<Content Include="Custom\Themes\Standard\site.master" />
14921517
<Content Include="Custom\Themes\TitaniumX\site.master" />
14931518
<Content Include="setup\upgrade\index.cshtml" />
1494-
<Content Include="Scripts\toastr.min.js.map" />
14951519
<Content Include="Scripts\syntaxhighlighter\syntaxhighlighter.version" />
1496-
<Content Include="Scripts\version.json" />
14971520
<Content Include="setup\Web.config" />
1521+
<Content Include="Scripts\version.json" />
14981522
<None Include="Web.Debug.config">
14991523
<DependentUpon>Web.config</DependentUpon>
15001524
</None>

‎BlogEngine/BlogEngine.NET/Content/toastr.css‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
/*
2-
* Toastr
3-
* Copyright 2012-2014 John Papa and Hans Fjällemark.
4-
* All Rights Reserved.
5-
* Use, reproduction, distribution, and modification of this code is subject to the terms and
6-
* conditions of the MIT license, available at http://www.opensource.org/licenses/mit-license.php
7-
*
8-
* Author: John Papa and Hans Fjällemark
9-
* Project: https://github.com/CodeSeven/toastr
10-
*/
111
.toast-title {
122
font-weight: bold;
133
}
@@ -56,6 +46,16 @@ button.toast-close-button {
5646
border: 0;
5747
-webkit-appearance: none;
5848
}
49+
.toast-top-center {
50+
top: 0;
51+
right: 0;
52+
width: 100%;
53+
}
54+
.toast-bottom-center {
55+
bottom: 0;
56+
right: 0;
57+
width: 100%;
58+
}
5959
.toast-top-full-width {
6060
top: 0;
6161
right: 0;
@@ -94,6 +94,8 @@ button.toast-close-button {
9494
box-sizing: border-box;
9595
}
9696
#toast-container > div {
97+
position: relative;
98+
overflow: hidden;
9799
margin: 0 0 6px;
98100
padding: 15px 15px 15px 50px;
99101
width: 300px;
@@ -131,6 +133,11 @@ button.toast-close-button {
131133
#toast-container > .toast-warning {
132134
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=") !important;
133135
}
136+
#toast-container.toast-top-center > div,
137+
#toast-container.toast-bottom-center > div {
138+
width: 300px;
139+
margin: auto;
140+
}
134141
#toast-container.toast-top-full-width > div,
135142
#toast-container.toast-bottom-full-width > div {
136143
width: 96%;
@@ -151,6 +158,16 @@ button.toast-close-button {
151158
.toast-warning {
152159
background-color: #f89406;
153160
}
161+
.toast-progress {
162+
position: absolute;
163+
left: 0;
164+
bottom: 0;
165+
height: 4px;
166+
background-color: #000000;
167+
opacity: 0.4;
168+
-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=40);
169+
filter: alpha(opacity=40);
170+
}
154171
/*Responsive Design*/
155172
@media all and (max-width: 240px) {
156173
#toast-container > div {

0 commit comments

Comments
 (0)