easy_menu 0.4.6 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5ab5af8a5c2025b34e45706804f14bc1491c70e0
-  data.tar.gz: 4f090a2e0b784be7622b7944cf61c9e0b352fa3d
+SHA256:
+  metadata.gz: 67066f55569707ecc2b7bedec38a59e9e1ea638b0d91418ee321c12ddfa6809d
+  data.tar.gz: 852d321575f54dc6ce8fa566685fcd4f5beff1a925d15c2b25ba203ef8bdb0c3
 SHA512:
-  metadata.gz: ad02588e586a6e13dbb820270cf6087e5c3890bc3cac9e147e9115c4e1f3e6aa0bf21cf49b018c2097307aae1fd7dfc882cc0cf725aa6a3200a3932d34f7b412
-  data.tar.gz: ee776677c8ed61894ec0f1fc9d945d3ef4318df27a4036bd8f01a51bca3c0a7147140850782030d8401f7e1336427bb639406604dc126c30fb7727cc0501c58f
+  metadata.gz: 9b1f37db3f5419795b2389b1de05d8ca93cfb582a61c5cb646bf5845f61b321c1502babb42b36c6b41e477ddedaeeff27078b90bbc493e3569b6ecbc6aead7aa
+  data.tar.gz: 4e4651a676c1a447359ce411f58ebe47f6218f0329ee9abe2121509fef8b369737b8bb62eddd33f6b0ff311ae74ae729fa5f423906b1a78296fff0b4839b65ff

data/app/assets/javascripts/easy_menu_jquery.js

@@ -22,7 +22,7 @@ $(document).ready(function() {
         $(this).addClass('submitting');
     });
 
-    // Allow users to open an close menus by clicking
+    // Allow users to open and close menus by clicking
     $(menuBarRootSelector + '.menu_bar_content.with_menu').removeClass('no_js');
     $(menuBarRootSelector + '.menu_bar_content.with_menu .menu_bar_item').click(function(){
         var mbc = $(this).closest('.menu_bar_content');
@@ -31,9 +31,14 @@ $(document).ready(function() {
           .find('.menu').trigger('opened')
     });
 
-    // Close the menu if the user clicked outside
-    $(document).click(function(event){
-        if ($(event.target).closest('.menu_bar_content.with_menu .menu_bar_item').length > 0) { return } // Don't close the menus if the click came from a menu
+    // Close the menu when the user clicks or there is a form submission
+    $(document).on('click submit', function(event) {
+        // Don't close the menu if the click was on a menu_bar_item. This case is handled by the previous event handler
+        if ($(event.target).closest('.menu_bar_content.with_menu .menu_bar_item').length > 0) { return }
+
+        // Don't close if we clicked inside a menu but not on a menu_item
+        if ($(event.target).closest('.menu').length > 0 && $(event.target).closest('.menu_item').length === 0) { return }
+
         $(menuBarRootSelector + '.menu_bar_content.with_menu.open')
           .removeClass('open')
           .find('.menu').trigger('closed')

data/app/assets/stylesheets/_easy_menu_mixins.scss

@@ -56,7 +56,7 @@ $menu-bar-item-pressed-zindex: 3;
 
 }
 @mixin gradient($start, $end){
-  // IE 9+
+  // IE 9
   background-image: data_url('image/svg+xml', '<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none">
     <linearGradient id="grad-ucgg-generated" gradientUnits="userSpaceOnUse" x1="0%" y1="0%" x2="0%" y2="100%">
       <stop offset="0%" stop-color="#{$start}" stop-opacity="1"/>
@@ -64,6 +64,8 @@ $menu-bar-item-pressed-zindex: 3;
     </linearGradient>
     <rect x="0" y="0" width="1" height="1" fill="url(#grad-ucgg-generated)" />
   </svg>');
+  // IE 10+
+  background-image: -ms-linear-gradient(top, $start 0%, $end 100%);
 
   background-image: -moz-linear-gradient(top, $start 0%, $end 100%);
   background-image: -webkit-linear-gradient(top, $start 0%, $end 100%);
@@ -104,7 +106,7 @@ $menu-bar-item-pressed-zindex: 3;
   &.warning{ @include menu_bar_item_warning_colour }
   &.inverse{ @include menu_bar_item_inverse_colour }
 
-  @include menu_bar_item_disabled;
+  &.disabled { @include menu_bar_item_disabled }
 }
 
 @mixin menu_bar_item_base{
@@ -167,9 +169,11 @@ $menu-bar-item-pressed-zindex: 3;
 }
 
 @mixin menu_bar_item_disabled{
-  &.disabled{
-    @include button_colour(#fefefe, #dddede, $menu-bar-item-disabled-text-color, 0 1px 1px rgba(255, 255, 255, 0.75));
-    cursor: default;
+  @include button_colour(#fefefe, #dddede, $menu-bar-item-disabled-text-color, 0 1px 1px rgba(255, 255, 255, 0.75));
+  cursor: default;
+  
+  &:active{
+    box-shadow: none;
   }
 }
 

data/lib/menu_bar.rb

@@ -32,7 +32,7 @@ class MenuBar
 
     yield mbg if block_given?
 
-    store_menu_bar_content(mbc)
+    store_menu_bar_content(mbc, options)
     @groups << mbg
 
     return mbg
@@ -48,7 +48,7 @@ class MenuBar
 
     mbc = MenuBarContent.new(config, content, options)
 
-    store_menu_bar_content(mbc)
+    store_menu_bar_content(mbc, options)
 
     return mbc
   end
@@ -61,7 +61,7 @@ class MenuBar
     mbi = MenuBarItem.new config, content, options
     mbc = MenuBarContent.new(config, mbi, options[:menu_bar_content])
 
-    store_menu_bar_content(mbc)
+    store_menu_bar_content(mbc, options)
 
     return mbi
   end
@@ -73,7 +73,7 @@ class MenuBar
     mbi = MenuBarItem.new config, mbin, options[:menu_bar_item]
     mbc = MenuBarContent.new(config, mbi, options[:menu_bar_content])
 
-    store_menu_bar_content(mbc)
+    store_menu_bar_content(mbc, options)
 
     return mbi
   end
@@ -91,7 +91,7 @@ class MenuBar
     # We give the menu bar content a special class so we can treat its contents differently than one without a menu inside
     mbc = MenuBarContent.new(config, mbt, merge_class(options[:menu_bar_content], config[:menu_bar_content_with_menu_class]))
 
-    store_menu_bar_content(mbc)
+    store_menu_bar_content(mbc, options)
 
     return m
   end
@@ -100,7 +100,7 @@ class MenuBar
     s = @template.content_tag :div, '', :class => config[:menu_bar_separator_class]
     mbc = MenuBarContent.new(config, s, options.reverse_merge(:remove_if_dangling => @options[:remove_dangling_separators]))
 
-    store_menu_bar_content(mbc)
+    store_menu_bar_content(mbc, options)
 
     return s
   end
@@ -140,9 +140,11 @@ class MenuBar
     return html_opts
   end
 
-  # Ensure that right aligned menu bar content appears on the page in the order it is inserted
-  def store_menu_bar_content(mbc)
-    if mbc.right_aligned?
+  def store_menu_bar_content(mbc, options = {})
+    if options[:index]
+      @content.insert(options[:index], mbc)
+    # Ensure that right aligned menu bar content appears on the page in the order it is inserted
+    elsif mbc.right_aligned?
       @content.prepend(mbc)
     else
       @content << mbc
@@ -164,7 +166,7 @@ class MenuBar
     end
 
     def empty?
-      @content.join.blank?
+      @content.all?(&:blank?)
     end
 
     def to_s
@@ -291,7 +293,9 @@ class MenuBar
 
       yield mg if block_given?
 
-      @content << MenuContent.new(config, [mgt, mg], options[:menu_content])
+      mc = MenuContent.new(config, [mgt, mg], options[:menu_content])
+
+      store_menu_content(mc, options)
 
       return mg
     end
@@ -304,21 +308,27 @@ class MenuBar
         content = block.call
       end
 
-      @content << MenuContent.new(config, content, options)
+      mc = MenuContent.new(config, content, options)
+
+      store_menu_content(mc, options)
     end
 
     def menu_item(content, options = {})
       initialize_options(options)
 
       mi = MenuItem.new(config, content, options)
-      @content << MenuContent.new(config, mi, options[:menu_content])
+      mc = MenuContent.new(config, mi, options[:menu_content])
+
+      store_menu_content(mc, options)
 
       return mi
     end
 
-    def separator
+    def separator(options = {})
       s = @template.content_tag :div, '', :class => config[:menu_separator_class]
-      @content << MenuContent.new(config, s)
+      mc = MenuContent.new(config, s)
+
+      store_menu_content(mc, options)
 
       return s
     end
@@ -332,6 +342,14 @@ class MenuBar
 
       return options
     end
+
+    def store_menu_content(mc, options = {})
+      if options[:index]
+        @content.insert(options[:index], mc)
+      else
+        @content << mc
+      end
+    end
   end
 
   class MenuGroup < Menu

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_menu
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.11
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,7 +31,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
 - MIT-LICENSE
 - README
 - app/assets/images/icons.png
@@ -64,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Simple menu bar dsl for Rails views

data/Gemfile

@@ -1,2 +0,0 @@
-source "http://rubygems.org"
-gem "rails", "~> 3.1.0"