From ee64238bdd8933a3039cec1c60cee5ad95d0d4e9 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Fri, 20 Dec 2019 11:38:22 +0000 Subject: [PATCH] Add jquery.adaptivemenu require but commeent out the activation for now because it is already called in spree_backend This can be reverted when spree_backend is removed --- app/assets/javascripts/admin/all.js | 1 + app/assets/javascripts/admin/spree/base.js.erb | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js index a365fed313..76a286cc43 100644 --- a/app/assets/javascripts/admin/all.js +++ b/app/assets/javascripts/admin/all.js @@ -32,6 +32,7 @@ //= require admin/spree_backend //= require modernizr //= require spin +//= require jquery.adaptivemenu //= require equalize //= require css_browser_selector_dev //= require responsive-tables diff --git a/app/assets/javascripts/admin/spree/base.js.erb b/app/assets/javascripts/admin/spree/base.js.erb index d575853186..b9ba57d9ff 100644 --- a/app/assets/javascripts/admin/spree/base.js.erb +++ b/app/assets/javascripts/admin/spree/base.js.erb @@ -21,12 +21,12 @@ jQuery(function($) { if (typeof $('.field.checkbox label').vAlign === 'function' ) $('.field.checkbox label').vAlign() - if (typeof Spree !== 'undefined') { - $('.main-menu-wrapper ul').AdaptiveMenu({ - text: " " + Spree.translations.more + "", - klass: "dropdown" - }); - } + // if (typeof Spree !== 'undefined') { + // $('.main-menu-wrapper ul').AdaptiveMenu({ + // text: " " + Spree.translations.more + "", + // klass: "dropdown" + // }); + // } // Add some tips if (typeof $('.with-tip').powerTip === 'function' ) {