vhx-quartz 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8861250eb0a0b6d96fabe1bfbbe36a4d87a09ff
-  data.tar.gz: f758fdd80b28c46fa9094910c1be47f02b69db1e
+  metadata.gz: 954d84fa066952eb4c4f79c1b3c67ad5b3993ffb
+  data.tar.gz: 83562c33164cb3d6d7777d5499a2c266966a5d83
 SHA512:
-  metadata.gz: 54257d767f4062cc2b40209b955abf579df6efa16181510afff2bec3fd8edff25dcb8820c5980316e9ad8744338ad96c1d03999f93d70b20ce87ea2964a67edf
-  data.tar.gz: 2d91ca71f010dd0b4a267cb9cf9747f061484808bef91927e29099d2b11b65353d2bc2ad2b7d6f5c03697ce8fbb2aa30ce6ebd1c62a0b0c0bc3a03c97a21367c
+  metadata.gz: 083ab461afbaf291de96631ca1840046209cbca5ef40450b04cb58ba4e726a96ab5852ac38c55602c562c615945bb3573ecddf7ab1f69799a77caa561ebd3006
+  data.tar.gz: f4d9e1c902223234ea9efe5fe68b6d50195152b73f2703a7785007ef386470f67856c6e77fed7fab47c18b09f5e9ebe64a73d72426abc7b078698f84fa7eb2a6

data/lib/vhx/quartz/version.rb

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

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

@@ -85,9 +85,6 @@ vhxm.components.shared.select.controller = function (opts) {
     }
 
     self.state.isDropdownOpen(!self.state.isDropdownOpen());
-
-    self.state.highlightIndex(-1);
-
     self.scrollOptionsList(container);
   };
 
@@ -116,11 +113,12 @@ vhxm.components.shared.select.controller = function (opts) {
 
     self.state.selected(selected);
     self.state.isDropdownOpen(self.multiselect ? true : false);
-    self.state.onSelect(self.state.selected());
-    if (!self.multiselect) {
+
+    if (self.multiselect) {
       self.state.highlightIndex(-1);
-      self.scrollOptionsList(0);
     }
+
+    self.state.onSelect(self.state.selected());
   };
 
   self.handleAction = function (event) {
@@ -146,21 +144,17 @@ vhxm.components.shared.select.controller = function (opts) {
 
   self.setHighlightedState = function (direction, container, input) {
     if (direction === 'down') {
-      self.state.highlightIndex(self.state.highlightIndex() + 1);
-      if (self.state.highlightIndex() < self.model.items().length) {
-        self.state.scrollIndex(self.state.scrollIndex() + 1);
+      if (self.state.highlightIndex() < self.model.items().length - 1) {
+        self.state.highlightIndex(self.state.highlightIndex() + 1);
       } else {
         self.state.highlightIndex(self.model.items().length - 1);
       }
     } else if (direction === 'up') {
-      self.state.highlightIndex(self.state.highlightIndex() - 1);
       if (self.state.highlightIndex() > 0) {
-        self.state.scrollIndex(self.state.scrollIndex() - 1);
-      } else if (self.state.highlightIndex() < 0) {
+        self.state.highlightIndex(self.state.highlightIndex() - 1);
+      } else if (self.state.highlightIndex() <= 0) {
         self.state.highlightIndex(-1);
         input.focus();
-      } else {
-        self.state.highlightIndex(0);
       }
     }
     self.scrollOptionsList(container);
@@ -185,10 +179,8 @@ vhxm.components.shared.select.state = function () {
   this.selected = m.prop(null);
   this.highlighted = m.prop({});
   this.isDropdownOpen = m.prop(false);
-  this.highlightIndex = m.prop(null);
-  this.scrollIndex = m.prop(0);
+  this.highlightIndex = m.prop(-1);
   this.optionHeight = m.prop(0);
-  this.optionsHeight = m.prop(0);
   this.isLoading = m.prop(false);
   this.searchInputValue = m.prop('');
   this.footerLoading = m.prop(false);
@@ -207,11 +199,12 @@ vhxm.components.shared.select.ui.container = {
   view: function view(ctrl, opts) {
     var options = opts.search ? '.has-search' : '';
     options += opts.trigger ? '.has-trigger' : '';
+    options += opts.type === 'media' ? '.has-media' : '';
     options += opts.inline ? '.inline' : '';
 
     if (opts.trigger) {
       opts.trigger.attrs.onclick = ctrl.handleClick;
-      opts.trigger.attrs.className += ' c-select--trigger';
+      opts.trigger.attrs.className = opts.trigger.attrs.className ? opts.trigger.attrs.className + ' c-select--trigger' : 'c-select--trigger';
     }
 
     return m('.c-select--container.relative.form' + options, {
@@ -268,6 +261,9 @@ vhxm.components.shared.select.ui.item_media = {
     var opts = params.opts;
 
     return m('.c-media-item--container.padding-horz-medium.padding-vert-small.clearfix' + (index === ctrl.state.highlightIndex() ? '.is-selected' : ''), {
+      config: function config(el) {
+        ctrl.state.optionHeight($(el).outerHeight());
+      },
       onmouseover: function onmouseover() {
         ctrl.state.highlightIndex(index);
       },
@@ -278,7 +274,7 @@ vhxm.components.shared.select.ui.item_media = {
       src: item[opts.prop_map.img],
       width: 70,
       height: 40
-    })]), m('.c-media-item--content.clearfix.left', [m('p.text--navy', item[opts.prop_map.label]), m('p.text--gray', item[opts.prop_map.descriptor])]), m('.c-media-item--action.clearfix.right', [m('.c-item-toggle.icon--xsmall.icon-check-navy.border' + (ctrl.state.selected() && ctrl.state.selected()[item[opts.prop_map.key]] ? '.is-selected.icon-check-navy' : '.icon-plus-thin-white'))])]);
+    })]), m('.c-media-item--content.clearfix.left', [m('p.text--navy', item[opts.prop_map.label]), m('p.text--gray', item[opts.prop_map.descriptor])]), ctrl.parent.multiselect ? m('.c-media-item--action.clearfix.right', [m('.c-item-toggle.icon--xsmall.icon-check-navy.border' + (ctrl.state.selected() && ctrl.state.selected()[item[opts.prop_map.key]] ? '.is-selected.icon-check-navy' : '.icon-plus-thin-white'))]) : '']);
   }
 };
 
@@ -292,7 +288,7 @@ vhxm.components.shared.select.ui.item_standard = {
     var ctrl = params.ctrl;
     var opts = params.opts;
 
-    return m('li.c-select--option.padding-horz-medium.padding-vert-xsmall' + (index === ctrl.state.highlightIndex() ? '.is-selected' : ''), {
+    return m('li.c-select--option.padding-horz-medium' + (index === ctrl.state.highlightIndex() ? '.is-selected' : ''), {
       config: function config(el) {
         ctrl.state.optionHeight($(el).outerHeight());
       },
@@ -330,11 +326,7 @@ vhxm.components.shared.select.ui.list.container = {
     return new vhxm.components.shared.select.ui.list.controller(opts, parent);
   },
   view: function view(ctrl, opts) {
-    return m('ul.c-select--options.margin-left-reset.loader-slate.loader--transparent' + (ctrl.state.isLoading() ? '.is-loading' : ''), {
-      config: function config(el) {
-        ctrl.state.optionsHeight($(el).outerHeight());
-      }
-    }, [ctrl.hasItems() ? ctrl.model.items().map(function (item, index) {
+    return m('ul.c-select--options.margin-left-reset.loader-slate.loader--transparent' + (ctrl.state.isLoading() ? '.is-loading' : ''), [ctrl.hasItems() ? ctrl.model.items().map(function (item, index) {
       return m.component(vhxm.components.shared.select.ui['item_' + ctrl.parent.type], {
         item: item,
         index: index,

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

@@ -71,13 +71,13 @@
   margin-top: 80px; }
 
 .c-select--options {
-  margin-top: 15px;
-  margin-bottom: 15px;
   overflow-y: auto;
-  max-height: 210px; }
+  max-height: 200px; }
 
 .c-select--option {
-  color: #233741; }
+  color: #233741;
+  line-height: 25px;
+  padding-top: 7px; }
   .c-select--option.is-selected {
     cursor: pointer;
     background-color: #F0F2F4; }

metadata

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