From 03f1a1877e81bd1f7c4893ba6fecbb54974fbdc1 Mon Sep 17 00:00:00 2001 From: pzgz Date: Wed, 21 Oct 2015 22:55:33 +0800 Subject: [PATCH] Compability with simple-navigation 4.0.0 I am not sure if it can work with simple-navigation prior 4.0.0 or not, so I simply forced the gemspec to work only with ver 4+. --- lib/simple-navigation-bootstrap/version.rb | 2 +- .../rendering/renderer/bootstrap.rb | 13 ++++++------- simple-navigation-bootstrap.gemspec | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/simple-navigation-bootstrap/version.rb b/lib/simple-navigation-bootstrap/version.rb index d493a8b..e2ab2d4 100644 --- a/lib/simple-navigation-bootstrap/version.rb +++ b/lib/simple-navigation-bootstrap/version.rb @@ -1,3 +1,3 @@ module SimpleNavigationBootstrap - VERSION = "1.0.2" + VERSION = "1.0.3" end diff --git a/lib/simple_navigation/rendering/renderer/bootstrap.rb b/lib/simple_navigation/rendering/renderer/bootstrap.rb index ef105d0..0f3bb9e 100644 --- a/lib/simple_navigation/rendering/renderer/bootstrap.rb +++ b/lib/simple_navigation/rendering/renderer/bootstrap.rb @@ -49,18 +49,17 @@ def tag_for(item, name = '', icon = nil, split = false, dropdown = false) link << content_tag(:i, '', :class => [icon].flatten.compact.join(' ')) unless icon.nil? link << name if include_sub_navigation?(item) - item_options = item.html_options - item_options[:link] = Hash.new if item_options[:link].nil? - item_options[:link][:class] = Array.new if item_options[:link][:class].nil? + item_link_html_opts = item.link_html_options || Hash.new + item_link_html_opts[:class] = Array.new if item_link_html_opts[:class].nil? unless split if dropdown - item_options[:link][:class] << 'dropdown-toggle' - item_options[:link][:'data-toggle'] = 'dropdown' - item_options[:link][:'data-target'] = '#' + item_link_html_opts[:class] << 'dropdown-toggle' + item_link_html_opts[:'data-toggle'] = 'dropdown' + item_link_html_opts[:'data-target'] = '#' end link << content_tag(:b, '', :class => 'caret') end - item.html_options = item_options + item.instance_variable_set(:'@link_html_options', item_link_html_opts) end link_to(link.join(" ").html_safe, url, options_for(item)) end diff --git a/simple-navigation-bootstrap.gemspec b/simple-navigation-bootstrap.gemspec index 535e2f2..6c43b81 100644 --- a/simple-navigation-bootstrap.gemspec +++ b/simple-navigation-bootstrap.gemspec @@ -18,6 +18,6 @@ Gem::Specification.new do |s| # specify any dependencies here; for example: s.add_development_dependency "rake" - s.add_runtime_dependency "simple-navigation", ">= 3.7.0", "< 4.0.0" + s.add_runtime_dependency "simple-navigation", ">= 4.0.0" s.add_runtime_dependency "railties", ">= 3.1" end