Skip to content

Commit b936c3f

Browse files
committed
Fixed bug rstaib#58 and added iconset overload for fontawesome
1 parent f71daa1 commit b936c3f

19 files changed

+69
-24
lines changed

CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
## 1.2.0
44

55
### Enhancements & Features
6-
-
6+
- Added iconset overload for *FontAwesome*
77

88
### Bug Fixes
99
- Fixed an bug regarding `navigation` property (failed when property was set to `1` or `2`)
10+
- Fixed bug [#58](http://github.com/rstaib/jquery-bootgrid/issues/58)
11+
12+
### Breaking Changes
13+
There are no breaking changes but the `search` template changed during development. In case you want to use the overloaded iconset for *FontAwesome* keep in mind to replace the hard-coded `glyphicon-search` by `{{css.iconSearch}}`.
1014

1115
## 1.1.4
1216

@@ -77,4 +81,4 @@ There are no breaking changes but some HTML templates changed during development
7781
## 0.9.7
7882

7983
### Bug Fixes
80-
- Fixed a column header visualization bug regarding sorting
84+
- Fixed a column header visualization bug regarding sorting

Gruntfile.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ module.exports = function (grunt)
77

88
grunt.initConfig({
99
pkg: grunt.file.readJSON('package.json'),
10+
fontawesome: 'fa',
1011
banner: '/*! <%= "\\r\\n * " + pkg.title %> v<%= pkg.version %> - <%= grunt.template.today("mm/dd/yyyy") + "\\r\\n" %>' +
11-
' * Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %> <%= (pkg.homepage ? "(" + pkg.homepage + ")" : "") + "\\r\\n" %>' +
12+
' * Copyright (c) 2014-<%= grunt.template.today("yyyy") %> <%= pkg.author.name %> <%= (pkg.homepage ? "(" + pkg.homepage + ")" : "") + "\\r\\n" %>' +
1213
' * Licensed under <%= pkg.licenses[0].type + " " + pkg.licenses[0].url + "\\r\\n */\\r\\n" %>',
1314
folders: {
1415
dist: "dist",
@@ -73,6 +74,9 @@ module.exports = function (grunt)
7374
'<%= folders.src %>/public.js',
7475
'<%= folders.src %>/extensions.js',
7576
'<%= folders.src %>/plugin.js'
77+
],
78+
'<%= folders.dist %>/<%= pkg.namespace %>.<%= fontawesome %>.js': [
79+
'<%= folders.src %>/fontawesome.js'
7680
]
7781
}
7882
},
@@ -170,7 +174,12 @@ module.exports = function (grunt)
170174
report: 'gzip'
171175
},
172176
files: {
173-
'<%= folders.dist %>/<%= pkg.namespace %>.min.js': ['<%= folders.dist %>/<%= pkg.namespace %>.js']
177+
'<%= folders.dist %>/<%= pkg.namespace %>.min.js': [
178+
'<%= folders.dist %>/<%= pkg.namespace %>.js'
179+
],
180+
'<%= folders.dist %>/<%= pkg.namespace %>.<%= fontawesome %>.min.js': [
181+
'<%= folders.dist %>/<%= pkg.namespace %>.<%= fontawesome %>.js'
182+
]
174183
}
175184
}
176185
},

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013-2015 Rafael J. Staib
3+
Copyright (c) 2014-2015 Rafael J. Staib
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ Instructions will follow soon!
5959

6060
## License
6161

62-
Copyright (c) 2013-2015 Rafael J. Staib Licensed under the [MIT license](https://github.com/rstaib/jquery-bootgrid/blob/master/LICENSE.txt).
62+
Copyright (c) 2014-2015 Rafael J. Staib Licensed under the [MIT license](https://github.com/rstaib/jquery-bootgrid/blob/master/LICENSE.txt).

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"docs",
3636
"lib",
3737
"test",
38-
"*.nuspec",
38+
"*.nuspec",
3939
".gitattributes",
4040
".gitignore",
4141
".travis.yml",

demo/index.htm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
</div>
138138

139139
<footer id="footer">
140-
© Copyright 2014, Rafael Staib
140+
© Copyright 2014-2015, Rafael Staib
141141
</footer>
142142

143143
<script src="../lib/jquery-1.11.1.min.js"></script>
@@ -154,7 +154,8 @@
154154
{
155155
return "<a href=\"#\">" + column.id + ": " + row.id + "</a>";
156156
}
157-
}
157+
},
158+
rowCount: [-1, 25, 50, 75]
158159
});
159160
}
160161

demo/send.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
</div>
133133

134134
<footer id="footer">
135-
© Copyright 2014, Rafael Staib
135+
© Copyright 2014-2015, Rafael Staib
136136
</footer>
137137

138138
<script src="../lib/jquery-1.11.1.min.js"></script>

dist/jQuery.Bootgrid.1.2.0.nupkg

957 Bytes
Binary file not shown.

dist/jquery.bootgrid-1.2.0.zip

859 Bytes
Binary file not shown.

dist/jquery.bootgrid.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* jQuery Bootgrid v1.2.0 - 02/09/2015
3-
* Copyright (c) 2015 Rafael Staib (http://www.jquery-bootgrid.com)
3+
* Copyright (c) 2014-2015 Rafael Staib (http://www.jquery-bootgrid.com)
44
* Licensed under MIT http://www.opensource.org/licenses/MIT
55
*/
66
.bootgrid-header,

0 commit comments

Comments
 (0)