vhx-quartz 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 954d84fa066952eb4c4f79c1b3c67ad5b3993ffb
-  data.tar.gz: 83562c33164cb3d6d7777d5499a2c266966a5d83
+  metadata.gz: db39b7019ef57a978493c304c8b6ce1af64fc0c4
+  data.tar.gz: 225d90078555018c979b35780dc3d9794f4079ef
 SHA512:
-  metadata.gz: 083ab461afbaf291de96631ca1840046209cbca5ef40450b04cb58ba4e726a96ab5852ac38c55602c562c615945bb3573ecddf7ab1f69799a77caa561ebd3006
-  data.tar.gz: f4d9e1c902223234ea9efe5fe68b6d50195152b73f2703a7785007ef386470f67856c6e77fed7fab47c18b09f5e9ebe64a73d72426abc7b078698f84fa7eb2a6
+  metadata.gz: 464844b4d3c988e83f5bd2d864faf2cd127f5f90b929ac5631320d0e9148048ea5fa0f6c9839024168fd0299800d3487a6cd821aae36b07e6efbe3b98cfe550c
+  data.tar.gz: 3a00a545ff5cc79bb1ef4ab19fc9170078135b17c2eed93344accd332b2c0770a1431e52340f9e996d45a9f6e1d3cc26e15a7830b672bbdb3666f8e964bb997a

data/lib/vhx/quartz/version.rb

@@ -1,5 +1,5 @@
 module Vhx
   module Quartz
-    VERSION = "0.10.1"
+    VERSION = "0.10.2"
   end
 end

data/vendor/assets/javascripts/vhx-quartz.select.js

@@ -10,10 +10,13 @@ vhxm.components.shared.select.controller = function (opts) {
 
     self.type = opts.type || 'standard';
     self.multiselect = opts.multiselect || false;
+    self.caret_position = opts.caret_position || 'right';
     self.model.items = opts.items;
 
     if (opts.selected) {
-      self.state.selected(opts.selected);
+      opts.selected.map(function (item) {
+        self.selectItem(item, true);
+      });
     }
 
     if (opts.onSelect) {
@@ -94,7 +97,7 @@ vhxm.components.shared.select.controller = function (opts) {
     self.state.isLoading(true);
   };
 
-  self.selectItem = function (item) {
+  self.selectItem = function (item, isInit) {
     var selected = void 0;
     if (!self.multiselect) {
       self.state.selected({});
@@ -104,15 +107,21 @@ vhxm.components.shared.select.controller = function (opts) {
 
     if (selected[item[opts.prop_map.key]]) {
       delete selected[item[opts.prop_map.key]];
+      self.state.onSelect(null, self.state.selected(), 'removed');
     } else {
-      selected[item[opts.prop_map.key]] = {
+      var obj = {
         value: item[opts.prop_map.value],
         label: item[opts.prop_map.label]
       };
+      selected[item[opts.prop_map.key]] = obj;
+      self.state.onSelect(obj, self.state.selected(), 'added');
     }
 
     self.state.selected(selected);
-    self.state.isDropdownOpen(self.multiselect ? true : false);
+
+    if (!isInit) {
+      self.state.isDropdownOpen(self.multiselect ? true : false);
+    }
 
     if (self.multiselect) {
       self.state.highlightIndex(-1);
@@ -201,6 +210,7 @@ vhxm.components.shared.select.ui.container = {
     options += opts.trigger ? '.has-trigger' : '';
     options += opts.type === 'media' ? '.has-media' : '';
     options += opts.inline ? '.inline' : '';
+    options += '.caret--' + ctrl.caret_position;
 
     if (opts.trigger) {
       opts.trigger.attrs.onclick = ctrl.handleClick;
@@ -208,12 +218,6 @@ vhxm.components.shared.select.ui.container = {
     }
 
     return m('.c-select--container.relative.form' + options, {
-      config: function config(el, isInitialized) {
-        if (opts.trigger && isInitialized) {
-          var left_pos = el.querySelector('.c-select--trigger').offsetWidth * 0.25;
-          el.querySelector('.c-select--caret').style.left = left_pos + 'px';
-        }
-      },
       onmouseleave: function onmouseleave() {
         ctrl.state.highlightIndex(-1);
       },

data/vendor/assets/javascripts/vhx-quartz.tag.js

@@ -4,10 +4,19 @@ vhxm.components.shared.tag.controller = function (opts) {
   var self = this;
 
   self.state = new vhxm.components.shared.tag.state();
+
+  if (opts.onShow) {
+    self.state.onShow = opts.onShow;
+  }
+  if (opts.onRemove) {
+    self.state.onRemove = opts.onRemove;
+  }
 };
 vhxm.components.shared.tag.state = function () {
   this.isHover = m.prop(false);
   this.isRemoveHover = m.prop(false);
+  this.onShow = function () {};
+  this.onRemove = function () {};
 };
 
 vhxm.components.shared.tag.ui.container = {
@@ -21,12 +30,14 @@ vhxm.components.shared.tag.ui.container = {
         ctrl.state.isHover(false);
       }
     }, [m('button.c-tag--button' + (ctrl.state.isHover() ? '.btn-teal.is-hover' : '.btn-gray'), {
-      onclick: function onclick() {
-        ctrl.state.onShow();
+      onclick: function onclick(event) {
+        event.preventDefault();
+        ctrl.state.onShow(event);
       }
     }, opts.label ? opts.label : 'Tag'), m('a.c-tag--remove.icon--center.icon-x-white.icon--xxsmall' + (ctrl.state.isRemoveHover() ? '.btn-red' : '.btn-teal'), {
-      onclick: function onclick() {
-        ctrl.state.onRemove();
+      onclick: function onclick(event) {
+        event.preventDefault();
+        ctrl.state.onRemove(event);
       },
       onmouseover: function onmouseover() {
         ctrl.state.isRemoveHover(true);

data/vendor/assets/stylesheets/vhx-quartz.select.css

@@ -27,6 +27,19 @@
 ..................................... */
 /* helper function for margin and padding
 ......................................*/
+.c-select--container.has-trigger .c-select--dropdown {
+  top: 35px; }
+.c-select--container.has-search .c-select--dropdown {
+  min-height: 150px; }
+.c-select--container.has-search .c-select--options {
+  margin-top: 80px; }
+.c-select--container.caret--left .c-select--caret {
+  left: 22px; }
+.c-select--container.caret--center .c-select--caret {
+  left: 50%; }
+.c-select--container.caret--right .c-select--caret {
+  right: 22px; }
+
 .c-select--dropdown {
   position: absolute;
   max-height: 282px;
@@ -34,8 +47,6 @@
   left: 0;
   z-index: 2147483600;
   display: none; }
-  .c-select--dropdown.has-trigger {
-    top: 35px; }
   .c-select--dropdown.is-open {
     display: block; }
 
@@ -65,11 +76,6 @@
   z-index: 2;
   position: absolute; }
 
-.c-select--container.has-search .c-select--dropdown {
-  min-height: 150px; }
-.c-select--container.has-search .c-select--options {
-  margin-top: 80px; }
-
 .c-select--options {
   overflow-y: auto;
   max-height: 200px; }

data/vendor/assets/stylesheets/vhx-quartz.tag.css

@@ -1,3 +1,5 @@
+.c-tag.is-hover, .c-tag:hover {
+  z-index: 2; }
 .c-tag .c-tag--button {
   z-index: 1; }
 .c-tag .icon-x-white {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vhx-quartz
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Scott Robertson, Courtney Burton, Steven Bone, David Gonzalez