radiant-navigation_tags-extension 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/navigation_tags.rb

@@ -24,7 +24,7 @@ module NavigationTags
   tag "nav" do |tag|
     if tag.double?
       root = Page.find_by_path(tag.expand)
-    elsif defined?(Globalize2Extension) && Globalize2Extension.locales.size > 1
+    elsif defined?(Globalize2Extension) && Globalize2Extension.locales.size <= 1
       root = Page.find_by_path(root_url = tag.attr.delete('root') || "/#{I18n.locale}")
     else
       root = Page.find_by_path(root_url = tag.attr.delete('root') || "/")
@@ -77,21 +77,21 @@ module NavigationTags
   tag "sub-nav" do |tag|
     current_page = tag.locals.page
     child_page = tag.attr[:page]
-    @depth ||= tag.attr.delete(:depth)
+    depth = tag.attr.delete(:depth)
     @first_set ||= tag.attr.delete(:first_set)
-    return if @depth < 0 or child_page.virtual? or !child_page.published? or child_page.class_name.eql? "FileNotFoundPage" or child_page.part("no-map")
+    return if depth.to_i < 0 or child_page.virtual? or !child_page.published? or child_page.class_name.eql? "FileNotFoundPage" or child_page.part("no-map")
     
     r = %{<li#{li_attrs_for_current_page_vs_navigation_item(current_page, child_page)}>
       #{link_for_page(child_page)}\n}
       # mind the open li
     rr = ""
     if child_page.children.size > 0 and 
-        @depth.to_i > 0 and
+        depth.to_i > 0 and
         child_page.class_name != 'ArchivePage' and
         (@expand_all || current_page.url.starts_with?(child_page.url) )
       @first_set = false
       child_page.children.each do |child|
-        rr << tag.render('sub-nav', :page => child, :depth => @depth.to_i - 1, :first_set => @first_set ) unless child.part("no-map") || !child.published?
+        rr << tag.render('sub-nav', :page => child, :depth => depth.to_i - 1, :first_set => @first_set ) unless child.part("no-map") || !child.published?
       end
       
       r << "<ul>\n" + rr + "</ul>\n" unless rr.empty?

data/navigation_tags_extension.rb

@@ -1,5 +1,5 @@
 class NavigationTagsExtension < Radiant::Extension
-  version "2.1"
+  version "2.2"
   description "Makes building navigations much easier."
   url "https://github.com/jomz/navigation_tags"
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-navigation_tags-extension
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Benny Degezelle
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +02:00
+date: 2011-04-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency