easy_menu 0.4.7 → 0.4.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 8759a1d1562f56312050c1e8e7db83e73e9aa9d2c92dc18a3847546148c58b1e
+  data.tar.gz: c0fe823313e0b75b8264176afdffe51b216be07f5624ca5e8c62c7c2bae59682
+SHA512:
+  metadata.gz: beb596c3949a343af3507ad5534eab05f238c278ed57ff608a8c06030ccc6d202831e33b910d7e765b62b82c67b28dbf2ecae4354925ff26ad36dad76a164198
+  data.tar.gz: 7f96ac76f673c4ed0a49e3cbb4d628dd9d80cc717128f3c91e58ae0057e27598e6e2f3e8b1ebc5775c96d6bf7221bb8e9382bef650dd754578bf3a62d3b51f9b

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,30 +64,26 @@ $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%);
   background-image: linear-gradient(top, $start 0%, $end 100%);
   background-repeat: no-repeat;
 }
-@mixin button_colour($light, $dark, $text-colour: white, $text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25), $shift: 15px){
-    color: $text-colour !important; // Make this important because host app may override hover colours, but we don't want to be affected
-    text-shadow: $text-shadow;
-    @include menu-bar-item-border($dark);
+@mixin button_colour($light, $dark, $text-colour: white, $text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25)){
+  color: $text-colour !important; // Make this important because host app may override hover colours, but we don't want to be affected
+  text-shadow: $text-shadow;
+  @include menu-bar-item-border($dark);
 
-    background-color: mix($light, $dark);
+  background-color: mix($light, $dark);
 
-    // Don't override the background if the browser doesn't support gradients otherwise the buttons will be too dark
-    &:not(oldbrowser){
-      @include gradient($light, $dark);
-      background-color: $dark;
-    }
-
-    &:hover:not(:active):not(.disabled):not(.selected){
-      -moz-transition: background-position 0.1s linear;
-      -webkit-transition: background-position 0.1s linear;
-      background-position: 0 (-$shift);
-    }
+  // Don't override the background if the browser doesn't support gradients otherwise the buttons will be too dark
+  &:not(oldbrowser){
+    @include gradient($light, $dark);
+    background-color: $dark;
+  }
 }
 
 // STYLES
@@ -104,7 +100,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{
@@ -147,13 +143,16 @@ $menu-bar-item-pressed-zindex: 3;
     left: -9999px;
   }
 }
-@mixin menu_bar_item_hover{
-  &:hover{
+@mixin menu_bar_item_hover($gradient-shift: 15px) {
+  &:hover:not(.disabled):not(.selected) {
     border-color: #888; // Fallback
     border-color: rgba(0,0,0, $menu-bar-item-border-darken * 2);
     border-bottom-color: rgba(0,0,0, $menu-bar-item-border-shadow-darken * 2);
     z-index: $menu-bar-item-hover-zindex;
-    position: relative;
+
+    -moz-transition: background-position 0.1s linear;
+    -webkit-transition: background-position 0.1s linear;
+    background-position: 0 (-$gradient-shift);
   }
 }
 @mixin menu_bar_item_pressed{
@@ -167,14 +166,16 @@ $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;
   }
 }
 
 @mixin menu_bar_item_default_colour{
-  @include button_colour($menu-bar-item-light-colour, $menu-bar-item-dark-colour, $menu-bar-item-text-color, 0 1px 1px rgba(255, 255, 255, 0.75), 5px);
+  @include button_colour($menu-bar-item-light-colour, $menu-bar-item-dark-colour, $menu-bar-item-text-color, 0 1px 1px rgba(255, 255, 255, 0.75));
 }
 @mixin menu_bar_item_danger_colour{
   @include button_colour(#EE5F5B, #BD362F);

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_menu
 version: !ruby/object:Gem::Version
-  version: 0.4.7
-  prerelease: 
+  version: 0.4.12
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -34,42 +31,40 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README
 - app/assets/images/icons.png
 - app/assets/javascripts/easy_menu_jquery.js
 - app/assets/javascripts/easy_menu_prototype.js
 - app/assets/stylesheets/_easy_menu_mixins.scss
 - app/assets/stylesheets/easy_menu.css.scss
 - app/helpers/menu_bar_helper.rb
+- config/initializers/easy_menu_scss_extensions.rb
 - lib/easy_menu.rb
 - lib/easy_menu_configuration.rb
 - lib/easy_menu_helpers.rb
 - lib/menu_bar.rb
-- config/initializers/easy_menu_scss_extensions.rb
-- MIT-LICENSE
-- Gemfile
-- README
 homepage: 
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.7.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple menu bar dsl for Rails views
 test_files: []

data/Gemfile

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