Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit a6bc84d14a6e9e7fe7fb38b434c910c80aeefcee
Author: Adam Heim <jefffan24@gmail.com>
Date:   Mon Jun 26 17:03:11 2017 -0400

    Fix spacing of elseif

commit 7e9b2ef6029ec61d26c2e5c3c4f03bc02b6bf701
Merge: 7992293 a18f92d
Author: Adam Heim <jefffan24@gmail.com>
Date:   Mon Jun 26 17:00:28 2017 -0400

    Merge branch 'master' into bercut497-fix_selectedTextFormat

commit 79922930156de6c61e2bd1ce18ef85510f5c4c22
Merge: a6a562f 19344e0
Author: Adam Heim <jefffan24@gmail.com>
Date:   Mon Jun 26 16:32:41 2017 -0400

    Merge branch 'fix_selectedTextFormat' of git://github.com/bercut497/Ajax-Bootstrap-Select into bercut497-fix_selectedTextFormat

commit a6a562fb822f28e114f002b5f944e3d291b23ddb
Merge: 2571a0b 63c6c98
Author: Adam Heim <jefffan24@gmail.com>
Date:   Mon Jun 26 16:30:11 2017 -0400

    Merge branch 'master' into bercut497-fix_selectedTextFormat

commit 19344e0
Merge: 9d0f9c3 07feb52
Author: bercut <bercut>
Date:   Tue Jun 27 01:27:54 2017 +0500

    Merge branch 'fix_selectedTextFormat' of github.com:bercut497/Ajax-Bootstrap-Select into fix_selectedTextFormat

commit 9d0f9c3
Author: Bercut Stray <bercut497@gmail.com>
Date:   Sun Jun 25 13:49:49 2017 +0500

    fix #22  if element title attribute not set - option.selectedTextFormat will never be restored

commit 2571a0ba4a7b50210a0356acfdab98e21aa4a14e
Merge: c486bf0 7f28ef0
Author: Adam Heim <jefffan24@gmail.com>
Date:   Mon Jun 26 15:06:25 2017 -0400

    Merge branch 'master' into bercut497-fix_selectedTextFormat

commit c486bf034a9065462169148c1bc331503fbdca54
Merge: dce492d 07feb52
Author: Adam Heim <jefffan24@gmail.com>
Date:   Mon Jun 26 14:50:31 2017 -0400

    Merge branch 'fix_selectedTextFormat' of git://github.com/bercut497/Ajax-Bootstrap-Select into bercut497-fix_selectedTextFormat

commit 07feb52
Author: Bercut Stray <bercut497@gmail.com>
Date:   Sun Jun 25 13:49:49 2017 +0500

    fix #22 #112. if element title attribute not set - option.selectedTextFormat will never be restored

commit 27230cd
Author: Bercut Stray <bercut497@gmail.com>
Date:   Sun Jun 25 13:44:27 2017 +0500

    Revert "ignore bower components"
    prepare clean branch
    This reverts commit fbab292.

commit dee3337
Author: bercut <bercut>
Date:   Fri Jun 23 00:15:38 2017 +0500

    add api-docs js

commit c7245f1
Author: bercut <bercut>
Date:   Fri Jun 23 00:14:31 2017 +0500

    fix option.selectedTextFormat object link. generate dist files. regerate docs

commit 6308c00
Author: bercut <bercut>
Date:   Thu Jun 22 23:38:50 2017 +0500

    fix check and restore selectedTextFormatOption

commit fbab292
Author: bercut <bercut>
Date:   Thu Jun 22 23:34:30 2017 +0500

    ignore bower components
  • Loading branch information
truckingsim committed Jun 26, 2017
1 parent a18f92d commit e5f075f
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/js/classes/AjaxBootstrapSelectList.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,13 @@ AjaxBootstrapSelectList.prototype.refresh = function (triggerChange) {
if (!this.plugin.$element.find('option').length && emptyTitle && emptyTitle.length) {
this.setTitle(emptyTitle);
}
else if (this.title) {
else if (
this.title ||
(
this.selectedTextFormat !== 'static' &&
this.selectedTextFormat !== this.plugin.selectpicker.options.selectedTextFormat
)
) {
this.restoreTitle();
}
this.plugin.selectpicker.refresh();
Expand Down

0 comments on commit e5f075f

Please sign in to comment.