c80_yax 0.1.0.22 → 0.1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0695658ffca19bf340b75e7fbd1512599d08a0c
-  data.tar.gz: f991a7bb6f7c53125d7dd9b1ba6d68b9dd44253a
+  metadata.gz: 4e01e75c062c8b3f52d68ac18851b78f54a0851e
+  data.tar.gz: b287e2b15f3bb793e837e0bdea42e0eb1882e4bb
 SHA512:
-  metadata.gz: 6af24abd9829d3d98820f4f2cec30aa16f8d265802e2784a1b37c03538c81df793dabe02b63657f545f0d7a295696ae8276fcb2ea11673e658b3a5affbc53dbe
-  data.tar.gz: 3c14ec8803324d9d59a0619d398ee23a8d2031479ed0edbc3476fda1907f4a452e83bec057c9dcd89b3704e6f835ccfcbfd696f181cd7e126ceb052e600c40d7
+  metadata.gz: d5df25892e20e93d59d35ad393fb0468029db94953926595717d13b95405c547532861560baaadb58d17e0df0255e013f73c88e8bccd81d50bd31aecd7f99919
+  data.tar.gz: ff6154bbef0c1f947a3bea147111ce25e12ad11a7a4cfb2c0f241b5454a5ecf8d8d5bb0c27c9d64fd2e20e2d3c3594a7029c6d98794c5015aba2f32614e51249

data/app/assets/javascripts/c80_yax.js.coffee

@@ -1,2 +1,3 @@
 #= require_tree ./c80_yax/frontend
-#= require co
+#= require co
+#= require ti

data/app/models/c80_yax/item.rb

@@ -49,6 +49,12 @@ class C80Yax::Item < ActiveRecord::Base
                           join_table: 'of_items_offers',
                           association_foreign_key: 'item_id'
 
+  has_and_belongs_to_many :offers,
+                          class_name: 'Ti::Doc',
+                          foreign_key: 'doc_id',
+                          join_table: 'ti_docs_items',
+                          association_foreign_key: 'item_id'
+
   extend FriendlyId
   friendly_id :slug_candidates, :use => :slugged
 

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

@@ -1 +1,2 @@
+#= require_tree ./lib
 #= require_tree ./co

data/engines/co/app/assets/javascripts/lib/masked_input/jquery.maskedinput.js

@@ -0,0 +1,453 @@
+(function (factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(['jquery'], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS
+        factory(require('jquery'));
+    } else {
+        // Browser globals
+        factory(jQuery);
+    }
+}(function ($) {
+
+    var ua = navigator.userAgent,
+        iPhone = /iphone/i.test(ua),
+        chrome = /chrome/i.test(ua),
+        android = /android/i.test(ua),
+        caretTimeoutId;
+
+    $.mask = {
+        //Predefined character definitions
+        definitions: {
+            '9': "[0-9]",
+            'a': "[A-Za-z]",
+            '*': "[A-Za-z0-9]"
+        },
+        autoclear: true,
+        dataName: "rawMaskFn",
+        placeholder: '_'
+    };
+
+    $.fn.extend({
+        //Helper Function for Caret positioning
+        caret: function(begin, end) {
+            var range;
+
+            if (this.length === 0 || this.is(":hidden") || this.get(0) !== document.activeElement) {
+                return;
+            }
+
+            if (typeof begin == 'number') {
+                end = (typeof end === 'number') ? end : begin;
+                return this.each(function() {
+                    if (this.setSelectionRange) {
+                        this.setSelectionRange(begin, end);
+                    } else if (this.createTextRange) {
+                        range = this.createTextRange();
+                        range.collapse(true);
+                        range.moveEnd('character', end);
+                        range.moveStart('character', begin);
+                        range.select();
+                    }
+                });
+            } else {
+                if (this[0].setSelectionRange) {
+                    begin = this[0].selectionStart;
+                    end = this[0].selectionEnd;
+                } else if (document.selection && document.selection.createRange) {
+                    range = document.selection.createRange();
+                    begin = 0 - range.duplicate().moveStart('character', -100000);
+                    end = begin + range.text.length;
+                }
+                return { begin: begin, end: end };
+            }
+        },
+        unmask: function() {
+            return this.trigger("unmask");
+        },
+        mask: function(mask, settings) {
+            var input,
+                defs,
+                tests,
+                partialPosition,
+                firstNonMaskPos,
+                lastRequiredNonMaskPos,
+                len,
+                oldVal;
+
+            if (!mask && this.length > 0) {
+                input = $(this[0]);
+                var fn = input.data($.mask.dataName)
+                return fn?fn():undefined;
+            }
+
+            settings = $.extend({
+                autoclear: $.mask.autoclear,
+                placeholder: $.mask.placeholder, // Load default placeholder
+                completed: null
+            }, settings);
+
+
+            defs = $.mask.definitions;
+            tests = [];
+            partialPosition = len = mask.length;
+            firstNonMaskPos = null;
+
+            mask = String(mask);
+
+            $.each(mask.split(""), function(i, c) {
+                if (c == '?') {
+                    len--;
+                    partialPosition = i;
+                } else if (defs[c]) {
+                    tests.push(new RegExp(defs[c]));
+                    if (firstNonMaskPos === null) {
+                        firstNonMaskPos = tests.length - 1;
+                    }
+                    if(i < partialPosition){
+                        lastRequiredNonMaskPos = tests.length - 1;
+                    }
+                } else {
+                    tests.push(null);
+                }
+            });
+
+            return this.trigger("unmask").each(function() {
+                var input = $(this),
+                    buffer = $.map(
+                        mask.split(""),
+                        function(c, i) {
+                            if (c != '?') {
+                                return defs[c] ? getPlaceholder(i) : c;
+                            }
+                        }),
+                    defaultBuffer = buffer.join(''),
+                    focusText = input.val();
+
+                function tryFireCompleted(){
+                    if (!settings.completed) {
+                        return;
+                    }
+
+                    for (var i = firstNonMaskPos; i <= lastRequiredNonMaskPos; i++) {
+                        if (tests[i] && buffer[i] === getPlaceholder(i)) {
+                            return;
+                        }
+                    }
+                    settings.completed.call(input);
+                }
+
+                function getPlaceholder(i){
+                    if(i < settings.placeholder.length)
+                        return settings.placeholder.charAt(i);
+                    return settings.placeholder.charAt(0);
+                }
+
+                function seekNext(pos) {
+                    while (++pos < len && !tests[pos]);
+                    return pos;
+                }
+
+                function seekPrev(pos) {
+                    while (--pos >= 0 && !tests[pos]);
+                    return pos;
+                }
+
+                function shiftL(begin,end) {
+                    var i,
+                        j;
+
+                    if (begin<0) {
+                        return;
+                    }
+
+                    for (i = begin, j = seekNext(end); i < len; i++) {
+                        if (tests[i]) {
+                            if (j < len && tests[i].test(buffer[j])) {
+                                buffer[i] = buffer[j];
+                                buffer[j] = getPlaceholder(j);
+                            } else {
+                                break;
+                            }
+
+                            j = seekNext(j);
+                        }
+                    }
+                    writeBuffer();
+                    input.caret(Math.max(firstNonMaskPos, begin));
+                }
+
+                function shiftR(pos) {
+                    var i,
+                        c,
+                        j,
+                        t;
+
+                    for (i = pos, c = getPlaceholder(pos); i < len; i++) {
+                        if (tests[i]) {
+                            j = seekNext(i);
+                            t = buffer[i];
+                            buffer[i] = c;
+                            if (j < len && tests[j].test(t)) {
+                                c = t;
+                            } else {
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                function androidInputEvent(e) {
+                    var curVal = input.val();
+                    var pos = input.caret();
+
+                    var proxy = function () {
+                        $.proxy($.fn.caret, input, pos.begin, pos.begin)();
+                    };
+
+                    if (oldVal && oldVal.length && oldVal.length > curVal.length ) {
+                        // a deletion or backspace happened
+                        checkVal(true);
+                        while (pos.begin > 0 && !tests[pos.begin-1])
+                            pos.begin--;
+                        if (pos.begin === 0)
+                        {
+                            while (pos.begin < firstNonMaskPos && !tests[pos.begin])
+                                pos.begin++;
+                        }
+                        setTimeout(proxy, 0);
+                    } else {
+                        var pos2 = checkVal(true);
+                        var lastEnteredValue = curVal.charAt(pos.begin);
+                        if (pos.begin < len){
+                            if(!tests[pos.begin]){
+                                pos.begin++;
+                                if(tests[pos.begin].test(lastEnteredValue)){
+                                    pos.begin++;
+                                }
+                            }else{
+                                if(tests[pos.begin].test(lastEnteredValue)){
+                                    pos.begin++;
+                                }
+                            }
+                        }
+                        setTimeout(proxy, 0);
+                    }
+                    tryFireCompleted();
+                }
+
+
+                function blurEvent(e) {
+                    checkVal();
+
+                    if (input.val() != focusText)
+                        input.change();
+                }
+
+                function keydownEvent(e) {
+                    if (input.prop("readonly")){
+                        return;
+                    }
+
+                    var k = e.which || e.keyCode,
+                        pos,
+                        begin,
+                        end;
+                    oldVal = input.val();
+                    //backspace, delete, and escape get special treatment
+                    if (k === 8 || k === 46 || (iPhone && k === 127)) {
+                        pos = input.caret();
+                        begin = pos.begin;
+                        end = pos.end;
+
+                        if (end - begin === 0) {
+                            begin=k!==46?seekPrev(begin):(end=seekNext(begin-1));
+                            end=k===46?seekNext(end):end;
+                        }
+                        clearBuffer(begin, end);
+                        shiftL(begin, end - 1);
+
+                        e.preventDefault();
+                    } else if( k === 13 ) { // enter
+                        blurEvent.call(this, e);
+                    } else if (k === 27) { // escape
+                        input.val(focusText);
+                        input.caret(0, checkVal());
+                        e.preventDefault();
+                    }
+                }
+
+                function keypressEvent(e) {
+                    if (input.prop("readonly")){
+                        return;
+                    }
+
+                    var k = e.which || e.keyCode,
+                        pos = input.caret(),
+                        p,
+                        c,
+                        next;
+
+                    if (e.ctrlKey || e.altKey || e.metaKey || k < 32) {//Ignore
+                        return;
+                    } else if ( k && k !== 13 ) {
+                        if (pos.end - pos.begin !== 0){
+                            clearBuffer(pos.begin, pos.end);
+                            shiftL(pos.begin, pos.end-1);
+                        }
+
+                        p = seekNext(pos.begin - 1);
+                        if (p < len) {
+                            c = String.fromCharCode(k);
+                            if (tests[p].test(c)) {
+                                shiftR(p);
+
+                                buffer[p] = c;
+                                writeBuffer();
+                                next = seekNext(p);
+
+                                if(android){
+                                    //Path for CSP Violation on FireFox OS 1.1
+                                    var proxy = function() {
+                                        $.proxy($.fn.caret,input,next)();
+                                    };
+
+                                    setTimeout(proxy,0);
+                                }else{
+                                    input.caret(next);
+                                }
+                                if(pos.begin <= lastRequiredNonMaskPos){
+                                    tryFireCompleted();
+                                }
+                            }
+                        }
+                        e.preventDefault();
+                    }
+                }
+
+                function clearBuffer(start, end) {
+                    var i;
+                    for (i = start; i < end && i < len; i++) {
+                        if (tests[i]) {
+                            buffer[i] = getPlaceholder(i);
+                        }
+                    }
+                }
+
+                function writeBuffer() { input.val(buffer.join('')); }
+
+                function checkVal(allow) {
+                    //try to place characters where they belong
+                    var test = input.val(),
+                        lastMatch = -1,
+                        i,
+                        c,
+                        pos;
+
+                    for (i = 0, pos = 0; i < len; i++) {
+                        if (tests[i]) {
+                            buffer[i] = getPlaceholder(i);
+                            while (pos++ < test.length) {
+                                c = test.charAt(pos - 1);
+                                if (tests[i].test(c)) {
+                                    buffer[i] = c;
+                                    lastMatch = i;
+                                    break;
+                                }
+                            }
+                            if (pos > test.length) {
+                                clearBuffer(i + 1, len);
+                                break;
+                            }
+                        } else {
+                            if (buffer[i] === test.charAt(pos)) {
+                                pos++;
+                            }
+                            if( i < partialPosition){
+                                lastMatch = i;
+                            }
+                        }
+                    }
+                    if (allow) {
+                        writeBuffer();
+                    } else if (lastMatch + 1 < partialPosition) {
+                        if (settings.autoclear || buffer.join('') === defaultBuffer) {
+                            // Invalid value. Remove it and replace it with the
+                            // mask, which is the default behavior.
+                            if(input.val()) input.val("");
+                            clearBuffer(0, len);
+                        } else {
+                            // Invalid value, but we opt to show the value to the
+                            // user and allow them to correct their mistake.
+                            writeBuffer();
+                        }
+                    } else {
+                        writeBuffer();
+                        input.val(input.val().substring(0, lastMatch + 1));
+                    }
+                    return (partialPosition ? i : firstNonMaskPos);
+                }
+
+                input.data($.mask.dataName,function(){
+                    return $.map(buffer, function(c, i) {
+                        return tests[i]&&c!=getPlaceholder(i) ? c : null;
+                    }).join('');
+                });
+
+
+                input
+                    .one("unmask", function() {
+                        input
+                            .off(".mask")
+                            .removeData($.mask.dataName);
+                    })
+                    .on("focus.mask", function() {
+                        if (input.prop("readonly")){
+                            return;
+                        }
+
+                        clearTimeout(caretTimeoutId);
+                        var pos;
+
+                        focusText = input.val();
+
+                        pos = checkVal();
+
+                        caretTimeoutId = setTimeout(function(){
+                            if(input.get(0) !== document.activeElement){
+                                return;
+                            }
+                            writeBuffer();
+                            if (pos == mask.replace("?","").length) {
+                                input.caret(0, pos);
+                            } else {
+                                input.caret(pos);
+                            }
+                        }, 10);
+                    })
+                    .on("blur.mask", blurEvent)
+                    .on("keydown.mask", keydownEvent)
+                    .on("keypress.mask", keypressEvent)
+                    .on("input.mask paste.mask", function() {
+                        if (input.prop("readonly")){
+                            return;
+                        }
+
+                        setTimeout(function() {
+                            var pos=checkVal(true);
+                            input.caret(pos);
+                            tryFireCompleted();
+                        }, 0);
+                    });
+                if (chrome && android)
+                {
+                    input
+                        .off('input.mask')
+                        .on('input.mask', androidInputEvent);
+                }
+                checkVal(); //Perform initial check for existing values
+            });
+        }
+    });
+}));

data/engines/co/app/views/co/cart/give_me_cart_order_form.js.erb

@@ -13,6 +13,8 @@ setTimeout(function () {
 
         aCartPage.print_table_to_comment();
 
+        $cc.find('input#mess_phone').mask('+9(999)999-99-99');
+
     },500);
 },1000);
 

data/engines/ti/app/admin/ti/docs.rb

@@ -1,4 +1,4 @@
-ActiveAdmin.register Ti::Doc, :as => 'Docs' do
+ActiveAdmin.register Ti::Doc, :as => 'Doc' do
 
   before_filter :skip_sidebar!, :only => :index
 
@@ -9,6 +9,7 @@ ActiveAdmin.register Ti::Doc, :as => 'Docs' do
   permit_params :title,
                 :full,
                 :category_ids => [],
+                :item_ids => [],
                 :dphotos_attributes => [:id,:image,:_destroy]
 
   index do
@@ -60,6 +61,19 @@ ActiveAdmin.register Ti::Doc, :as => 'Docs' do
         end
       end
 
+      f.input :items,
+              :as => :select,
+              :input_html => {
+                  :title => '',
+                  :class => 'selectpicker',
+                  :data => {
+                      :size => 10,
+                      :width => '700px'
+                  },
+                  :multiple => true
+              },
+              :include_blank => true
+
       f.input :full, :as => :ckeditor,
               :input_html => {:style => 'height:500px', rows: 20}
 

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

@@ -0,0 +1,22 @@
+var activate_collapsed_ti = function () {
+    $(document).ready(function () {
+        $('.tech_info_list h3').bind('click', function (e) {
+
+            // на тот случай, если внутрь легенды положена ссылка "например" и кликнули по этой ссылке
+            if ($(e.target).attr('href') !== undefined) return;
+
+            var $li_parent = $(this).parent();
+            var $ul_docs = $li_parent.find('ul.docs');
+
+            if ($ul_docs.css('display') === 'none') {
+                $ul_docs.css('display', 'block');
+                $li_parent.addClass('shown');
+            } else {
+                $ul_docs.css('display', 'none');
+                $li_parent.removeClass('shown');
+            }
+
+        });
+    });
+};
+activate_collapsed_ti();

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

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

data/engines/ti/app/assets/stylesheets/ti/_collapsed.scss

@@ -0,0 +1,50 @@
+%collapsed {
+  ul.docs_of_cats {
+    margin: 0 0 40px 0 !important;
+
+    > li {
+
+      h3 {
+        cursor: pointer;
+        padding-left: 29px !important;
+
+        position: relative;
+        &:after {
+          position: absolute;
+          top: 17px;
+          left: 10px;
+          color: rgba(255,255,255,0.9) !important;
+          text-transform: uppercase;
+          font-size: 12px;
+          font-family: FontAwesome;
+          font-style: normal;
+          font-weight: normal;
+          content: '\f138';
+        }
+
+      }
+
+      ul.docs {
+        display: none;
+      }
+
+      &.shown {
+        h3 {
+          &:after {
+            content: '\f13a';
+          }
+        }
+      }
+
+      &:hover {
+        h3 {
+          &:after {
+            color: rgba(255,255,255,0.99) !important;
+          }
+        }
+      }
+
+    }
+
+  }
+}

data/engines/ti/app/assets/stylesheets/ti/tech_info_list.scss

@@ -2,6 +2,7 @@ ul.tech_info_list {
   margin: 0;
   padding: 0;
   list-style: none;
+  @extend %collapsed;
 
   h2 {
     text-transform: uppercase;

data/engines/ti/app/models/ti/doc.rb

@@ -10,6 +10,12 @@ module Ti
                                   },
                                   :allow_destroy => true
     has_and_belongs_to_many :categories
+    has_and_belongs_to_many :items,
+                            class_name: 'C80Yax::Item',
+                            foreign_key: 'item_id',
+                            join_table: 'ti_docs_items',
+                            association_foreign_key: 'doc_id'
+
     validates_with DocValidator
     default_scope {order(:created_at => :desc)}
 

data/engines/ti/db/migrate/20170728044343_create_ti_join_table_docs_items.rb

@@ -0,0 +1,17 @@
+class CreateTiJoinTableDocsItems < ActiveRecord::Migration
+  def self.up
+    create_table :ti_docs_items, id: false do |t|
+      t.integer :doc_id
+      t.integer :item_id
+    end
+
+    add_index(:ti_docs_items, [:doc_id, :item_id], :unique => true)
+    add_index(:ti_docs_items, [:item_id, :doc_id], :unique => true)
+  end
+
+  def self.down
+    remove_index(:ti_docs_items, [:item_id, :doc_id])
+    remove_index(:ti_docs_items, [:doc_id, :item_id])
+    drop_table :ti_docs_items
+  end
+end

data/lib/c80_yax/version.rb

@@ -1,3 +1,3 @@
 module C80Yax
-  VERSION = '0.1.0.22'
+  VERSION = '0.1.0.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_yax
 version: !ruby/object:Gem::Version
-  version: 0.1.0.22
+  version: 0.1.0.23
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -281,6 +281,7 @@ files:
 - engines/co/app/assets/javascripts/co/cart_page/support/row_printer.js
 - engines/co/app/assets/javascripts/co/goto_cart/app.js
 - engines/co/app/assets/javascripts/co/goto_cart/button_goto_cart.js
+- engines/co/app/assets/javascripts/lib/masked_input/jquery.maskedinput.js
 - engines/co/app/assets/stylesheets/co.scss
 - engines/co/app/assets/stylesheets/co/cart_page/_cart_button.scss
 - engines/co/app/assets/stylesheets/co/cart_page/bottom_row.scss
@@ -349,7 +350,9 @@ 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/tech_info_list_collapsed.js
 - engines/ti/app/assets/stylesheets/ti.scss
+- engines/ti/app/assets/stylesheets/ti/_collapsed.scss
 - engines/ti/app/assets/stylesheets/ti/tech_info_list.scss
 - engines/ti/app/controllers/ti/application_controller.rb
 - engines/ti/app/helpers/ti/application_helper.rb
@@ -376,6 +379,7 @@ files:
 - engines/ti/db/migrate/20170706083939_create_ti_join_table_categories_docs.rb
 - engines/ti/db/migrate/20170718035050_add_ti_listed_to_categories.rb
 - engines/ti/db/migrate/20170718052828_add_ti_per_widget_to_props.rb
+- engines/ti/db/migrate/20170728044343_create_ti_join_table_docs_items.rb
 - engines/ti/db/seeds/ti_02_fill_test_data.rb
 - engines/ti/lib/ti.rb
 - engines/ti/lib/ti/engine.rb