diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index 91de26fdd..e30cb82e0 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -67,11 +67,11 @@
-
+
-
+
diff --git a/bower.json b/bower.json
index b581f2726..a37d92187 100644
--- a/bower.json
+++ b/bower.json
@@ -32,7 +32,7 @@
"jasny-bootstrap": "^3.1.3",
"bootswatch": "^3.3.7",
"smalot-bootstrap-datetimepicker": "^2.3.11",
- "bootstrap-select": "^1.11.0",
+ "bootstrap-select": "~1.10.0",
"bootstrap-table": "^1.11.0",
"bootstrap-daterangepicker": "^2.1.24",
"tableExport.jquery.plugin": "1.5.1",
diff --git a/public/dist/opensourcepos.js b/public/dist/opensourcepos.js
index ed4a46b43..5dbe011a8 100644
--- a/public/dist/opensourcepos.js
+++ b/public/dist/opensourcepos.js
@@ -16822,28 +16822,28 @@ return jQuery;
}));
/*!
- * Bootstrap-select v1.11.0 (http://silviomoreto.github.io/bootstrap-select)
+ * Bootstrap-select v1.10.0 (http://silviomoreto.github.io/bootstrap-select)
*
* Copyright 2013-2016 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
*/
-(function (root, factory) {
- if (typeof define === 'function' && define.amd) {
- // AMD. Register as an anonymous module unless amdModuleId is set
- define(["jquery"], function (a0) {
- return (factory(a0));
- });
- } else if (typeof exports === 'object') {
- // Node. Does not work with strict CommonJS, but
- // only CommonJS-like environments that support module.exports,
- // like Node.
- module.exports = factory(require("jquery"));
- } else {
- factory(jQuery);
- }
-}(this, function (jQuery) {
-
+(function (root, factory) {
+ if (typeof define === 'function' && define.amd) {
+ // AMD. Register as an anonymous module unless amdModuleId is set
+ define(["jquery"], function (a0) {
+ return (factory(a0));
+ });
+ } else if (typeof exports === 'object') {
+ // Node. Does not work with strict CommonJS, but
+ // only CommonJS-like environments that support module.exports,
+ // like Node.
+ module.exports = factory(require("jquery"));
+ } else {
+ factory(jQuery);
+ }
+}(this, function (jQuery) {
+
(function ($) {
'use strict';
@@ -16972,18 +16972,6 @@ return jQuery;
};
}
- // set data-selected on options that are programmatically selected
- // prior to initialization of bootstrap-select
- var _val = $.fn.val;
- $.fn.val = function(value){
- if (this.is('select') && value) {
- this.find('option[value="' + value + '"]').data('selected', true);
- }
-
- return _val.apply(this, arguments);
- };
-
- var changed_arguments = null;
$.fn.triggerNative = function (eventName) {
var el = this[0],
event;
@@ -17014,30 +17002,30 @@ return jQuery;
//
// Case insensitive contains search
- $.expr.pseudos.icontains = function (obj, index, meta) {
+ $.expr[':'].icontains = function (obj, index, meta) {
var $obj = $(obj);
- var haystack = ($obj.data('tokens') || $obj.text()).toString().toUpperCase();
+ var haystack = ($obj.data('tokens') || $obj.text()).toUpperCase();
return haystack.includes(meta[3].toUpperCase());
};
// Case insensitive begins search
- $.expr.pseudos.ibegins = function (obj, index, meta) {
+ $.expr[':'].ibegins = function (obj, index, meta) {
var $obj = $(obj);
- var haystack = ($obj.data('tokens') || $obj.text()).toString().toUpperCase();
+ var haystack = ($obj.data('tokens') || $obj.text()).toUpperCase();
return haystack.startsWith(meta[3].toUpperCase());
};
// Case and accent insensitive contains search
- $.expr.pseudos.aicontains = function (obj, index, meta) {
+ $.expr[':'].aicontains = function (obj, index, meta) {
var $obj = $(obj);
- var haystack = ($obj.data('tokens') || $obj.data('normalizedText') || $obj.text()).toString().toUpperCase();
+ var haystack = ($obj.data('tokens') || $obj.data('normalizedText') || $obj.text()).toUpperCase();
return haystack.includes(meta[3].toUpperCase());
};
// Case and accent insensitive begins search
- $.expr.pseudos.aibegins = function (obj, index, meta) {
+ $.expr[':'].aibegins = function (obj, index, meta) {
var $obj = $(obj);
- var haystack = ($obj.data('tokens') || $obj.data('normalizedText') || $obj.text()).toString().toUpperCase();
+ var haystack = ($obj.data('tokens') || $obj.data('normalizedText') || $obj.text()).toUpperCase();
return haystack.startsWith(meta[3].toUpperCase());
};
@@ -17089,12 +17077,6 @@ return jQuery;
}
var Selectpicker = function (element, options, e) {
- // bootstrap-select has been initialized - revert val back to its original function
- if (_val) {
- $.fn.val = _val;
- _val = null;
- }
-
if (e) {
e.stopPropagation();
e.preventDefault();
@@ -17128,7 +17110,7 @@ return jQuery;
this.init();
};
- Selectpicker.VERSION = '1.11.0';
+ Selectpicker.VERSION = '1.10.0';
// part of this is duplicated in i18n/defaults-en_US.js. Make sure to update both.
Selectpicker.DEFAULTS = {
@@ -17204,7 +17186,8 @@ return jQuery;
this.$element.removeClass('bs-select-hidden');
- if (this.options.dropdownAlignRight === true) this.$menu.addClass('dropdown-menu-right');
+ if (this.options.dropdownAlignRight)
+ this.$menu.addClass('dropdown-menu-right');
if (typeof id !== 'undefined') {
this.$button.attr('data-id', id);
@@ -17227,14 +17210,12 @@ return jQuery;
this.$newElement.on({
'hide.bs.dropdown': function (e) {
- that.$menuInner.attr('aria-expanded', false);
that.$element.trigger('hide.bs.select', e);
},
'hidden.bs.dropdown': function (e) {
that.$element.trigger('hidden.bs.select', e);
},
'show.bs.dropdown': function (e) {
- that.$menuInner.attr('aria-expanded', true);
that.$element.trigger('show.bs.select', e);
},
'shown.bs.dropdown': function (e) {
@@ -17247,7 +17228,7 @@ return jQuery;
that.$button
.addClass('bs-invalid')
.focus();
-
+
that.$element.on({
'focus.bs.select': function () {
that.$button.focus();
@@ -17264,6 +17245,7 @@ return jQuery;
that.$element.off('rendered.bs.select');
}
});
+
});
}
@@ -17283,7 +17265,7 @@ return jQuery;
var searchbox = this.options.liveSearch ?
'' +
'' +
+ (null === this.options.liveSearchPlaceholder ? '' : ' placeholder="' + htmlEscape(this.options.liveSearchPlaceholder) + '"') + '>' +
'
'
: '';
var actionsbox = this.multiple && this.options.actionsBox ?
@@ -17309,17 +17291,17 @@ return jQuery;
: '';
var drop =
'' +
- '