nfg_ui 0.10.6 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01a76c6faab975ddfc09854c5d444ed19e4b5d7be26fcda75aa2cdc51ea202b5
-  data.tar.gz: 3ac42aa0bc08ea79061855b822b0e0c0d59f6e1c0f7e977284cb1dab150f08b6
+  metadata.gz: 516ad4b3292478b87bb2261f5ca04f40a3bae1e222b329a0561838d80552c99b
+  data.tar.gz: 4827e26728cbac1d5eccfa8cd617d939f37920f623bdf5e5f3de1aee85c5a721
 SHA512:
-  metadata.gz: bbf3b10543ba1920e656cdc3ea6a88d3ba880f51977743c76f196b2302d24bc4136a5d7c8096cd72f0a6f686e58748c3f1db0e8213b9e5132048a4a7899867e5
-  data.tar.gz: f689e701c3eb39745f027ae0eb2cd1ffa4cc8762df626f4f2049c15b7f7978e4f218617d13c75b045472921ee4346203d1616bd8f1b2520458c5fc01a609975e
+  metadata.gz: 0c3604c90652de5a9bca3c86ed8c802fad95aafd9fdd9dc9387c09b0835e9ab7ccc9bc92152f04a37504764d6338addc689964dc56ca86cd5de712526f9416d5
+  data.tar.gz: 822faca199fbaeb348d56f352bd7109dbcbd2644f33ce078d7d8e17ee53eb584da5d8009fc6bfe6ab74c4b33858cdf3b2f75d7bcb35c9e73ba0e2174898fc282

data/app/assets/stylesheets/nfg_ui/network_for_good/public/plugins/_select2.scss

@@ -12,6 +12,10 @@
 body:not(.modal-open) {
   .select2-container--default { z-index: $zindex-dropdown; }
 }
+body.modal-open  {
+  .select2-container { z-index: $zindex-modal + 2 !important; } // makes select2 dropdown higher than redactor toolbar in modals
+}
+
 
 .select2-container--default {
   &.select2-container--focus .select2-selection--multiple { border-color: $primary; }

data/lib/nfg_ui/bootstrap/components/base.rb

@@ -65,8 +65,19 @@ module NfgUi
                                               # Example: <div class>Text</div>
         end
 
+        # Use view_context url_for method to ensure that
+        # when objects are passed into href, e.g.
+        # `href: @admin` will convert it to the
+        # correct path
+        #
+        # Likewise that hashes are also parsed correctly
+        # example:
+        # href: { controller: 'admin', action: 'show', id: 7 }
         def href
-          options[:href]
+          options_href = options[:href]
+
+          return if options_href.blank?
+          view_context.url_for(options_href)
         end
 
         def id

data/lib/nfg_ui/bootstrap/components/button.rb

@@ -36,7 +36,7 @@ module NfgUi
 
         def href
           return if as != :a
-          collapse ? collapse : (options[:href] || '#')
+          collapse || super || '#'
         end
 
         def remove_component_css_classes

data/lib/nfg_ui/bootstrap/components/nav_link.rb

@@ -18,10 +18,6 @@ module NfgUi
           options.fetch(:dropdown, false)
         end
 
-        def href
-          options.fetch(:href, nil)
-        end
-
         def tab
           options.fetch(:tab, nil)
         end

data/lib/nfg_ui/bootstrap/components/navbar_brand.rb

@@ -11,7 +11,7 @@ module NfgUi
         end
 
         def href
-          options.fetch(:href, '#')
+          super || '#'
         end
 
         private

data/lib/nfg_ui/bootstrap/components/page_item.rb

@@ -18,7 +18,7 @@ module NfgUi
         end
 
         def href
-          options[:href] || '#' # return # when nil
+          super || '#'
         end
 
         # Send href through to the "page link" that's embedded within

data/lib/nfg_ui/components/elements/dropdown_item.rb

@@ -47,7 +47,7 @@ module NfgUi
         # Automatically supply an :href to the dropdown item when a modal is present
         # so that the dropdown item presents correctly and appears clickable
         def href
-          modal ? options.fetch(:href, '#') : super
+          super || (modal ? '#' : nil)
         end
 
         private

data/lib/nfg_ui/components/utilities/patches/integrated_slat_action.rb

@@ -62,7 +62,7 @@ module NfgUi
           # integrated action items are still
           # correctly styled
           def href
-            options[:href] || '#'
+            super || '#'
           end
 
           # Passes in the rails confirm option to the slat action component.

data/lib/nfg_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NfgUi
-  VERSION = '0.10.6'
+  VERSION = '0.10.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nfg_ui
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors:
 - Jonathan Roehm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap