@finqu/cool 1.2.5 → 1.2.7

package/js/dist/tooltip.js

@@ -1,6 +1,6 @@
 /*!
-  * Cool UI tooltip.js v1.2.4 (https://finqu.fi)
-  * Copyright 2011-2019 Finqu Oy
+  * Cool UI tooltip.js v1.2.6 (https://finqu.fi)
+  * Copyright 2011-2020 Finqu Oy
   * Licensed under the ISC license - (http://opensource.org/licenses/ISC)
   */
 (function (global, factory) {

package/js/src/dropdown.js

@@ -300,17 +300,24 @@ class Dropdown extends AbstractUIComponent {
             // and let's assume that this containing parent fits and is inside
             // viewport
             let $containingParent = this.$container.parent();
-
+            let index = 0;
             while (
                 $containingParent.css('overflow-x') !== 'hidden' && 
                 $containingParent.css('overflow') !== 'hidden' &&
-                ($containingParent.prop('tagName') || '').toLowerCase() !== 'body'
+                ($containingParent.prop('tagName') || '').toLowerCase() !== 'body' &&
+                index < 100
             ) {
                 $containingParent = $containingParent.parent();
 
-                if (!$containingParent) {
+                if (!$containingParent.get(0)) {
                     return;
                 }
+
+                ++index;
+            }
+
+            if (!$containingParent.get(0)) {
+                return;
             }
 
             const containingBoundingRect = $containingParent.get(0).getBoundingClientRect();

package/js/src/popover.js

@@ -55,6 +55,7 @@ class Popover extends AbstractUIComponent {
 
         this.$el = $(this.el);
         this.$container = this.$el.data('container') ? $(this.$el.data('container')) : $(this.opts.container);
+        this.containerAutoDetect = this.$el.data('containerAutoDetect') ? this.$el.data('containerAutoDetect') : this.opts.containerAutoDetect;
         this.id = 'popover-'+this.generateUUID();
         this.animation = this.$el.data('animation') ? this.$el.data('animation') : this.opts.animation;
         this.animationIn = this.$el.data('animationIn') ? this.$el.data('animationIn') : this.opts.animationIn;
@@ -65,6 +66,10 @@ class Popover extends AbstractUIComponent {
         this.placementChanged = false;
         this.title = this.$el.data('title') ? this.$el.data('title') : this.opts.title;
         this.content = this.$el.data('content') ? this.$el.data('content') : this.opts.content;
+
+        if (this.containerAutoDetect) {
+            this.$container = this.$el.offsetParent();
+        }
     }
 
     // Bind events that trigger methods
@@ -595,6 +600,7 @@ if (typeof $ !== 'undefined') {
 
     $.fn[NAME].defaults = {
         container: '.content-inner',
+        containerAutoDetect: false,
         trigger: 'focus',
         placement: 'bottom',
         animation: true,

package/js/src/select.js

@@ -130,6 +130,7 @@ class Select extends AbstractUIComponent {
             this.allowNoneOnRadioSelect = this.$el.data('allowNoneOnRadioSelect') ? this.$el.data('allowNoneOnRadioSelect') : this.opts.allowNoneOnRadioSelect;
             this.showValidStateIcon = this.$el.data('showValidStateIcon') ? this.$el.data('showValidStateIcon') : this.opts.showValidStateIcon;
             this.itemsToExclude = this.$el.data('itemsToExclude') ? this.$el.data('itemsToExclude').replace(/\s/g, '').split(',') : this.opts.itemsToExclude;
+            this.primaryKeyword = this.$el.data('primaryKeyword') ? this.$el.data('primaryKeyword') : this.opts.primaryKeyword;
             this.preventClose = false;
 
             if (this.itemsToExclude.length > 0) {
@@ -144,13 +145,15 @@ class Select extends AbstractUIComponent {
                 this.data = this.$el.data('setData');
             }
 
-            if (typeof this.data[this.name].filter !== 'undefined' && self.itemsToExclude) {
+            if (this.data[this.name] !== 'undefined' && this.data[this.name].length > 0 && self.itemsToExclude) {
+
                 this.data[this.name] = this.data[this.name].filter(function(item) {
                     return self.itemsToExclude.indexOf(parseInt(item.id, 10)) === -1;
                 });
             }
 
-            if (typeof this.items.filter !== 'undefined' && self.itemsToExclude) {
+            if (this.items !== 'undefined' && this.items.lengths > 0 && self.itemsToExclude) {
+
                 this.items = this.items.filter(function(item) {
                     return self.itemsToExclude.indexOf(parseInt(item.id, 10)) === -1;
                 });
@@ -181,7 +184,7 @@ class Select extends AbstractUIComponent {
 
                             ${this._renderSearch()}
 
-                            <div class="select-scrollable-content">${items}</div>
+                            <div class="select-scrollable-content"></div>
 
                             ${this._renderFooter()}
 
@@ -189,6 +192,7 @@ class Select extends AbstractUIComponent {
                     `);
 
                     this.$el.append(this.$select);
+                    this.$select.find('.select-scrollable-content').append(items);
 
                     secondaryResolve();
 
@@ -568,19 +572,34 @@ class Select extends AbstractUIComponent {
 
                 let items = data.map(item => {
 
-                    item.id = item.id.toString();
+                    item.id = item[self.primaryKeyword].toString();
 
                     return item;
                 });
 
+                let itemIds = items.map(item => {
+                    return parseInt(item.id, 10);
+                });
+
+                // Remove value from data if it doesn't exist anymore
+                self.data[self.name] = self.data[self.name].filter(function(value) {
+                    return itemIds.indexOf(parseInt(value, 10)) > -1;
+                });
+
+                if (self.data[self.name].length == 0) {
+                    self.$selectIconContainer.html(self.selectIconDefault);
+                }
+
                 items = items.filter(function(item) {
                     return self.data[self.name].indexOf(item.id) > -1 && self.itemsToExclude.indexOf(parseInt(item.id, 10)) === -1 && parseInt(item.id, 10) > 0;
                 });
 
-                let result = $(self._renderItemList(items));
+                let result = self._renderItemList(items);
 
                 $.when(self.$scrollableContent.append(result)).then(function() {
 
+                    let $inputs = self.$scrollableContent.find(':input');
+
                     if (self.$scrollableContent[0].offsetHeight < self.$scrollableContent[0].scrollHeight) {
 
                         self.scroll.update();
@@ -594,9 +613,9 @@ class Select extends AbstractUIComponent {
                         self.$scrollableContent.removeClass('ps-show-rail-y');
                     }
 
-                    if (self.$select.find(':input[type="checkbox"]').length) {
+                    if (self.$scrollableContent.find(':input[type="checkbox"]').length) {
                         self.type = 'checkbox';
-                    } else if (self.$select.find(':input[type="radio"]').length) {
+                    } else if (self.$scrollableContent.find(':input[type="radio"]').length) {
                         self.type = 'radio';
                     }
 
@@ -604,7 +623,7 @@ class Select extends AbstractUIComponent {
 
                         self.data[self.name].forEach(function(value) {
 
-                            let $input = self.$select.find(':input').filter(function() { return this.value == value });
+                            let $input = $inputs.filter(function() { return this.value == value });
 
                             $input.prop('checked', true);
 
@@ -613,7 +632,7 @@ class Select extends AbstractUIComponent {
 
                     } else if (self.type == 'radio') {
 
-                        let $input = self.$select.find(':input').filter(function() { return this.value == self.data[self.name] });
+                        let $input = $inputs.filter(function() { return this.value == self.data[self.name] });
 
                         $input.prop('checked', true);
                         $input.addClass('checked');
@@ -629,9 +648,23 @@ class Select extends AbstractUIComponent {
 
         } else {
 
-            if (this.$select.find(':input[type="checkbox"]').length) {
+            // Remove value from data if it doesn't exist anymore
+            let $inputs = this.$scrollableContent.find(':input');
+            let inputValues = $inputs.length > 0 ? $inputs.map(function() {
+                return parseInt(this.value, 10);
+            }).get() : [];
+
+            this.data[this.name] = this.data[this.name].filter(function(value) {
+                return inputValues.indexOf(parseInt(value, 10)) > -1;
+            });
+
+            if (this.data[this.name].length == 0) {
+                this.$selectIconContainer.html(this.selectIconDefault);
+            }
+
+            if (this.$scrollableContent.find(':input[type="checkbox"]').length) {
                 this.type = 'checkbox';
-            } else if (this.$select.find(':input[type="radio"]').length) {
+            } else if (this.$scrollableContent.find(':input[type="radio"]').length) {
                 this.type = 'radio';
             }
 
@@ -639,7 +672,9 @@ class Select extends AbstractUIComponent {
 
                 this.data[this.name].forEach(function(value) {
 
-                    let $input = self.$select.find(':input').filter(function() { return this.value == value });
+                    let $input = $inputs.filter(function() {
+                        return this.value == value
+                    });
 
                     $input.prop('checked', true);
 
@@ -648,7 +683,9 @@ class Select extends AbstractUIComponent {
 
             } else if (this.type == 'radio') {
 
-                let $input = this.$select.find(':input').filter(function() { return this.value == self.data[self.name] });
+                let $input = $inputs.filter(function() {
+                    return this.value == self.data[self.name]
+                });
 
                 $input.prop('checked', true);
                 $input.addClass('checked');
@@ -681,7 +718,7 @@ class Select extends AbstractUIComponent {
 
                     let items = data.map(item => {
 
-                        item.id = item.id.toString();
+                        item.id = item[self.primaryKeyword].toString();
 
                         return item;
                     });
@@ -690,7 +727,7 @@ class Select extends AbstractUIComponent {
                         return self.data[self.name].indexOf(item.id) === -1 && self.itemsToExclude.indexOf(parseInt(item.id, 10)) === -1 && parseInt(item.id, 10) > 0;
                     });
 
-                    let result = $(self._renderItemList(items));
+                    let result = self._renderItemList(items);
 
                     $.when(self.$scrollableContent.append(result)).then(function() {
 
@@ -832,11 +869,25 @@ class Select extends AbstractUIComponent {
     // On select
     onSelect(el) {
 
+        let self = this;
         let onSelect = this.opts.onSelect;
+        let data = $(el).parents('.select-item').data();
+
+        if (this.searchApi.length && !$.isEmptyObject(data)) {
+
+            if ($(el).length && el.checked) {
+
+                this.items.push(data);
+
+            } else {
+
+               this.items = $.grep(this.items, function(item) { return item[self.primaryKeyword] != data.id });
+            }
+        }
 
         if (typeof onSelect === 'function') {
 
-            onSelect.call(el);
+            onSelect.call(el, data, this);
         }
     }
 
@@ -1045,7 +1096,7 @@ class Select extends AbstractUIComponent {
 
     _renderItemList(items) {
 
-        let result = '';
+        let result = [];
 
         for (let i = 0; i < items.length; ++i) {
 
@@ -1067,7 +1118,7 @@ class Select extends AbstractUIComponent {
                 }
             }
 
-            result += `
+            result.push($(`
 
                 <div class="select-item">
 
@@ -1097,7 +1148,7 @@ class Select extends AbstractUIComponent {
 
                 </div>
 
-            `;
+            `).data(item));
         }
 
         return result;
@@ -1228,7 +1279,8 @@ if (typeof $ !== 'undefined') {
         allowNoneOnRadioSelect: true,
         preventUncheck: false,
         showValidStateIcon: true,
-        itemsToExclude: []
+        itemsToExclude: [],
+        primaryKeyword: 'id'
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finqu/cool",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "Finqu UI package",
   "main": "index.js",
   "scripts": {

package/scss/LISENCE

@@ -1,6 +1,6 @@
 ISC License
 
-Copyright (c) 2019, Finqu Oy
+Copyright (c) 2020, Finqu Oy
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

package/scss/_frame.scss

@@ -315,6 +315,7 @@
 									font-size: $frame-sidebar-nav-icon-size;
 									margin: 0 auto;
 									color: $frame-sidebar-nav-icon-color;
+									min-width: 23px;
 
 									& + span {
 										margin-left: 20px;

package/scss/cool-grid.scss

@@ -1,6 +1,6 @@
 /*!
- * Cool UI - Grid v1.2.5 (https://finqu.fi)
- * Copyright 2019 Finqu Oy.
+ * Cool UI - Grid v1.2.7 (https://finqu.fi)
+ * Copyright 2020 Finqu Oy.
  * Licensed under the ISC license - (http://opensource.org/licenses/ISC)
  * Forked from Bootstrap, licensed MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */

package/scss/cool-reboot.scss

@@ -1,6 +1,6 @@
 /*!
- * Cool UI - Reboot v1.2.5 (https://finqu.fi)
- * Copyright 2019 Finqu Oy.
+ * Cool UI - Reboot v1.2.7 (https://finqu.fi)
+ * Copyright 2020 Finqu Oy.
  * Licensed under the ISC license - (http://opensource.org/licenses/ISC)
  * Forked from Bootstrap, licensed MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */

package/scss/cool.scss

@@ -1,6 +1,6 @@
 /*!
- * Cool UI v1.2.5 (https://finqu.fi)
- * Copyright 2019 Finqu Oy.
+ * Cool UI v1.2.7 (https://finqu.fi)
+ * Copyright 2020 Finqu Oy.
  * Licensed under the ISC license - (http://opensource.org/licenses/ISC)
  * Forked from Bootstrap, licensed MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */