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

Adding support for Glyphicons Pro 1.9.2 and hidden input in inline mode #45

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+821 −7
Open

Adding support for Glyphicons Pro 1.9.2 and hidden input in inline mode #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1de059
Adding support for Glyphicons Pro 1.9.2
ChuckChance Feb 25, 2016
9f82eeb
Adding support for Glyphicons Pro 1.9.2
ChuckChance Feb 25, 2016
9d01508
Fix hidden input + inline mode
ChuckChance Feb 26, 2016
0b49016
Fix hidden input + inline mode
ChuckChance Feb 26, 2016
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
21 changes: 14 additions & 7 deletions bootstrap-iconpicker/js/bootstrap-iconpicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
elusiveicon: $.iconset_elusiveicon || Iconpicker.ICONSET_EMPTY,
fontawesome: $.iconset_fontawesome || Iconpicker.ICONSET_EMPTY,
ionicon: $.iconset_ionicon || Iconpicker.ICONSET_EMPTY,
glyphicon: $.iconset_glyphicon || Iconpicker.ICONSET_EMPTY,
glyphicon: $.iconset_glyphicon || Iconpicker.ICONSET_EMPTY,
glyphiconspro192: $.iconset_glyphiconspro192 || Iconpicker.ICONSET_EMPTY,
mapicon: $.iconset_mapicon || Iconpicker.ICONSET_EMPTY,
materialdesign: $.iconset_materialdesign || Iconpicker.ICONSET_EMPTY,
octicon: $.iconset_octicon || Iconpicker.ICONSET_EMPTY,
Expand Down Expand Up @@ -142,8 +143,10 @@
}
if (icon !== '' && op.selected >= 0) {
op.icon = icon;

el.find('input[type=hidden]').val(icon);

if(op.inline === false){
el.find('input').val(icon);
el.find('i').attr('class', '').addClass(op.iconClass).addClass(icon);
}
if(icon === op.iconClassFix){
Expand Down Expand Up @@ -188,21 +191,25 @@
return this.options.cols * this.options.rows;
}
};

Iconpicker.prototype.updateArrows = function (page) {
var op = this.options;
var total_pages = this.totalPages();
if (page === 1) {
if (page === 1) {
op.table.find('.btn-previous').addClass('disabled');
op.table.find('.btn-previous').prop('disabled', true); // Add this
}
else {
op.table.find('.btn-previous').removeClass('disabled');
op.table.find('.btn-previous').prop('disabled', false); // And this
}
if (page === total_pages || total_pages === 0) {
if (page === total_pages || total_pages === 0) {
op.table.find('.btn-next').addClass('disabled');
op.table.find('.btn-next').prop('disabled', true); // And this
}
else {
op.table.find('.btn-next').removeClass('disabled');
op.table.find('.btn-next').prop('disabled', false); // And this
}
};

Expand Down Expand Up @@ -245,7 +252,7 @@
op.table.find('tfoot').empty().append(icons_count.join(''));
}
};

Iconpicker.prototype.updateLabels = function (page) {
var op = this.options;
var total_icons = this.totalIcons();
Expand All @@ -254,7 +261,7 @@
var offset = (page - 1) * this.totalIconsPerPage();
var total = page * this.totalIconsPerPage();
op.table.find('.icons-count').html(op.labelFooter.replace('{0}', total_icons ? offset + 1 : 0).replace('{1}', (total < total_icons) ? total: total_icons).replace('{2}', total_icons));
this.updateArrows(page);
this.updateArrows(page);
};

Iconpicker.prototype.updatePagesCount = function () {
Expand Down
Loading