Skip to content

Commit 588d488

Browse files
committed
Fix #65
Bump version to 1.5.5
1 parent 70c85dc commit 588d488

10 files changed

+18
-11807
lines changed

Build/CommonAssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
//
1616
// You can specify all the values or you can default the Revision and Build Numbers
1717
// by using the '*' as shown below:
18-
[assembly: AssemblyVersion("1.5.4")]
19-
[assembly: AssemblyFileVersion("1.5.4")]
18+
[assembly: AssemblyVersion("1.5.5")]
19+
[assembly: AssemblyFileVersion("1.5.5")]
2020
//[assembly: AssemblyInformationalVersion("1.4.5-editlyalpha2")]

Griddly.Mvc/GriddlyFilter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public GriddlyFilterList()
105105

106106
public void SetSelectedItems(object value)
107107
{
108-
if (IsMultiple && DefaultSelectAll && value == null)
108+
if (IsMultiple && DefaultSelectAll && !IsNoneAll && value == null)
109109
{
110110
// TODO: set default value to all selected
111111
foreach (SelectListItem item in SelectableItems)

Griddly/Griddly.csproj

+1-4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<IISExpressUseClassicPipelineMode />
2323
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
2424
<RestorePackages>true</RestorePackages>
25+
<UseGlobalApplicationHostFile />
2526
</PropertyGroup>
2627
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2728
<DebugSymbols>true</DebugSymbols>
@@ -185,9 +186,6 @@
185186
<Content Include="Scripts\jquery-1.11.0.js" />
186187
<Content Include="Scripts\jquery-1.11.0.min.js" />
187188
<Content Include="Scripts\jquery-1.11.0.min.map" />
188-
<None Include="Scripts\jquery-2.1.0.intellisense.js" />
189-
<Content Include="Scripts\jquery-2.1.0.js" />
190-
<Content Include="Scripts\jquery-2.1.0.min.js" />
191189
<None Include="Scripts\jquery.validate-vsdoc.js" />
192190
<Content Include="Scripts\jquery.validate.js" />
193191
<Content Include="Scripts\jquery.validate.min.js" />
@@ -247,7 +245,6 @@
247245
<Content Include="Views\Shared\Griddly\ButtonStrip.cshtml" />
248246
<Content Include="Views\Shared\Griddly\Griddly.cshtml" />
249247
<Content Include="Views\Home\TestGrid.cshtml" />
250-
<Content Include="Scripts\jquery-2.1.0.min.map" />
251248
<Content Include="Views\Home\FilterRangeGrid.cshtml" />
252249
<Content Include="Views\Home\FilterBoxGrid.cshtml" />
253250
<Content Include="Views\Home\FilterListGrid.cshtml" />

Griddly/Scripts/_references.js

-84 Bytes
Binary file not shown.

Griddly/Scripts/griddly.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -655,9 +655,6 @@
655655

656656
if (display)
657657
displayEl.text(display);
658-
659-
// TODO: remove below once M3 compat fixed
660-
// this.refresh(true);
661658
}, this));
662659

663660
$(".griddly-filters-inline input, .griddly-filters-inline select", this.$element).on("change", $.proxy(function (event)
@@ -1094,20 +1091,23 @@
10941091
}, this))
10951092
.fail($.proxy(function (xhr, status, errorThrown)
10961093
{
1097-
if (this.options.onError)
1098-
{
1099-
this.options.onError(xhr, status, errorThrown);
1100-
}
1101-
else
1094+
if (xhr.status != 0)
11021095
{
1103-
var url = this.options.url + (this.options.url.indexOf('?') == -1 ? "?" : "&");
1096+
if (this.options.onError)
1097+
{
1098+
this.options.onError(xhr, status, errorThrown);
1099+
}
1100+
else
1101+
{
1102+
var url = this.options.url + (this.options.url.indexOf('?') == -1 ? "?" : "&");
11041103

1105-
url += $.param(postData);
1104+
url += $.param(postData);
11061105

1107-
window.location = url;
1108-
}
1106+
window.location = url;
1107+
}
11091108

1110-
this.triggerOrQueue(this.$element, "error.griddly", { xhr: xhr, status: status, error: errorThrown });
1109+
this.triggerOrQueue(this.$element, "error.griddly", { xhr: xhr, status: status, error: errorThrown });
1110+
}
11111111
}, this));
11121112
},
11131113

Griddly/Scripts/jquery-2.1.0.intellisense.js

-2,670
This file was deleted.

0 commit comments

Comments
 (0)