c80_yax 0.1.0.14 → 0.1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af28ea59b7c5619dc7d3e3c28a38a309ddea0fd3
-  data.tar.gz: 830cfc563b58ca2498db2332c873c5ff4f0407f7
+  metadata.gz: 34dc65fa5a2cfeff8fdb2fab6c8302f2b686e221
+  data.tar.gz: 406a5f17ca523dd7d13b635d48cf46183753b4b6
 SHA512:
-  metadata.gz: 9097891f08bbb7e32b648441e3490d7eb6a0e911c5f59c4fba2d1730a865ede892a6953482dd4d30bd5bf0a6aff335de8e8d2b4ef21436c1d8636b25608780c5
-  data.tar.gz: 46c7d9bc9102bddaecb4d1a6ccfb9e150fe5194f9d8cf1a22a996633650da459fb486fd2906860540b935544e05b5189f231dfc9944166d3943b25ab2ae980ae
+  metadata.gz: bd626611875a14290e58c0ea059c5a939dc0733e44e212cf4436a8a26b87b443b76ad5d1d50971ff78fab59343a52511430e85e69adff1958eff9b13312d858a
+  data.tar.gz: 14095acd0a89d7a8e6a9b9d38350c86ed4ef12fa64c049b6d65f3036605932cf030c9229515fdf0368e84823c3e4b006c2b8c78e6d81e1434b860889c3bba525

data/engines/of/app/assets/javascripts/of.coffee

@@ -0,0 +1 @@
+# require_tree ./of

data/engines/ti/app/assets/javascripts/ti.coffee

@@ -1 +1 @@
-#= require_tree ./ti
+# require_tree ./ti

data/engines/ti/app/controllers/ti/application_controller.rb

@@ -5,10 +5,5 @@ module Ti
 
     helper C80LazyImages::Engine.helpers
 
-    def guru
-      respond_to do |format|
-        format.js
-      end
-    end
   end
 end

data/engines/ti/app/helpers/ti/application_helper.rb

@@ -1,96 +1,5 @@
 module Ti
   module ApplicationHelper
 
-    include LocalTimeHelper
-
-    def render_news_block(is_news_page=false, page=1, options={})
-
-      # 1. на странице НОВОСТИ выводим per_page новостей, в виджете выводим per_widget новостей
-      # 2. на странице НОВОСТИ div.news_block имеет класс is_news_page
-      # 3. к div.news_block можно дописать стиль, типа style_photostudio
-
-      per_page = Prop.first.per_widget
-      css_class_news_block = ''
-      if is_news_page
-        css_class_news_block = 'is_news_page'
-        per_page = Prop.first.per_page
-      end
-      per_block_row = Prop.first.per_widget
-
-      #
-      if options[:css_class_news_block].present?
-        css_class_news_block += " #{options[:css_class_news_block]}"
-      end
-
-      news = Fact.paginate(:page => page, :per_page => per_page)
-
-      is_render_paginator = options[:is_render_paginator].present? \
-                            ? options[:is_render_paginator] \
-                            : is_news_page
-
-      render :partial => "shared/news_block",
-             :locals => {
-                 :news_list => news,
-                 :is_news_page => is_news_page,
-                 :per_block_row => per_block_row,
-                 :partial_name => options[:partial_name],
-                 :is_render_paginator => is_render_paginator,
-                 :thumb_size => options[:thumb_size],
-                 :css_class_news_block => css_class_news_block,
-                 :h3_title => options[:h3_title]
-             }
-    end
-
-    def render_one_fact(fact, partial_name='fact', thumb_size='thumb_md', additional_css_class=nil)
-
-
-      unless thumb_size.present?
-        thumb_size = 'thumb_md'
-      end
-
-      # Rails.logger.debug "[TRACE] <render_one_fact> thumb_size: #{thumb_size}"
-
-      # свойства модуля
-      p = Prop.first
-
-      # чтобы вёрстка не прыгала - зафиксируем размер картинки
-      w = p.send("#{thumb_size}_width")
-      h = p.send("#{thumb_size}_width")
-
-      render :partial => "shared/#{partial_name}",
-             :locals => {
-                 fact: fact,
-                 css_common_width_height: "width:#{w}px;height:#{h}px",
-                 css_common_width: "width:#{w}px;",
-                 thumb_size:thumb_size,
-                 additional_css_class:additional_css_class
-             }
-    end
-
-    def url_for_fact(fact)
-      "/news/#{fact.slug}"
-    end
-
-    # метод добавлен, чтобы сократить количество символов в строке, которую надо вставить в
-    # 256-символьное структурное поле Страницы (Page) типа after_main (в админке), чтобы отрендерить новостной виджет
-    def render_news_widget(css_class_news_block='style_default',
-                           partial_name='fact_inverted',
-                           thumb_size='thumb_preview',
-                           h3_title=' '
-    )
-
-      if h3_title == ' '
-        h3_title = I18n.t('c80_news.news_widget.h3_title')
-      end
-
-      render_news_block(false, params[:page], {
-                                 :partial_name => partial_name,
-                                 :thumb_size => thumb_size,
-                                 :css_class_news_block => css_class_news_block,
-                                 :h3_title => h3_title
-                             }
-      )
-    end
-
   end
 end

data/lib/c80_yax/version.rb

@@ -1,3 +1,3 @@
 module C80Yax
-  VERSION = '0.1.0.14'
+  VERSION = '0.1.0.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: c80_yax
 version: !ruby/object:Gem::Version
-  version: 0.1.0.14
+  version: 0.1.0.15
 platform: ruby
 authors:
 - C80609A
@@ -238,8 +238,7 @@ files:
 - db/seeds/c80_yax_01_fill_props.rb
 - engines/of/README.md
 - engines/of/app/admin/ti/offers.rb
-- engines/of/app/assets/javascripts/ti.coffee
-- engines/of/app/assets/javascripts/ti/facts_ajax.js
+- engines/of/app/assets/javascripts/of.coffee
 - engines/of/app/assets/stylesheets/of.scss
 - engines/of/app/assets/stylesheets/of/offer_show.scss
 - engines/of/app/assets/stylesheets/of/offers_list.scss
@@ -281,7 +280,6 @@ files:
 - engines/ti/app/admin/ti/docs.rb
 - engines/ti/app/admin/ti/x_ti.rb
 - engines/ti/app/assets/javascripts/ti.coffee
-- engines/ti/app/assets/javascripts/ti/facts_ajax.js
 - engines/ti/app/assets/stylesheets/ti.scss
 - engines/ti/app/assets/stylesheets/ti/tech_info_list.scss
 - engines/ti/app/controllers/ti/application_controller.rb
@@ -298,7 +296,6 @@ files:
 - engines/ti/app/views/shared/_fact_inverted.html.erb
 - engines/ti/app/views/shared/_news_block.html.erb
 - engines/ti/app/views/shared/_news_list.html.erb
-- engines/ti/app/views/ti/application/guru.js.erb
 - engines/ti/bin/console
 - engines/ti/bin/setup
 - engines/ti/config/locales/ru.yml

data/engines/of/app/assets/javascripts/ti/facts_ajax.js

@@ -1,76 +0,0 @@
-"use strict";
-
-// Код, реализующий ajax функционал на странице "новости"
-
-var fNewsBindHistoryAdapter;
-var fNewsdoAjaxRequest;
-var fNewsProccessPaginateLinks;
-var fNewsStartWillPaginateAjax;
-var fNewsProcessBlocks; // при клике по preview-картинке новости будет происходить переход на просмотр новости
-
-$(function () {
-   if ($('.news_block[data-is_render_paginator="true"]').length) {
-
-       fNewsBindHistoryAdapter = function () {
-           History.Adapter.bind(window,'statechange',function(){ // Note: We are using statechange instead of popstate
-
-               // Log the State
-               var State = History.getState(); // Note: We are using History.getState() instead of event.state
-               var p;
-
-               //History.log('statechange:', State.data, State.title, State.url);
-               if (State.title == "") {
-                   p = 1;
-               } else {
-                   p = State.data.page;
-               }
-
-               fNewsdoAjaxRequest(p);
-           });
-       };
-
-       fNewsdoAjaxRequest = function (page/*integer*/,callback/*function*/) {
-
-           var $ajax_div = $('.ajax_div'); // к этому контейнеру изначально прикреплены кое-какие данные
-           
-           $.ajax({
-               url: "/news_guru",
-               type: "POST",
-               data: {
-                   page: page,
-                   is_render_paginator: $ajax_div.data('is_render_paginator'),  // эти переменные
-                   partial_name: $ajax_div.data('partial_name'),                // уходят транзитом
-                   css_class_news_block: $ajax_div.data('css_class_news_block') // на render_news_block
-               },
-               dataType: "script"
-           }).done(callback);
-       };
-
-       fNewsProccessPaginateLinks = function () {
-           //console.log("fNewsProccessPaginateLinks");
-           $(".news_block .div_will_paginate a").click(function (e) {
-               e.preventDefault();
-               var page = $(this).attr('href').split("?page=")[1];
-               History.pushState({page:page},window.document.title,"?page="+page);
-           });
-       };
-
-       fNewsStartWillPaginateAjax = function () {
-           if ($(".news_block .div_will_paginate a").length > 0) {
-               fNewsProccessPaginateLinks();
-               fNewsBindHistoryAdapter();
-           }
-       };
-
-       fNewsProcessBlocks = function() {
-           $(".fact img").click(function (e) {
-               // NB:: parent().parent() хардкод: картинка лежит в ссылке, ссылка лежит в диве
-               window.location.href = $(this).parent().parent().data('url');
-           });
-       };
-
-       fNewsStartWillPaginateAjax();
-       fNewsProcessBlocks();
-
-   }
-});

data/engines/of/app/assets/javascripts/ti.coffee

@@ -1 +0,0 @@
-#= require_tree ./ti

data/engines/ti/app/assets/javascripts/ti/facts_ajax.js

@@ -1,76 +0,0 @@
-"use strict";
-
-// Код, реализующий ajax функционал на странице "новости"
-
-var fNewsBindHistoryAdapter;
-var fNewsdoAjaxRequest;
-var fNewsProccessPaginateLinks;
-var fNewsStartWillPaginateAjax;
-var fNewsProcessBlocks; // при клике по preview-картинке новости будет происходить переход на просмотр новости
-
-$(function () {
-   if ($('.news_block[data-is_render_paginator="true"]').length) {
-
-       fNewsBindHistoryAdapter = function () {
-           History.Adapter.bind(window,'statechange',function(){ // Note: We are using statechange instead of popstate
-
-               // Log the State
-               var State = History.getState(); // Note: We are using History.getState() instead of event.state
-               var p;
-
-               //History.log('statechange:', State.data, State.title, State.url);
-               if (State.title == "") {
-                   p = 1;
-               } else {
-                   p = State.data.page;
-               }
-
-               fNewsdoAjaxRequest(p);
-           });
-       };
-
-       fNewsdoAjaxRequest = function (page/*integer*/,callback/*function*/) {
-
-           var $ajax_div = $('.ajax_div'); // к этому контейнеру изначально прикреплены кое-какие данные
-           
-           $.ajax({
-               url: "/news_guru",
-               type: "POST",
-               data: {
-                   page: page,
-                   is_render_paginator: $ajax_div.data('is_render_paginator'),  // эти переменные
-                   partial_name: $ajax_div.data('partial_name'),                // уходят транзитом
-                   css_class_news_block: $ajax_div.data('css_class_news_block') // на render_news_block
-               },
-               dataType: "script"
-           }).done(callback);
-       };
-
-       fNewsProccessPaginateLinks = function () {
-           //console.log("fNewsProccessPaginateLinks");
-           $(".news_block .div_will_paginate a").click(function (e) {
-               e.preventDefault();
-               var page = $(this).attr('href').split("?page=")[1];
-               History.pushState({page:page},window.document.title,"?page="+page);
-           });
-       };
-
-       fNewsStartWillPaginateAjax = function () {
-           if ($(".news_block .div_will_paginate a").length > 0) {
-               fNewsProccessPaginateLinks();
-               fNewsBindHistoryAdapter();
-           }
-       };
-
-       fNewsProcessBlocks = function() {
-           $(".fact img").click(function (e) {
-               // NB:: parent().parent() хардкод: картинка лежит в ссылке, ссылка лежит в диве
-               window.location.href = $(this).parent().parent().data('url');
-           });
-       };
-
-       fNewsStartWillPaginateAjax();
-       fNewsProcessBlocks();
-
-   }
-});

data/engines/ti/app/views/ti/application/guru.js.erb

@@ -1,16 +0,0 @@
-
-var html_str = "<%= j render_news_block(true,params[:page], {
-                                                                :partial_name => params[:partial_name],
-                                                                :is_render_paginator => params[:is_render_paginator],
-                                                                :css_class_news_block => params[:css_class_news_block]
-                                                            })
-%>";
-
-var $aa = $('.news_block[data-is_render_paginator="true"]');
-$aa.replaceWith(html_str);
-
-Holder.run($aa.find("img"));
-fLazyStart();
-
-fNewsProccessPaginateLinks();
-fNewsProcessBlocks();