constructor-pages 0.2.4 → 0.2.5

data/app/assets/javascripts/ajax_pages.js

@@ -17,14 +17,12 @@ function update_pages(){
                 update_page(window.location.href.toString().split(window.location.host)[1]);
             };
 
-            update_page(_href);
+            update_page(_href, el);
         });
     });
 }
 
-function update_page(href) {
-    var _b_page_json = $('.b-page-json');
-
+function update_page(href, el) {
     close_blocks();
 
     $.get(href+'.json', function(page){
@@ -41,19 +39,14 @@ function update_page(href) {
             $('.b-page-part__'+name).html(partials[name]);
         }
 
-        _b_page_json.parent().removeClass('active');
+        $("[class*='b-page-json__id-']").removeClass('active');
 
-        for (var i in $page.ancestors) {
-            var ancestor = $page.ancestors[i];
-            $('.b-page-json__id-'+ancestor).addClass('active');
+        for (var i in $page.self_and_ancestors) {
+            $('.b-page-json__id-'+$page.self_and_ancestors[i]).addClass('active');
         }
 
-        el.parent().addClass('active');
-
         update_pages();
 
         eval(page.js);
     });
-
-    var el = $('a[href="'+ href +'"]');
 }

data/app/controllers/constructor_pages/pages_controller.rb

@@ -67,7 +67,7 @@ module ConstructorPages
           _template = render_to_string :partial => "json_templates/#{@page.template.code_name}.json.erb", :layout => false, :locals => {@page.template.code_name.to_sym => @page, :page => @page}
           _js = render_to_string :partial => "js_partials/#{@page.template.code_name}.js"
 
-          render :json => @page, :ancestors => @page.ancestors.map{|a| a.id}, :template => _template.gsub(/\n/, '\\\\n'), :js => _js
+          render :json => @page, :self_and_ancestors => @page.self_and_ancestors.map{|a| a.id}, :template => _template.gsub(/\n/, '\\\\n'), :js => _js
         }
       end
     end

data/constructor-pages.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.name              = %q{constructor-pages}
-  s.version           = '0.2.4'
+  s.version           = '0.2.5'
   s.summary           = %q{Pages for ConstructorCms}
   s.authors           = ['Ivan Zotov']
   s.require_paths     = %w(lib)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly