biovision-base 0.8.170916 → 0.8.171029

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cfc144ad5307b7e9d5d93dcbbb6f7d14eab5bb0
-  data.tar.gz: 386e0f6f547aaef0befb3ad99f887f87dd533263
+  metadata.gz: 5a69729da19c47e5d87fe9296e687a6deace54a0
+  data.tar.gz: 81b91f26c62b8896b165d4a46fda4c82eaf017a2
 SHA512:
-  metadata.gz: 1691ce1bf90cc9c6c36f0d6b5777ee955f80821de8bd983fb53c344300e4df20e26da20f0f997369bb6000f1ecf2833f5911babd54f594b01d516767181522af
-  data.tar.gz: 07f2394d5f168f067cb749c10b16d371971dcac15753facc76246d4d4657ffd881f21429dd30160b4805b089de7bb4abf1ca551bc01805a90549bb30a334c38d
+  metadata.gz: 329c7b70ca3974fd53e319293cf1c6d229d2f22c7af228e4794a0a313bc4d560aec40af18f1ac18986517604b7bfdc16e222597333c9cb329700de9fd23954ed
+  data.tar.gz: 0667670c98830807dbe1b0243d8e6739e523790555725c70a7e7e5dd003c45ab9000fd38730366b66b0e0a4f31b770fe3ad4e7de465c98160aa8882e8b8ed34c

data/app/assets/images/biovision/base/placeholders/image.svg

@@ -1,19 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="480px" height="480px" viewBox="-216 -216 480 480" enable-background="new -216 -216 480 480" xml:space="preserve">
-<path d="M222.262,201.391H-174.26c-23.052,0-41.74-18.689-41.74-41.738v-271.304c0-23.05,18.688-41.74,41.74-41.74h396.521
-	c23.051,0,41.738,18.689,41.738,41.74v271.304C264,182.701,245.312,201.391,222.262,201.391z M243.131-111.652
-	c0-11.521-9.355-20.87-20.869-20.87H-174.26c-11.521,0-20.87,9.349-20.87,20.87v271.304c0,11.516,9.349,20.87,20.87,20.87h396.521
-	c11.514,0,20.869-9.354,20.869-20.87V-111.652z M204.877,135.809l-66.094-66.096l-37.766,37.766l34.791,34.789
-	c3.971,3.975,3.971,10.425,0,14.41c-3.985,3.973-10.436,3.973-14.41,0L-28.172,7.105l-128.703,128.703
-	c-3.975,3.973-10.426,3.973-14.409,0c-3.98-3.985-3.98-10.436,0-14.41L-36.626-13.261c0.335-0.504,0.555-1.054,0.994-1.503
-	c2.054-2.058,4.769-2.995,7.46-2.935c2.688-0.061,5.404,0.877,7.458,2.935c0.439,0.449,0.646,0.999,0.992,1.503L86.61,93.068
-	l43.716-43.715c0.346-0.498,0.56-1.059,0.996-1.508c2.061-2.048,4.77-2.995,7.461-2.936c2.689-0.06,5.4,0.888,7.459,2.936
-	c0.438,0.449,0.652,1.01,0.998,1.508l72.045,72.045c3.975,3.975,3.975,10.425,0,14.41
-	C215.302,139.781,208.852,139.781,204.877,135.809z M76.174-28.173c-23.049,0-41.74-18.689-41.74-41.74
-	c0-23.05,18.691-41.739,41.74-41.739c23.052,0,41.74,18.689,41.74,41.739C117.914-46.862,99.226-28.173,76.174-28.173z
-	 M76.174-90.783c-11.514,0-20.87,9.351-20.87,20.87c0,11.521,9.356,20.87,20.87,20.87s20.871-9.349,20.871-20.87
-	C97.045-81.432,87.688-90.783,76.174-90.783z" fill="#aaa" />
-</svg>
+<svg version="1.1" id="Layer_1" x="0px" y="0px" width="480px" height="360px" viewBox="0 0 479.9989929199219 360" enable-background="new -216 -216 480 480" xmlns="http://www.w3.org/2000/svg">
+  <path d="M 438.262 357.391 L 41.74 357.391 C 18.688 357.391 0 338.702 0 315.653 L 0 44.349 C 0 21.299 18.688 2.609 41.74 2.609 L 438.261 2.609 C 461.312 2.609 479.999 21.298 479.999 44.349 L 479.999 315.653 C 480 338.701 461.312 357.391 438.262 357.391 Z M 459.131 44.348 C 459.131 32.827 449.776 23.478 438.262 23.478 L 41.74 23.478 C 30.219 23.478 20.87 32.827 20.87 44.348 L 20.87 315.652 C 20.87 327.168 30.219 336.522 41.74 336.522 L 438.261 336.522 C 449.775 336.522 459.13 327.168 459.13 315.652 L 459.13 44.348 Z M 420.877 291.809 L 354.783 225.713 L 317.017 263.479 L 351.808 298.268 C 355.779 302.243 355.779 308.693 351.808 312.678 C 347.823 316.651 341.372 316.651 337.398 312.678 L 187.828 163.105 L 59.125 291.808 C 55.15 295.781 48.699 295.781 44.716 291.808 C 40.736 287.823 40.736 281.372 44.716 277.398 L 179.374 142.739 C 179.709 142.235 179.929 141.685 180.368 141.236 C 182.422 139.178 185.137 138.241 187.828 138.301 C 190.516 138.24 193.232 139.178 195.286 141.236 C 195.725 141.685 195.932 142.235 196.278 142.739 L 302.61 249.068 L 346.326 205.353 C 346.672 204.855 346.886 204.294 347.322 203.845 C 349.383 201.797 352.092 200.85 354.783 200.909 C 357.472 200.849 360.183 201.797 362.242 203.845 C 362.68 204.294 362.894 204.855 363.24 205.353 L 435.285 277.398 C 439.26 281.373 439.26 287.823 435.285 291.808 C 431.302 295.781 424.852 295.781 420.877 291.809 Z M 292.174 127.827 C 269.125 127.827 250.434 109.138 250.434 86.087 C 250.434 63.037 269.125 44.348 292.174 44.348 C 315.226 44.348 333.914 63.037 333.914 86.087 C 333.914 109.138 315.226 127.827 292.174 127.827 Z M 292.174 65.217 C 280.66 65.217 271.304 74.568 271.304 86.087 C 271.304 97.608 280.66 106.957 292.174 106.957 C 303.688 106.957 313.045 97.608 313.045 86.087 C 313.045 74.568 303.688 65.217 292.174 65.217 Z" fill="#aaa"/>
+</svg>

data/app/assets/javascripts/biovision/base/biovision.js

@@ -1,6 +1,6 @@
 'use strict';
 
-let Biovision = {
+const Biovision = {
     storage: {
         available: function (type) {
             try {
@@ -77,23 +77,58 @@ let Biovision = {
             }
         }
     },
-    new_ajax_request: function(method, url, on_load, on_error) {
+    new_ajax_request: function (method, url, on_success, on_failure) {
         const request = new XMLHttpRequest();
 
-        request.addEventListener('load', on_load);
-        request.addEventListener('error', on_error || Biovision.handle_ajax_failure);
-        request.open(method, url);
+        request.addEventListener('load', function () {
+            if (this.status >= 200 && this.status < 400) {
+                if (on_success) {
+                    on_success.call(this);
+                }
+            } else {
+                (on_failure || Biovision.handle_ajax_failure).call(this);
+            }
+        });
+        request.addEventListener('error', function () {
+            console.log(this);
+        });
+
+        request.open(method.toUpperCase(), url);
         request.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
         request.setRequestHeader('X-CSRF-Token', Biovision.csrf_token);
 
         return request;
     },
-    handle_ajax_failure: function(response) {
+    handle_ajax_failure: function (response) {
+        console.log(this);
         if (response.hasOwnProperty('responseJSON')) {
             console.log(response['responseJSON']);
         } else {
             console.log(response);
         }
+    },
+    transliterate: function(input) {
+        const char_map = {
+            'а': 'a', 'б': 'b', 'в': 'v', 'г': 'g', 'д': 'd',
+            'е': 'e', 'ё': 'yo', 'ж': 'zh', 'з': 'z', 'и': 'i',
+            'й': 'j', 'к': 'k', 'л': 'l', 'м': 'm', 'н': 'n',
+            'о': 'o', 'п': 'p', 'р': 'r', 'с': 's', 'т': 't',
+            'у': 'u', 'ф': 'f', 'х': 'kh', 'ц': 'c', 'ч': 'ch',
+            'ш': 'sh', 'щ': 'shh', 'ъ': '', 'ы': 'y', 'ь': '',
+            'э': 'e', 'ю': 'yu', 'я': 'ya'
+        };
+        let string = input.toLowerCase();
+
+        for (let index in char_map) {
+            if (char_map.hasOwnProperty(index)) {
+                string = string.replace(new RegExp(index, 'g'), char_map[index]);
+            }
+        }
+        string = string.replace(/[^-a-z0-9_.]/g, '-');
+        string = string.replace(/^[-_.]*([-a-z0-9_.]*[a-z0-9]+)[-_.]*$/, '$1');
+        string = string.replace(/--+/g, '-');
+
+        return string;
     }
 };
 
@@ -109,150 +144,200 @@ document.addEventListener('DOMContentLoaded', function () {
         }
     });
 
-    $(document).on('click', 'div.toggleable > span', function () {
-        if (!$(this).hasClass('switch')) {
-            let $flag = $(this);
-            let url = $(this).parent().data('url');
-            let parameter = $(this).data('flag');
-
-            $.post({
-                url: url,
-                data: {parameter: parameter},
-                beforeSend: function () {
-                    $flag.removeClass();
-                    $flag.addClass('switch');
-                },
-                success: function (response) {
-                    $flag.removeClass();
-                    if (response.hasOwnProperty('data') && response['data'].hasOwnProperty(parameter)) {
+    document.addEventListener('click', function (event) {
+        const element = event.target;
+
+        // Выбор результата поиска пользователей в админке
+        if (element.matches('.user-search .results li')) {
+            const container = element.closest('.user-search');
+            const target = document.getElementById(container.getAttribute('data-target'));
+
+            target.value = element.getAttribute('data-id');
+        }
+
+        // Запирание/отпирание сущности (иконка с замком)
+        if (element.matches('li.lock > a img')) {
+            event.preventDefault();
+
+            const container = element.closest('li');
+            const button = element.closest('a');
+            const lockable = container.parentNode.querySelectorAll('.lockable');
+            const url = container.getAttribute('data-url');
+
+            if (url.length > 1) {
+                const method = button.classList.contains('lock') ? 'PUT' : 'DELETE';
+
+                const request = Biovision.new_ajax_request(method, url, function () {
+                    const response = JSON.parse(this.responseText);
+
+                    if (response.hasOwnProperty('data') && response['data'].hasOwnProperty('locked')) {
+                        const locked = response['data']['locked'];
+
+                        if (locked) {
+                            lockable.forEach(function (button) {
+                                button.classList.add('hidden')
+                            });
+                        } else {
+                            lockable.forEach(function (button) {
+                                button.classList.remove('hidden')
+                            });
+                        }
+
+                        container.querySelectorAll('a').forEach(function (button) {
+                            const classes = button.classList;
+
+                            if (classes.contains('lock')) {
+                                locked ? classes.add('hidden') : classes.remove('hidden');
+                            } else {
+                                locked ? classes.remove('hidden') : classes.add('hidden');
+                            }
+                        });
+                    }
+                });
+
+                request.send();
+            }
+        }
+
+        // Переключение флагов сущности
+        if (element.matches('div.toggleable > span')) {
+            if (!element.classList.contains('switch')) {
+                const url = element.parentNode.getAttribute('data-url');
+                const parameter = element.getAttribute('data-flag');
+
+                const on_success = function() {
+                    const response = JSON.parse(this.responseText);
+
+                    if (response.hasOwnProperty('data')) {
                         switch (response['data'][parameter]) {
                             case true:
-                                $flag.addClass('active');
+                                element.className = 'active';
                                 break;
                             case false:
-                                $flag.addClass('inactive');
+                                element.className = 'inactive';
                                 break;
                             default:
-                                $flag.addClass('unknown');
+                                element.className = 'unknown';
                         }
                     } else {
-                        $flag.addClass('unknown');
+                        element.className = 'unknown';
                     }
-                }
-            }).fail(function (response) {
-                $flag.removeClass();
-                $flag.addClass('unknown');
-                handle_ajax_failure(response);
-            });
-        }
-    });
+                };
 
-    $(document).on('click', 'li.lock > a', function () {
-        let $container = $(this).closest('li');
-        let $edit = $container.parent().find('.lockable');
-        let url = $container.data('url');
+                const on_failure = function() {
+                    element.className = 'unknown';
+                    Biovision.handle_ajax_failure.call(this);
+                };
 
-        if (url.length > 1) {
-            $.ajax(url, {
-                method: $(this).hasClass('lock') ? 'put' : 'delete',
-                success: function (response) {
-                    if (response.hasOwnProperty('data') && response['data'].hasOwnProperty('locked')) {
-                        let locked = response['data']['locked'];
+                const request = Biovision.new_ajax_request('POST', url, on_success, on_failure);
+                const data = new FormData();
+                data.append('parameter', parameter);
 
-                        locked ? $edit.addClass('hidden') : $edit.removeClass('hidden');
+                element.className = 'switch';
 
-                        $container.find('a').each(function () {
-                            if ($(this).hasClass('lock')) {
-                                locked ? $(this).addClass('hidden') : $(this).removeClass('hidden');
-                            } else {
-                                locked ? $(this).removeClass('hidden') : $(this).addClass('hidden');
-                            }
-                        });
-                    }
-                }
-            }).fail(handle_ajax_failure);
+                request.send(data);
+            }
         }
 
-        return false;
-    });
+        // Изменение порядка сортировки элементов
+        if (element.matches('li.priority-changer > button')) {
+            const delta = parseInt(element.getAttribute('data-delta'));
+            const url = element.parentNode.getAttribute('data-url');
+            let item = element.closest('li[data-number]');
 
-    $(document).on('click', 'li.priority-changer > button', function () {
-        let $li = $(this).closest('li[data-number]');
-        let delta = parseInt(this.getAttribute('data-delta'));
-        let url = $(this).parent().data('url');
+            if (parseInt(item.getAttribute('data-number')) + delta > 0) {
+                const on_success = function() {
+                    const response = JSON.parse(this.responseText);
 
-        if (parseInt($li.data('number')) + delta > 0) {
-            $.post(url, {delta: delta}, function (response) {
-                console.log(response);
-                if (response.hasOwnProperty('data')) {
-                    let $container = $li.parent();
-                    let $list = $container.children('li');
+                    if (response.hasOwnProperty('data')) {
+                        const data = response.data;
+                        const container = item.parentNode;
+                        const list = Array.prototype.slice.call(container.children);
 
-                    if (response['data'].hasOwnProperty('priority')) {
-                        $li.data('number', response['data']['priority']);
-                        $li.attr('data-number', response['data']['priority']);
-                    } else {
-                        for (let entity_id in response['data']) {
-                            if (response['data'].hasOwnProperty(entity_id)) {
-                                $li = $container.find('li[data-id=' + entity_id + ']');
-                                $li.data('number', response['data'][entity_id]);
-                                $li.attr('data-number', response['data'][entity_id]);
+                        if (data.hasOwnProperty('priority')) {
+                            item.setAttribute('data-number', data.priority);
+                        } else {
+                            for (let entity_id in data) {
+                                if (data.hasOwnProperty(entity_id)) {
+                                    item = container.querySelector('li[data-id="' + entity_id + '"]');
+                                    item.setAttribute('data-number', data[entity_id]);
+                                }
                             }
                         }
+
+                        list.sort(function (a, b) {
+                            let an = parseInt(a.getAttribute('data-number'));
+                            let bn = parseInt(b.getAttribute('data-number'));
+
+                            if (an > bn) {
+                                return 1;
+                            } else if (an < bn) {
+                                return -1;
+                            } else {
+                                return 0;
+                            }
+                        }).forEach(function(item) {
+                            container.appendChild(item);
+                        });
                     }
-                    $list.sort(function (a, b) {
-                        let an = parseInt($(a).data('number'));
-                        let bn = parseInt($(b).data('number'));
-
-                        if (an > bn) {
-                            return 1;
-                        } else if (an < bn) {
-                            return -1;
-                        } else {
-                            return 0;
-                        }
-                    });
+                };
 
-                    $list.detach().appendTo($container);
-                }
-            }).fail(handle_ajax_failure);
+                const request = Biovision.new_ajax_request('POST', url, on_success);
+
+                const data = new FormData();
+                data.append('delta', delta);
+
+                request.send(data);
+            }
         }
     });
 
-    $('div[data-destroy-url] button.destroy').on('click', function () {
-        let $button = $(this);
-        let $container = $(this).closest('div[data-destroy-url]');
+    // Кнопка поиска пользователя в админке
+    document.querySelectorAll('.user-search button').forEach(function (element) {
+        element.addEventListener('click', function () {
+            const container = this.closest('.user-search');
+            const input = container.querySelector('input[type=search]');
+            const url = container.getAttribute('data-url') + '?q=' + encodeURIComponent(input.value);
 
-        $button.attr('disabled', true);
+            const request = Biovision.new_ajax_request('GET', url, function () {
+                const response = JSON.parse(this.responseText);
+                const results = container.querySelector('.results');
 
-        $.ajax($container.data('destroy-url'), {
-            method: 'delete',
-            success: function (response) {
-                $container.remove();
-            }
-        }).fail(handle_ajax_failure);
+                if (response.hasOwnProperty('data')) {
+                    results.innerHTML = response['data']['html'];
+                }
+            });
+
+            request.send();
+        });
     });
 
-    $('.user-search button').on('click', function () {
-        let $container = $(this).closest('.user-search');
-        let $input = $container.find('input[type=search]');
-        let $results = $container.find('.results');
+    // Кнопка удаления элемента через AJAX
+    document.querySelectorAll('div[data-destroy-url] button.destroy').forEach(function (element) {
+        element.addEventListener('click', function () {
+            const container = this.closest('div[data-destroy-url]');
+            const url = container.getAttribute('data-destroy-url');
+            const request = Biovision.new_ajax_request('DELETE', url, function () {
+                container.remove();
+            });
 
-        $.get($container.data('url'), {q: $input.val()}, function (response) {
-            if (response.hasOwnProperty('data')) {
-                $results.html(response['data']['html']);
-            }
-        }).fail(handle_ajax_failure);
+            this.setAttribute('disabled', 'true');
+            request.send();
+        });
     });
 
-    $(document).on('click', '.user-search .results li', function () {
-        let $container = $(this).closest('.user-search');
-        let $target = $('#' + $container.data('target'));
+    document.querySelectorAll('[data-transliterate]').forEach(function (element) {
+        element.addEventListener('blur', function () {
+            const target = document.getElementById(element.getAttribute('data-transliterate'));
 
-        $target.val($(this).data('id'));
+            if (target && target.value === '') {
+                target.value = Biovision.transliterate(element.value);
+                target.dispatchEvent(new Event('change'));
+            }
+        });
     });
 
-    if (jQuery) {
+    if (typeof jQuery !== 'undefined') {
         jQuery.ajaxSetup({
             headers: {
                 'X-CSRF-Token': Biovision.csrf_token
@@ -276,11 +361,11 @@ function handle_ajax_failure(response) {
  */
 
 /**
- * Element.closest()
+ * Element.matches()
  *
  * IE 9+
  *
- * @see https://developer.mozilla.org/en-US/docs/Web/API/Element/closest
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/Element/matches
  */
 if (!Element.prototype.matches) {
     Element.prototype.matches =
@@ -288,6 +373,13 @@ if (!Element.prototype.matches) {
         Element.prototype.webkitMatchesSelector;
 }
 
+/**
+ * Element.closest()
+ *
+ * IE 9+
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/Element/closest
+ */
 if (!Element.prototype.closest) {
     Element.prototype.closest = function (s) {
         let el = this;
@@ -308,14 +400,26 @@ if (!Element.prototype.closest) {
 }
 
 /**
- * Element.matches()
+ * ChildNode.remove()
  *
  * IE 9+
  *
- * @see https://developer.mozilla.org/en-US/docs/Web/API/Element/matches
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/ChildNode/remove
  */
-if (!Element.prototype.matches) {
-    Element.prototype.matches =
-        Element.prototype.msMatchesSelector ||
-        Element.prototype.webkitMatchesSelector;
-}
+(function (arr) {
+    arr.forEach(function (item) {
+        if (item.hasOwnProperty('remove')) {
+            return;
+        }
+        Object.defineProperty(item, 'remove', {
+            configurable: true,
+            enumerable: true,
+            writable: true,
+            value: function remove() {
+                if (this.parentNode !== null) {
+                    this.parentNode.removeChild(this);
+                }
+            }
+        });
+    });
+})([Element.prototype, CharacterData.prototype, DocumentType.prototype]);