Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add separate iconsets for Fontawesome 5 #81

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add separate iconsets for Fontawesome 5 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62cb44d
Add seperate iconsets for Fontawesome 5
antwertinger Feb 18, 2019
f72bdd4
Add method setVersion
antwertinger Feb 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,114 changes: 4,113 additions & 1 deletion dist/js/bootstrap-iconpicker-iconset-all.js
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 17 additions & 12 deletions dist/js/bootstrap-iconpicker-iconset-all.min.js
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 18 additions & 13 deletions dist/js/bootstrap-iconpicker.bundle.min.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion dist/js/bootstrap-iconpicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* File: bootstrap-iconpicker.js v1.10.0 by @victor-valencia
* https://victor-valencia.github.com/bootstrap-iconpicker
* ========================================================================
* Copyright 2013-2018 Victor Valencia Rico.
* Copyright 2013-2019 Victor Valencia Rico.
* Licensed under MIT license.
* https://github.com/victor-valencia/bootstrap-iconpicker/blob/master/LICENSE
* ========================================================================
Expand Down Expand Up @@ -44,6 +44,10 @@
flagicon: $.iconset_flagicon || Iconpicker.ICONSET_EMPTY,
fontawesome4: $.iconset_fontawesome_4 || Iconpicker.ICONSET_EMPTY,
fontawesome5: $.iconset_fontawesome_5 || Iconpicker.ICONSET_EMPTY,
fontawesome5brands: $.iconset_fontawesome_5_brands || Iconpicker.ICONSET_EMPTY,
fontawesome5regular: $.iconset_fontawesome_5_regular || Iconpicker.ICONSET_EMPTY,
fontawesome5solid: $.iconset_fontawesome_5_solid || Iconpicker.ICONSET_EMPTY,
fontawesome5light: $.iconset_fontawesome_5_light || Iconpicker.ICONSET_EMPTY,
glyphicon: $.iconset_glyphicon || Iconpicker.ICONSET_EMPTY,
ionicon: $.iconset_ionicon || Iconpicker.ICONSET_EMPTY,
mapicon: $.iconset_mapicon || Iconpicker.ICONSET_EMPTY,
Expand Down Expand Up @@ -402,6 +406,11 @@
this.select(op.icon);
};

Iconpicker.prototype.setVersion = function (value) {
this.options.iconsetVersion = value;
this.reset();
};

Iconpicker.prototype.setLabelHeader = function (value) {
this.options.labelHeader = value;
this.updateLabels(this.options.page);
Expand Down
4 changes: 2 additions & 2 deletions dist/js/bootstrap-iconpicker.min.js
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ module.exports = function(grunt) {
'temp/js/iconset/iconset-flagicon-all.min.js': ['src/js/iconset/iconset-flagicon-all.js'],
'temp/js/iconset/iconset-fontawesome-4-all.min.js': ['src/js/iconset/iconset-fontawesome-4-all.js'],
'temp/js/iconset/iconset-fontawesome-5-all.min.js': ['src/js/iconset/iconset-fontawesome-5-all.js'],
'temp/js/iconset/iconset-fontawesome-5-brands.min.js': ['src/js/iconset/iconset-fontawesome-5-brands.js'],
'temp/js/iconset/iconset-fontawesome-5-light.min.js': ['src/js/iconset/iconset-fontawesome-5-light.js'],
'temp/js/iconset/iconset-fontawesome-5-regular.min.js': ['src/js/iconset/iconset-fontawesome-5-regular.js'],
'temp/js/iconset/iconset-fontawesome-5-solid.min.js': ['src/js/iconset/iconset-fontawesome-5-solid.js'],
'temp/js/iconset/iconset-glyphicon-all.min.js': ['src/js/iconset/iconset-glyphicon-all.js'],
'temp/js/iconset/iconset-ionicon-all.min.js': ['src/js/iconset/iconset-ionicon-all.js'],
'temp/js/iconset/iconset-mapicon-all.min.js': ['src/js/iconset/iconset-mapicon-all.js'],
Expand Down Expand Up @@ -83,6 +87,10 @@ module.exports = function(grunt) {
'src/js/iconset/iconset-flagicon-all.js',
'src/js/iconset/iconset-fontawesome-4-all.js',
'src/js/iconset/iconset-fontawesome-5-all.js',
'src/js/iconset/iconset-fontawesome-5-brands.js',
'src/js/iconset/iconset-fontawesome-5-light.js',
'src/js/iconset/iconset-fontawesome-5-regular.js',
'src/js/iconset/iconset-fontawesome-5-solid.js',
'src/js/iconset/iconset-glyphicon-all.js',
'src/js/iconset/iconset-ionicon-all.js',
'src/js/iconset/iconset-mapicon-all.js',
Expand All @@ -103,6 +111,10 @@ module.exports = function(grunt) {
'temp/js/iconset/iconset-flagicon-all.min.js',
'temp/js/iconset/iconset-fontawesome-4-all.min.js',
'temp/js/iconset/iconset-fontawesome-5-all.min.js',
'temp/js/iconset/iconset-fontawesome-5-brands.min.js',
'temp/js/iconset/iconset-fontawesome-5-light.min.js',
'temp/js/iconset/iconset-fontawesome-5-regular.min.js',
'temp/js/iconset/iconset-fontawesome-5-solid.min.js',
'temp/js/iconset/iconset-glyphicon-all.min.js',
'temp/js/iconset/iconset-ionicon-all.min.js',
'temp/js/iconset/iconset-mapicon-all.min.js',
Expand Down
9 changes: 9 additions & 0 deletions src/js/bootstrap-iconpicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
flagicon: $.iconset_flagicon || Iconpicker.ICONSET_EMPTY,
fontawesome4: $.iconset_fontawesome_4 || Iconpicker.ICONSET_EMPTY,
fontawesome5: $.iconset_fontawesome_5 || Iconpicker.ICONSET_EMPTY,
fontawesome5brands: $.iconset_fontawesome_5_brands || Iconpicker.ICONSET_EMPTY,
fontawesome5regular: $.iconset_fontawesome_5_regular || Iconpicker.ICONSET_EMPTY,
fontawesome5solid: $.iconset_fontawesome_5_solid || Iconpicker.ICONSET_EMPTY,
fontawesome5light: $.iconset_fontawesome_5_light || Iconpicker.ICONSET_EMPTY,
glyphicon: $.iconset_glyphicon || Iconpicker.ICONSET_EMPTY,
ionicon: $.iconset_ionicon || Iconpicker.ICONSET_EMPTY,
mapicon: $.iconset_mapicon || Iconpicker.ICONSET_EMPTY,
Expand Down Expand Up @@ -396,6 +400,11 @@
this.select(op.icon);
};

Iconpicker.prototype.setVersion = function (value) {
this.options.iconsetVersion = value;
this.reset();
};

Iconpicker.prototype.setLabelHeader = function (value) {
this.options.labelHeader = value;
this.updateLabels(this.options.page);
Expand Down
Loading