Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.

Commit bb8dee7

Browse files
author
swilliams
committed
search and repeater to use fuelux icons w/ mctheme
1 parent 3d08b52 commit bb8dee7

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

js/search.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
this.$button = this.$element.find('button');
4444
this.$input = this.$element.find('input');
45-
this.$icon = this.$element.find('.glyphicon');
45+
this.$icon = this.$element.find('.glyphicon, .fuelux-icon');
4646

4747
this.$button.on('click.fu.search', $.proxy(this.buttonclicked, this));
4848
this.$input.on('keyup.fu.search', $.proxy(this.keypress, this));
@@ -75,6 +75,9 @@
7575
if (this.$icon.hasClass('glyphicon')) {
7676
this.$icon.removeClass('glyphicon-search').addClass('glyphicon-remove');
7777
}
78+
if (this.$icon.hasClass('fuelux-icon')) {
79+
this.$icon.removeClass('fuelux-icon-search').addClass('fuelux-icon-remove');
80+
}
7881

7982
this.activeSearch = searchText;
8083
this.$element.addClass('searched pending');
@@ -85,6 +88,9 @@
8588
if (this.$icon.hasClass('glyphicon')) {
8689
this.$icon.removeClass('glyphicon-remove').addClass('glyphicon-search');
8790
}
91+
if (this.$icon.hasClass('fuelux-icon')) {
92+
this.$icon.removeClass('fuelux-icon-remove').addClass('fuelux-icon-search');
93+
}
8894

8995
if (this.$element.hasClass('pending')) {
9096
this.$element.trigger('canceled.fu.search');

templates/handlebars/fuelux/repeater.hbs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<input type="search" class="form-control" placeholder="Search"/>
88
<span class="input-group-btn">
99
<button class="btn btn-default" type="button">
10-
<span class="glyphicon glyphicon-search"></span>
10+
<span class="{{#unless mctheme}}glyphicon glyphicon-search{{else}}fuelux-icon fuelux-icon-search{{/unless}}"></span>
1111
<span class="sr-only">Search</span>
1212
</button>
1313
</span>
@@ -30,10 +30,10 @@
3030
</div>
3131
<div class="btn-group repeater-views" data-toggle="buttons">
3232
<label class="btn btn-default active">
33-
<input name="repeaterViews" type="radio" value="list"><span class="glyphicon glyphicon-list"></span>
33+
<input name="repeaterViews" type="radio" value="list"><span class="{{#unless mctheme}}glyphicon glyphicon-list{{else}}fuelux-icon fuelux-icon-gridview-list{{/unless}}"></span>
3434
</label>
3535
<label class="btn btn-default">
36-
<input name="repeaterViews" type="radio" value="thumbnail"><span class="glyphicon glyphicon-th"></span>
36+
<input name="repeaterViews" type="radio" value="thumbnail"><span class="{{#unless mctheme}}glyphicon glyphicon-th{{else}}fuelux-icon fuelux-icon-gridview-thumbnail{{/unless}}"></span>
3737
</label>
3838
</div>
3939
</div>
@@ -65,7 +65,7 @@
6565
<div class="repeater-footer-right">
6666
<div class="repeater-pagination">
6767
<button type="button" class="btn btn-default btn-sm repeater-prev">
68-
<span class="glyphicon glyphicon-chevron-left"></span>
68+
<span class="{{#unless mctheme}}glyphicon glyphicon-chevron-left{{else}}fuelux-icon fuelux-icon-chevron-left{{/unless}}"></span>
6969
<span class="sr-only">Previous Page</span>
7070
</button>
7171
<label id="{{pageLabelID}}" class="page-label">{{pageLabel}}</label>
@@ -84,10 +84,10 @@
8484
<input type="text" class="form-control repeater-secondaryPaging" aria-labelledby="{{pageLabelID}}">
8585
<span>of <span class="repeater-pages"></span></span>
8686
<button type="button" class="btn btn-default btn-sm repeater-next">
87-
<span class="glyphicon glyphicon-chevron-right"></span>
87+
<span class="{{#unless mctheme}}glyphicon glyphicon-chevron-right{{else}}fuelux-icon fuelux-icon-chevron-right{{/unless}}"></span>
8888
<span class="sr-only">Next Page</span>
8989
</button>
9090
</div>
9191
</div>
9292
</div>
93-
</div>
93+
</div>

0 commit comments

Comments
 (0)