vhx-quartz 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b651ad8755db12c885b5fb1c5bdfd06139532e9
-  data.tar.gz: d0d7ee53d5ba441d49c0636f968b0fe734825d4d
+  metadata.gz: bd8d134626e3e157972ccd4dbdf6ce4372a02293
+  data.tar.gz: 2cd658af739882029af58bc4e409bee61a6e72fe
 SHA512:
-  metadata.gz: 844668c3ec231be443f07c7fc5d6b3b4327c8625fe52bf8cc41b33289d7145c1b3ad1cf587ba22e5ce78a5a4884e819921ece4b8b8aa4778416d4f727230fa36
-  data.tar.gz: 9b89f20d90a6f821f72d80e336acfaec6d32ca20654d7ffaac8b922bcda9613b42a4b9ce337111347ebc7ee1e06144d28d435a53b892233b0540c2d1d4c18bcb
+  metadata.gz: 72339bd8b460e65049435dd23b63d3542c630c6c722b6a2e236d1b8221d533f142b47e90a8f841941ef6cecfe7055a05e813fab7a3fd7f9e0dc8a3de1f33fdbe
+  data.tar.gz: 70dfb652b9e6b10cbbee169c41317a582158ccf306b8ee6f3a0a5b3bfdf1dda1bdcfee589bdb5d13e8bd2598fc45fdd8fd378a393102d1039d1d31cba0df38ea

data/lib/vhx/quartz/version.rb

@@ -1,5 +1,5 @@
 module Vhx
   module Quartz
-    VERSION = "0.8.11"
+    VERSION = "0.8.12"
   end
 end

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

@@ -12,21 +12,25 @@ vhxm.components.shared.filter.constants = Object.freeze({
 });
 vhxm.components.shared.filter.controller = function (opts) {
   var self = this;
+  var api = opts.api ? opts.api : m.prop(null);
 
   self.init = function () {
-    self.state = new vhxm.components.shared.filter.state();
-    self.model = new vhxm.components.shared.filter.model();
-
-    if (opts.api) {
-      opts.api({
-        state: self.state,
-        model: self.model,
-        applyFilter: self.applyFilter,
-        removeFilter: self.removeFilter,
-        addFilter: self.addFilter
-      });
+    if (api() && api().state) {
+      self.state = api().state;
+      self.model = api().model;
+    } else {
+      self.state = new vhxm.components.shared.filter.state();
+      self.model = new vhxm.components.shared.filter.model();
     }
 
+    api({
+      state: self.state,
+      model: self.model,
+      applyFilter: self.applyFilter,
+      removeFilter: self.removeFilter,
+      addFilter: self.addFilter
+    });
+
     if (opts.filtersStartOpen) {
       opts.filters.map(function (item) {
         var name = void 0;
@@ -164,9 +168,9 @@ vhxm.components.shared.filter.ui.container = {
   view: function view(ctrl, opts) {
     var ready_to_apply = ctrl.state.dropdown.isOpen() && ctrl.state.selected() && ctrl.state.selected().length && !opts.applyOnChange;
 
-    return m('.c-filter--container.dropdown.dropdown--' + (opts.size ? opts.size : 'large') + (ctrl.state.dropdown.isOpen() ? '.is-open' : ''), [m('div.row', [m('.c-filter--trigger-container.small-3.column.pull.padding-reset', [m('a.c-filter--trigger.block.radius.head-5.text--gray' + (ready_to_apply ? '.text-center' : '.icon--right.icon-' + (ctrl.state.dropdown.isOpen() ? 'x-navy' : 'chevron-down-gray') + '.icon--xxsmall.margin-right-medium.fill-width'), {
+    return m('.c-filter--container.dropdown.dropdown--' + (opts.size ? opts.size : 'large') + (ctrl.state.dropdown.isOpen() ? '.is-open' : ''), [m('div.row', [m('.c-filter--trigger-container.small-' + (vhxm.components.shared.size.state.smallToMedium() ? '5' : '3') + '.column.pull.padding-reset', [m('a.c-filter--trigger.block.radius.head-5.text--gray' + (ready_to_apply ? '.text-center' : '.icon--right.icon-' + (ctrl.state.dropdown.isOpen() ? 'x-navy' : 'chevron-down-gray') + '.icon--xxsmall.margin-right-medium.fill-width'), {
       onclick: ctrl.handleApplyClick
-    }, ready_to_apply ? 'Apply' : 'Filters'), m.component(vhxm.components.shared.filter.ui.dropdown, opts, ctrl)]), m('.c-filter--applied-container.small-13.column.pull.padding-reset', [m('.margin-left-small.padding-left-medium.border-left', [ctrl.state.applied() && ctrl.state.selected().length ? m.component(vhxm.components.shared.filter.ui.applied, opts, ctrl) : m('span.c-filter--label.text--gray', opts.label ? opts.label : m.trust(' '))])])])]);
+    }, ready_to_apply ? 'Apply' : 'Filters'), m.component(vhxm.components.shared.filter.ui.dropdown, opts, ctrl)]), m('.c-filter--applied-container.small-' + (vhxm.components.shared.size.state.smallToMedium() ? '11' : '13') + '.column.pull.padding-reset', [m('.margin-left-small.padding-left-medium.border-left', [ctrl.state.applied() && ctrl.state.selected().length ? m.component(vhxm.components.shared.filter.ui.applied, opts, ctrl) : m('span.c-filter--label.text--gray', opts.label ? opts.label : m.trust(' '))])])])]);
   }
 };
 

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

@@ -14,10 +14,10 @@ vhxm.components.shared.sidebar.controller = function (opts) {
       vhxm.components.shared.sidebar.setTemplate(opts.template);
     }
     if (opts.onOpen) {
-      vhxm.components.shared.sidebar.state.onOpen(opts.onOpen);
+      vhxm.components.shared.sidebar.state.onOpen = opts.onOpen;
     }
     if (opts.onClose) {
-      vhxm.components.shared.sidebar.state.onClose(opts.onClose);
+      vhxm.components.shared.sidebar.state.onClose = opts.onClose;
     }
   }
 
@@ -82,8 +82,8 @@ vhxm.components.shared.sidebar.state = {
   isLoaded: m.prop(false),
   skipTransition: m.prop(false),
   template: m.prop(null),
-  onClose: m.prop(function () {}),
-  onOpen: m.prop(function () {})
+  onClose: function onClose() {},
+  onOpen: function onOpen() {}
 };
 
 vhxm.components.shared.sidebar.ui.container = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vhx-quartz
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - Scott Robertson, Courtney Burton, Steven Bone, David Gonzalez
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: VHX Styleguide - Quartz