Skip to content

Commit 0c1ef96

Browse files
committed
Summernote update and JS mimification fixes
1 parent 3d3e8e0 commit 0c1ef96

11 files changed

Lines changed: 6695 additions & 7100 deletions

File tree

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,10 @@ static void RegisterBundles(BundleCollection bundles)
171171
.Include("~/scripts/jquery.form.js")
172172
.Include("~/scripts/jquery.validate.js")
173173
.Include("~/scripts/toastr.js")
174-
.Include("~/scripts/Q.js")
174+
.Include("~/scripts/Q.js")
175175
.Include("~/Scripts/angular.min.js")
176176
.Include("~/Scripts/angular-route.min.js")
177-
.Include("~/Scripts/angular-animate.min.js")
178-
.Include("~/Scripts/angular-sanitize.min.js")
177+
.Include("~/Scripts/angular-sanitize.min.js")
179178
.Include("~/scripts/bootstrap.js")
180179
.Include("~/scripts/textext.js")
181180
.Include("~/scripts/moment.js")

BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,6 +1437,7 @@
14371437
<Content Include="setup\SQLite\SQLiteWeb.Config" />
14381438
<Content Include="setup\SQLServer\MSSQLSetup3.2.0.0.sql" />
14391439
<Content Include="setup\SQLServer\MSSQLSetup3.1.0.0.sql" />
1440+
<Content Include="setup\SQLServer\MSSQLUpgradeFrom3.1to3.2.sql" />
14401441
<Content Include="setup\SQLServer\MSSQLUpgradeFrom3.0to3.1.sql" />
14411442
<Content Include="setup\SQLServer\SQLServerWeb.Config" />
14421443
<Content Include="setup\SQL_CE\SQL_CE_Setup_3.1.sql" />

BlogEngine/BlogEngine.NET/admin/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(function () {
2-
var app = angular.module("blogAdmin", ['ngRoute', 'ngAnimate', 'ngSanitize']);
2+
var app = angular.module("blogAdmin", ['ngRoute', 'ngSanitize']);
33

44
var config = ["$routeProvider", function ($routeProvider) {
55
$routeProvider

BlogEngine/BlogEngine.NET/admin/controllers/common.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,12 @@ function rowSpinOff(items) {
8181

8282
function selectedOption(arr, val) {
8383
for (var i = 0; i < arr.length; i++) {
84-
if (arr[i].OptionValue.toUpperCase() == val.toUpperCase()) return arr[i];
84+
if (typeof val === 'number') {
85+
if (arr[i].OptionValue == val) return arr[i];
86+
}
87+
else {
88+
if (arr[i].OptionValue.toUpperCase() == val.toUpperCase()) return arr[i];
89+
}
8590
}
8691
}
8792

BlogEngine/BlogEngine.NET/admin/editor/editor.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ function spinOff() {
3838

3939
function selectedOption(arr, val) {
4040
for (var i = 0; i < arr.length; i++) {
41-
if (arr[i].OptionValue.toLowerCase() === val.toLowerCase()) return arr[i];
41+
if (typeof val === 'number') {
42+
if (arr[i].OptionValue === val) return arr[i];
43+
}
44+
else {
45+
if (arr[i].OptionValue.toLowerCase() === val.toLowerCase()) return arr[i];
46+
}
4247
}
4348
}
4449

0 commit comments

Comments
 (0)