From 1f7c665733a7f3ac784537adad6875a171b61446 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sun, 19 Feb 2017 18:44:17 +0000 Subject: [PATCH 01/70] Updated droplab version to webpack version --- .eslintignore | 1 + app/assets/javascripts/droplab/droplab.js | 1508 ++++++++++------- .../javascripts/droplab/droplab_ajax.js | 103 -- .../droplab/droplab_ajax_filter.js | 164 -- .../javascripts/droplab/droplab_filter.js | 74 - .../javascripts/droplab/plugins/ajax.js | 159 ++ .../droplab/plugins/ajax_filter.js | 216 +++ .../javascripts/droplab/plugins/filter.js | 172 ++ .../droplab/plugins/input_setter.js | 129 ++ .../filtered_search/dropdown_hint.js | 1 - .../filtered_search/dropdown_non_user.js | 1 + .../filtered_search_dropdown.js | 2 +- .../filtered_search_manager.js | 2 +- app/assets/javascripts/main.js | 6 +- app/assets/stylesheets/framework/filters.scss | 2 +- .../shared/issuable/_search_bar.html.haml | 2 +- .../filtered_search/dropdown_hint_spec.rb | 14 +- .../filtered_search/dropdown_label_spec.rb | 31 +- .../issues/filtered_search/search_bar_spec.rb | 18 +- 19 files changed, 1590 insertions(+), 1015 deletions(-) delete mode 100644 app/assets/javascripts/droplab/droplab_ajax.js delete mode 100644 app/assets/javascripts/droplab/droplab_ajax_filter.js delete mode 100644 app/assets/javascripts/droplab/droplab_filter.js create mode 100644 app/assets/javascripts/droplab/plugins/ajax.js create mode 100644 app/assets/javascripts/droplab/plugins/ajax_filter.js create mode 100644 app/assets/javascripts/droplab/plugins/filter.js create mode 100644 app/assets/javascripts/droplab/plugins/input_setter.js diff --git a/.eslintignore b/.eslintignore index c742b08c005..fe0766d8a44 100644 --- a/.eslintignore +++ b/.eslintignore @@ -5,5 +5,6 @@ /public/ /tmp/ /vendor/ +/app/assets/javascripts/droplab karma.config.js webpack.config.js diff --git a/app/assets/javascripts/droplab/droplab.js b/app/assets/javascripts/droplab/droplab.js index 8b14191395b..b5d6a43b83f 100644 --- a/app/assets/javascripts/droplab/droplab.js +++ b/app/assets/javascripts/droplab/droplab.js @@ -1,741 +1,983 @@ -/* eslint-disable */ -// Determine where to place this -if (typeof Object.assign != 'function') { - Object.assign = function (target, varArgs) { // .length of function is 2 - 'use strict'; - if (target == null) { // TypeError if undefined or null - throw new TypeError('Cannot convert undefined or null to object'); - } +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) +/******/ return installedModules[moduleId].exports; +/******/ +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // identity function for calling harmony imports with the correct context +/******/ __webpack_require__.i = function(value) { return value; }; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { +/******/ configurable: false, +/******/ enumerable: true, +/******/ get: getter +/******/ }); +/******/ } +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = 9); +/******/ }) +/************************************************************************/ +/******/ ([ +/* 0 */ +/***/ (function(module, exports, __webpack_require__) { - var to = Object(target); +"use strict"; - for (var index = 1; index < arguments.length; index++) { - var nextSource = arguments[index]; - if (nextSource != null) { // Skip over if undefined or null - for (var nextKey in nextSource) { - // Avoid bugs when hasOwnProperty is shadowed - if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) { - to[nextKey] = nextSource[nextKey]; - } - } - } - } - return to; - }; -} - -(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.droplab = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o 0) { - templateString = items[items.length - 1].outerHTML; +// Polyfill for creating CustomEvents on IE9/10/11 + +// code pulled from: +// https://github.com/d4tocchini/customevent-polyfill +// https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent#Polyfill + +try { + var ce = new window.CustomEvent('test'); + ce.preventDefault(); + if (ce.defaultPrevented !== true) { + // IE has problems with .preventDefault() on custom events + // http://stackoverflow.com/questions/23349191 + throw new Error('Could not prevent default'); } - this.templateString = templateString; - return this.templateString; - }, - - clickEvent: function(e) { - // climb up the tree to find the LI - var selected = utils.closest(e.target, 'LI'); - - if(selected) { - e.preventDefault(); - this.hide(); - var listEvent = new CustomEvent('click.dl', { - detail: { - list: this, - selected: selected, - data: e.target.dataset, - }, - }); - this.list.dispatchEvent(listEvent); - } - }, - - addEvents: function() { - this.clickWrapper = this.clickEvent.bind(this); - // event delegation. - this.list.addEventListener('click', this.clickWrapper); - }, - - toggle: function() { - if(this.hidden) { - this.show(); - } else { - this.hide(); - } - }, - - setData: function(data) { - this.data = data; - this.render(data); - }, - - addData: function(data) { - this.data = (this.data || []).concat(data); - this.render(this.data); - }, - - // call render manually on data; - render: function(data){ - // debugger - // empty the list first - var templateString = this.templateString; - var newChildren = []; - var toAppend; - - newChildren = (data ||[]).map(function(dat){ - var html = utils.t(templateString, dat); - var template = document.createElement('div'); - template.innerHTML = html; - - // Help set the image src template - var imageTags = template.querySelectorAll('img[data-src]'); - // debugger - for(var i = 0; i < imageTags.length; i++) { - var imageTag = imageTags[i]; - imageTag.src = imageTag.getAttribute('data-src'); - imageTag.removeAttribute('data-src'); - } - - if(dat.hasOwnProperty('droplab_hidden') && dat.droplab_hidden){ - template.firstChild.style.display = 'none' - }else{ - template.firstChild.style.display = 'block'; - } - return template.firstChild.outerHTML; - }); - toAppend = this.list.querySelector('ul[data-dynamic]'); - if(toAppend) { - toAppend.innerHTML = newChildren.join(''); - } else { - this.list.innerHTML = newChildren.join(''); - } - }, - - show: function() { - if (this.hidden) { - // debugger - this.list.style.display = 'block'; - this.currentIndex = 0; - this.hidden = false; - } - }, - - hide: function() { - if (!this.hidden) { - // debugger - this.list.style.display = 'none'; - this.currentIndex = 0; - this.hidden = true; - } - }, - - destroy: function() { - this.hide(); - this.list.removeEventListener('click', this.clickWrapper); - } -}); - -module.exports = DropDown; - -},{"./custom_event_polyfill":2,"./utils":10}],4:[function(require,module,exports){ -require('./window')(function(w){ - module.exports = function(deps) { - deps = deps || {}; - var window = deps.window || w; - var document = deps.document || window.document; - var CustomEvent = deps.CustomEvent || require('./custom_event_polyfill'); - var HookButton = deps.HookButton || require('./hook_button'); - var HookInput = deps.HookInput || require('./hook_input'); - var utils = deps.utils || require('./utils'); - var DATA_TRIGGER = require('./constants').DATA_TRIGGER; - - var DropLab = function(hook){ - if (!(this instanceof DropLab)) return new DropLab(hook); - this.ready = false; - this.hooks = []; - this.queuedData = []; - this.config = {}; - this.loadWrapper; - if(typeof hook !== 'undefined'){ - this.addHook(hook); - } +} catch(e) { + var CustomEvent = function(event, params) { + var evt, origPrevent; + params = params || { + bubbles: false, + cancelable: false, + detail: undefined }; - - Object.assign(DropLab.prototype, { - load: function() { - this.loadWrapper(); - }, - - loadWrapper: function(){ - var dropdownTriggers = [].slice.apply(document.querySelectorAll('['+DATA_TRIGGER+']')); - this.addHooks(dropdownTriggers).init(); - }, - - addData: function () { - var args = [].slice.apply(arguments); - this.applyArgs(args, '_addData'); - }, - - setData: function() { - var args = [].slice.apply(arguments); - this.applyArgs(args, '_setData'); - }, - - destroy: function() { - for(var i = 0; i < this.hooks.length; i++) { - this.hooks[i].destroy(); - } - this.hooks = []; - this.removeEvents(); - }, - - applyArgs: function(args, methodName) { - if(this.ready) { - this[methodName].apply(this, args); - } else { - this.queuedData = this.queuedData || []; - this.queuedData.push(args); - } - }, - - _addData: function(trigger, data) { - this._processData(trigger, data, 'addData'); - }, - - _setData: function(trigger, data) { - this._processData(trigger, data, 'setData'); - }, - - _processData: function(trigger, data, methodName) { - for(var i = 0; i < this.hooks.length; i++) { - var hook = this.hooks[i]; - if(hook.trigger.dataset.hasOwnProperty('id')) { - if(hook.trigger.dataset.id === trigger) { - hook.list[methodName](data); - } + evt = document.createEvent("CustomEvent"); + evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail); + origPrevent = evt.preventDefault; + evt.preventDefault = function () { + origPrevent.call(this); + try { + Object.defineProperty(this, 'defaultPrevented', { + get: function () { + return true; } - } - }, - - addEvents: function() { - var self = this; - this.windowClickedWrapper = function(e){ - var thisTag = e.target; - if(thisTag.tagName !== 'UL'){ - // climb up the tree to find the UL - thisTag = utils.closest(thisTag, 'UL'); - } - if(utils.isDropDownParts(thisTag)){ return } - if(utils.isDropDownParts(e.target)){ return } - for(var i = 0; i < self.hooks.length; i++) { - self.hooks[i].list.hide(); - } - }.bind(this); - document.addEventListener('click', this.windowClickedWrapper); - }, - - removeEvents: function(){ - w.removeEventListener('click', this.windowClickedWrapper); - w.removeEventListener('load', this.loadWrapper); - }, - - changeHookList: function(trigger, list, plugins, config) { - trigger = document.querySelector('[data-id="'+trigger+'"]'); - // list = document.querySelector(list); - this.hooks.every(function(hook, i) { - if(hook.trigger === trigger) { - hook.destroy(); - this.hooks.splice(i, 1); - this.addHook(trigger, list, plugins, config); - return false; - } - return true - }.bind(this)); - }, - - addHook: function(hook, list, plugins, config) { - if(!(hook instanceof HTMLElement) && typeof hook === 'string'){ - hook = document.querySelector(hook); - } - if(!list){ - list = document.querySelector(hook.dataset[utils.toDataCamelCase(DATA_TRIGGER)]); - } - - if(hook) { - if(hook.tagName === 'A' || hook.tagName === 'BUTTON') { - this.hooks.push(new HookButton(hook, list, plugins, config)); - } else if(hook.tagName === 'INPUT') { - this.hooks.push(new HookInput(hook, list, plugins, config)); - } - } - return this; - }, - - addHooks: function(hooks, plugins, config) { - for(var i = 0; i < hooks.length; i++) { - var hook = hooks[i]; - this.addHook(hook, null, plugins, config); - } - return this; - }, - - setConfig: function(obj){ - this.config = obj; - }, - - init: function () { - this.addEvents(); - var readyEvent = new CustomEvent('ready.dl', { - detail: { - dropdown: this, - }, }); - window.dispatchEvent(readyEvent); - this.ready = true; - for(var i = 0; i < this.queuedData.length; i++) { - this.addData.apply(this, this.queuedData[i]); - } - this.queuedData = []; - return this; - }, - }); - - return DropLab; + } catch(e) { + this.defaultPrevented = true; + } + }; + return evt; }; + + CustomEvent.prototype = window.Event.prototype; + window.CustomEvent = CustomEvent; // expose definition to window +} + + +/***/ }), +/* 2 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true }); -},{"./constants":1,"./custom_event_polyfill":2,"./hook_button":6,"./hook_input":7,"./utils":10,"./window":11}],5:[function(require,module,exports){ -var DropDown = require('./dropdown'); +var _dropdown = __webpack_require__(6); -var Hook = function(trigger, list, plugins, config){ +var _dropdown2 = _interopRequireDefault(_dropdown); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var Hook = function Hook(trigger, list, plugins, config) { this.trigger = trigger; - this.list = new DropDown(list); + this.list = new _dropdown2.default(list); this.type = 'Hook'; this.event = 'click'; this.plugins = plugins || []; this.config = config || {}; - this.id = trigger.dataset.id; + this.id = trigger.id; }; Object.assign(Hook.prototype, { - addEvents: function(){}, + addEvents: function addEvents() {}, - constructor: Hook, + constructor: Hook }); -module.exports = Hook; +exports.default = Hook; -},{"./dropdown":3}],6:[function(require,module,exports){ -var CustomEvent = require('./custom_event_polyfill'); -var Hook = require('./hook'); +/***/ }), +/* 3 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _constants = __webpack_require__(0); + +var _constants2 = _interopRequireDefault(_constants); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var DATA_TRIGGER = _constants2.default.DATA_TRIGGER, + DATA_DROPDOWN = _constants2.default.DATA_DROPDOWN; + + +var utils = { + toCamelCase: function toCamelCase(attr) { + return this.camelize(attr.split('-').slice(1).join(' ')); + }, + t: function t(s, d) { + for (var p in d) { + if (Object.prototype.hasOwnProperty.call(d, p)) { + s = s.replace(new RegExp('{{' + p + '}}', 'g'), d[p]); + } + } + return s; + }, + camelize: function camelize(str) { + return str.replace(/(?:^\w|[A-Z]|\b\w)/g, function (letter, index) { + return index === 0 ? letter.toLowerCase() : letter.toUpperCase(); + }).replace(/\s+/g, ''); + }, + closest: function closest(thisTag, stopTag) { + while (thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML') { + thisTag = thisTag.parentNode; + } + return thisTag; + }, + isDropDownParts: function isDropDownParts(target) { + if (!target || target.tagName === 'HTML') return false; + return target.hasAttribute(DATA_TRIGGER) || target.hasAttribute(DATA_DROPDOWN); + } +}; + +exports.default = utils; + +/***/ }), +/* 4 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +exports.default = function () { + var DropLab = function DropLab(hook, list) { + if (!this instanceof DropLab) return new DropLab(hook); + + this.ready = false; + this.hooks = []; + this.queuedData = []; + this.config = {}; + + this.eventWrapper = {}; + + if (!hook) return this.loadStatic(); + this.addHook(hook, list); + this.init(); + }; + + Object.assign(DropLab.prototype, { + loadStatic: function loadStatic() { + var dropdownTriggers = [].slice.apply(document.querySelectorAll('[' + DATA_TRIGGER + ']')); + this.addHooks(dropdownTriggers).init(); + }, + + addData: function addData() { + var args = [].slice.apply(arguments); + this.applyArgs(args, '_addData'); + }, + + setData: function setData() { + var args = [].slice.apply(arguments); + this.applyArgs(args, '_setData'); + }, + + destroy: function destroy() { + this.hooks.forEach(function (hook) { + return hook.destroy(); + }); + this.hooks = []; + this.removeEvents(); + }, + + applyArgs: function applyArgs(args, methodName) { + if (this.ready) return this[methodName].apply(this, args); + + this.queuedData = this.queuedData || []; + this.queuedData.push(args); + }, + + _addData: function _addData(trigger, data) { + this._processData(trigger, data, 'addData'); + }, + + _setData: function _setData(trigger, data) { + this._processData(trigger, data, 'setData'); + }, + + _processData: function _processData(trigger, data, methodName) { + this.hooks.forEach(function (hook) { + if (Array.isArray(trigger)) hook.list[methodName](trigger); + + if (hook.trigger.id === trigger) hook.list[methodName](data); + }); + }, + + addEvents: function addEvents() { + this.eventWrapper.documentClicked = this.documentClicked.bind(this); + document.addEventListener('click', this.eventWrapper.documentClicked); + }, + + documentClicked: function documentClicked(e) { + var thisTag = e.target; + + if (thisTag.tagName !== 'UL') thisTag = _utils2.default.closest(thisTag, 'UL'); + if (_utils2.default.isDropDownParts(thisTag, this.hooks) || _utils2.default.isDropDownParts(e.target, this.hooks)) return; + + this.hooks.forEach(function (hook) { + return hook.list.hide(); + }); + }, + + removeEvents: function removeEvents() { + document.removeEventListener('click', this.eventWrapper.documentClicked); + }, + + changeHookList: function changeHookList(trigger, list, plugins, config) { + var _this = this; + + var availableTrigger = typeof trigger === 'string' ? document.getElementById(trigger) : trigger; + + this.hooks.forEach(function (hook, i) { + hook.list.list.dataset.dropdownActive = false; + + if (hook.trigger !== availableTrigger) return; + + hook.destroy(); + _this.hooks.splice(i, 1); + _this.addHook(availableTrigger, list, plugins, config); + }); + }, + + addHook: function addHook(hook, list, plugins, config) { + var availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook; + var availableList = void 0; + + if (typeof list === 'string') { + availableList = document.querySelector(list); + } else if (list instanceof Element) { + availableList = list; + } else { + availableList = document.querySelector(hook.dataset[_utils2.default.toCamelCase(DATA_TRIGGER)]); + } + + availableList.dataset.dropdownActive = true; + + var HookObject = availableHook.tagName === 'INPUT' ? _hook_input2.default : _hook_button2.default; + this.hooks.push(new HookObject(availableHook, availableList, plugins, config)); + + return this; + }, + + addHooks: function addHooks(hooks, plugins, config) { + var _this2 = this; + + hooks.forEach(function (hook) { + return _this2.addHook(hook, null, plugins, config); + }); + return this; + }, + + setConfig: function setConfig(obj) { + this.config = obj; + }, + + fireReady: function fireReady() { + var readyEvent = new CustomEvent('ready.dl', { + detail: { + dropdown: this + } + }); + document.dispatchEvent(readyEvent); + + this.ready = true; + }, + + init: function init() { + var _this3 = this; + + this.addEvents(); + + this.fireReady(); + + this.queuedData.forEach(function (data) { + return _this3.addData(data); + }); + this.queuedData = []; + + return this; + } + }); + + return DropLab; +}; + +__webpack_require__(1); + +var _hook_button = __webpack_require__(7); + +var _hook_button2 = _interopRequireDefault(_hook_button); + +var _hook_input = __webpack_require__(8); + +var _hook_input2 = _interopRequireDefault(_hook_input); + +var _utils = __webpack_require__(3); + +var _utils2 = _interopRequireDefault(_utils); + +var _constants = __webpack_require__(0); + +var _constants2 = _interopRequireDefault(_constants); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var DATA_TRIGGER = _constants2.default.DATA_TRIGGER; + +; + +/***/ }), +/* 5 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +exports.default = function () { + var currentKey; + var currentFocus; + var isUpArrow = false; + var isDownArrow = false; + var removeHighlight = function removeHighlight(list) { + var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0); + var listItems = []; + for (var i = 0; i < itemElements.length; i++) { + var listItem = itemElements[i]; + listItem.classList.remove(_constants2.default.ACTIVE_CLASS); + + if (listItem.style.display !== 'none') { + listItems.push(listItem); + } + } + return listItems; + }; + + var setMenuForArrows = function setMenuForArrows(list) { + var listItems = removeHighlight(list); + if (list.currentIndex > 0) { + if (!listItems[list.currentIndex - 1]) { + list.currentIndex = list.currentIndex - 1; + } + + if (listItems[list.currentIndex - 1]) { + var el = listItems[list.currentIndex - 1]; + var filterDropdownEl = el.closest('.filter-dropdown'); + el.classList.add(_constants2.default.ACTIVE_CLASS); + + if (filterDropdownEl) { + var filterDropdownBottom = filterDropdownEl.offsetHeight; + var elOffsetTop = el.offsetTop - 30; + + if (elOffsetTop > filterDropdownBottom) { + filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom; + } + } + } + } + }; + + var mousedown = function mousedown(e) { + var list = e.detail.hook.list; + removeHighlight(list); + list.show(); + list.currentIndex = 0; + isUpArrow = false; + isDownArrow = false; + }; + var selectItem = function selectItem(list) { + var listItems = removeHighlight(list); + var currentItem = listItems[list.currentIndex - 1]; + var listEvent = new CustomEvent('click.dl', { + detail: { + list: list, + selected: currentItem, + data: currentItem.dataset + } + }); + list.list.dispatchEvent(listEvent); + list.hide(); + }; + + var keydown = function keydown(e) { + var typedOn = e.target; + var list = e.detail.hook.list; + var currentIndex = list.currentIndex; + isUpArrow = false; + isDownArrow = false; + + if (e.detail.which) { + currentKey = e.detail.which; + if (currentKey === 13) { + selectItem(e.detail.hook.list); + return; + } + if (currentKey === 38) { + isUpArrow = true; + } + if (currentKey === 40) { + isDownArrow = true; + } + } else if (e.detail.key) { + currentKey = e.detail.key; + if (currentKey === 'Enter') { + selectItem(e.detail.hook.list); + return; + } + if (currentKey === 'ArrowUp') { + isUpArrow = true; + } + if (currentKey === 'ArrowDown') { + isDownArrow = true; + } + } + if (isUpArrow) { + currentIndex--; + } + if (isDownArrow) { + currentIndex++; + } + if (currentIndex < 0) { + currentIndex = 0; + } + list.currentIndex = currentIndex; + setMenuForArrows(e.detail.hook.list); + }; + + document.addEventListener('mousedown.dl', mousedown); + document.addEventListener('keydown.dl', keydown); +}; + +var _constants = __webpack_require__(0); + +var _constants2 = _interopRequireDefault(_constants); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +/***/ }), +/* 6 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _Object$assign; + +__webpack_require__(1); + +var _utils = __webpack_require__(3); + +var _utils2 = _interopRequireDefault(_utils); + +var _constants = __webpack_require__(0); + +var _constants2 = _interopRequireDefault(_constants); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + +var DropDown = function DropDown(list) { + this.currentIndex = 0; + this.hidden = true; + this.list = typeof list === 'string' ? document.querySelector(list) : list; + this.items = []; + + this.eventWrapper = {}; + + this.getItems(); + this.initTemplateString(); + this.addEvents(); + + this.initialState = list.innerHTML; +}; + +Object.assign(DropDown.prototype, (_Object$assign = { + getItems: function getItems() { + this.items = [].slice.call(this.list.querySelectorAll('li')); + return this.items; + }, + + initTemplateString: function initTemplateString() { + var items = this.items || this.getItems(); + + var templateString = ''; + if (items.length > 0) templateString = items[items.length - 1].outerHTML; + this.templateString = templateString; + + return this.templateString; + }, + + clickEvent: function clickEvent(e) { + var selected = _utils2.default.closest(e.target, 'LI'); + if (!selected) return; + + this.addSelectedClass(selected); + + e.preventDefault(); + this.hide(); + + var listEvent = new CustomEvent('click.dl', { + detail: { + list: this, + selected: selected, + data: e.target.dataset + } + }); + this.list.dispatchEvent(listEvent); + }, + + addSelectedClass: function addSelectedClass(selected) { + this.removeSelectedClasses(); + selected.classList.add(_constants2.default.SELECTED_CLASS); + }, + + removeSelectedClasses: function removeSelectedClasses() { + var items = this.items || this.getItems(); + + items.forEach(function (item) { + item.classList.remove(_constants2.default.SELECTED_CLASS); + }); + }, + + addEvents: function addEvents() { + this.eventWrapper.clickEvent = this.clickEvent.bind(this); + this.list.addEventListener('click', this.eventWrapper.clickEvent); + }, + + toggle: function toggle() { + this.hidden ? this.show() : this.hide(); + }, + + setData: function setData(data) { + this.data = data; + this.render(data); + }, + + addData: function addData(data) { + this.data = (this.data || []).concat(data); + this.render(this.data); + }, + + render: function render(data) { + var children = data ? data.map(this.renderChildren.bind(this)) : []; + var renderableList = this.list.querySelector('ul[data-dynamic]') || this.list; + + renderableList.innerHTML = children.join(''); + }, + + renderChildren: function renderChildren(data) { + var html = _utils2.default.t(this.templateString, data); + var template = document.createElement('div'); + + template.innerHTML = html; + this.setImagesSrc(template); + template.firstChild.style.display = data.droplab_hidden ? 'none' : 'block'; + + return template.firstChild.outerHTML; + }, + + setImagesSrc: function setImagesSrc(template) { + var images = [].slice.call(template.querySelectorAll('img[data-src]')); + + images.forEach(function (image) { + image.src = image.getAttribute('data-src'); + image.removeAttribute('data-src'); + }); + }, + + show: function show() { + if (!this.hidden) return; + this.list.style.display = 'block'; + this.currentIndex = 0; + this.hidden = false; + }, + + hide: function hide() { + if (this.hidden) return; + this.list.style.display = 'none'; + this.currentIndex = 0; + this.hidden = true; + } + +}, _defineProperty(_Object$assign, 'toggle', function toggle() { + this.hidden ? this.show() : this.hide(); +}), _defineProperty(_Object$assign, 'destroy', function destroy() { + this.hide(); + this.list.removeEventListener('click', this.eventWrapper.clickEvent); +}), _Object$assign)); + +exports.default = DropDown; + +/***/ }), +/* 7 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +__webpack_require__(1); + +var _hook = __webpack_require__(2); + +var _hook2 = _interopRequireDefault(_hook); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var HookButton = function HookButton(trigger, list, plugins, config) { + _hook2.default.call(this, trigger, list, plugins, config); -var HookButton = function(trigger, list, plugins, config) { - Hook.call(this, trigger, list, plugins, config); this.type = 'button'; this.event = 'click'; + + this.eventWrapper = {}; + this.addEvents(); this.addPlugins(); }; -HookButton.prototype = Object.create(Hook.prototype); +HookButton.prototype = Object.create(_hook2.default.prototype); Object.assign(HookButton.prototype, { - addPlugins: function() { - for(var i = 0; i < this.plugins.length; i++) { - this.plugins[i].init(this); - } + addPlugins: function addPlugins() { + var _this = this; + + this.plugins.forEach(function (plugin) { + return plugin.init(_this); + }); }, - clicked: function(e){ + clicked: function clicked(e) { var buttonEvent = new CustomEvent('click.dl', { detail: { - hook: this, + hook: this }, bubbles: true, cancelable: true }); - this.list.show(); e.target.dispatchEvent(buttonEvent); + + this.list.toggle(); }, - addEvents: function(){ - this.clickedWrapper = this.clicked.bind(this); - this.trigger.addEventListener('click', this.clickedWrapper); + addEvents: function addEvents() { + this.eventWrapper.clicked = this.clicked.bind(this); + this.trigger.addEventListener('click', this.eventWrapper.clicked); }, - removeEvents: function(){ - this.trigger.removeEventListener('click', this.clickedWrapper); + removeEvents: function removeEvents() { + this.trigger.removeEventListener('click', this.eventWrapper.clicked); }, - restoreInitialState: function() { + restoreInitialState: function restoreInitialState() { this.list.list.innerHTML = this.list.initialState; }, - removePlugins: function() { - for(var i = 0; i < this.plugins.length; i++) { - this.plugins[i].destroy(); - } + removePlugins: function removePlugins() { + this.plugins.forEach(function (plugin) { + return plugin.destroy(); + }); }, - destroy: function() { + destroy: function destroy() { this.restoreInitialState(); + this.removeEvents(); this.removePlugins(); }, - - constructor: HookButton, + constructor: HookButton }); +exports.default = HookButton; -module.exports = HookButton; +/***/ }), +/* 8 */ +/***/ (function(module, exports, __webpack_require__) { -},{"./custom_event_polyfill":2,"./hook":5}],7:[function(require,module,exports){ -var CustomEvent = require('./custom_event_polyfill'); -var Hook = require('./hook'); +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +__webpack_require__(1); + +var _hook = __webpack_require__(2); + +var _hook2 = _interopRequireDefault(_hook); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var HookInput = function HookInput(trigger, list, plugins, config) { + _hook2.default.call(this, trigger, list, plugins, config); -var HookInput = function(trigger, list, plugins, config) { - Hook.call(this, trigger, list, plugins, config); this.type = 'input'; this.event = 'input'; - this.addPlugins(); + + this.eventWrapper = {}; + this.addEvents(); + this.addPlugins(); }; Object.assign(HookInput.prototype, { - addPlugins: function() { - var self = this; - for(var i = 0; i < this.plugins.length; i++) { - this.plugins[i].init(self); - } + addPlugins: function addPlugins() { + var _this = this; + + this.plugins.forEach(function (plugin) { + return plugin.init(_this); + }); }, - addEvents: function(){ - var self = this; + addEvents: function addEvents() { + this.eventWrapper.mousedown = this.mousedown.bind(this); + this.eventWrapper.input = this.input.bind(this); + this.eventWrapper.keyup = this.keyup.bind(this); + this.eventWrapper.keydown = this.keydown.bind(this); - this.mousedown = function mousedown(e) { - if(self.hasRemovedEvents) return; - - var mouseEvent = new CustomEvent('mousedown.dl', { - detail: { - hook: self, - text: e.target.value, - }, - bubbles: true, - cancelable: true - }); - e.target.dispatchEvent(mouseEvent); - } - - this.input = function input(e) { - if(self.hasRemovedEvents) return; - - self.list.show(); - - var inputEvent = new CustomEvent('input.dl', { - detail: { - hook: self, - text: e.target.value, - }, - bubbles: true, - cancelable: true - }); - e.target.dispatchEvent(inputEvent); - } - - this.keyup = function keyup(e) { - if(self.hasRemovedEvents) return; - - keyEvent(e, 'keyup.dl'); - } - - this.keydown = function keydown(e) { - if(self.hasRemovedEvents) return; - - keyEvent(e, 'keydown.dl'); - } - - function keyEvent(e, keyEventName){ - self.list.show(); - - var keyEvent = new CustomEvent(keyEventName, { - detail: { - hook: self, - text: e.target.value, - which: e.which, - key: e.key, - }, - bubbles: true, - cancelable: true - }); - e.target.dispatchEvent(keyEvent); - } - - this.events = this.events || {}; - this.events.mousedown = this.mousedown; - this.events.input = this.input; - this.events.keyup = this.keyup; - this.events.keydown = this.keydown; - this.trigger.addEventListener('mousedown', this.mousedown); - this.trigger.addEventListener('input', this.input); - this.trigger.addEventListener('keyup', this.keyup); - this.trigger.addEventListener('keydown', this.keydown); + this.trigger.addEventListener('mousedown', this.eventWrapper.mousedown); + this.trigger.addEventListener('input', this.eventWrapper.input); + this.trigger.addEventListener('keyup', this.eventWrapper.keyup); + this.trigger.addEventListener('keydown', this.eventWrapper.keydown); }, - removeEvents: function() { + removeEvents: function removeEvents() { this.hasRemovedEvents = true; - this.trigger.removeEventListener('mousedown', this.mousedown); - this.trigger.removeEventListener('input', this.input); - this.trigger.removeEventListener('keyup', this.keyup); - this.trigger.removeEventListener('keydown', this.keydown); + + this.trigger.removeEventListener('mousedown', this.eventWrapper.mousedown); + this.trigger.removeEventListener('input', this.eventWrapper.input); + this.trigger.removeEventListener('keyup', this.eventWrapper.keyup); + this.trigger.removeEventListener('keydown', this.eventWrapper.keydown); }, - restoreInitialState: function() { + input: function input(e) { + if (this.hasRemovedEvents) return; + + this.list.show(); + + var inputEvent = new CustomEvent('input.dl', { + detail: { + hook: this, + text: e.target.value + }, + bubbles: true, + cancelable: true + }); + e.target.dispatchEvent(inputEvent); + }, + + mousedown: function mousedown(e) { + if (this.hasRemovedEvents) return; + + var mouseEvent = new CustomEvent('mousedown.dl', { + detail: { + hook: this, + text: e.target.value + }, + bubbles: true, + cancelable: true + }); + e.target.dispatchEvent(mouseEvent); + }, + + keyup: function keyup(e) { + if (this.hasRemovedEvents) return; + + this.keyEvent(e, 'keyup.dl'); + }, + + keydown: function keydown(e) { + if (this.hasRemovedEvents) return; + + this.keyEvent(e, 'keydown.dl'); + }, + + keyEvent: function keyEvent(e, eventName) { + this.list.show(); + + var keyEvent = new CustomEvent(eventName, { + detail: { + hook: this, + text: e.target.value, + which: e.which, + key: e.key + }, + bubbles: true, + cancelable: true + }); + e.target.dispatchEvent(keyEvent); + }, + + restoreInitialState: function restoreInitialState() { this.list.list.innerHTML = this.list.initialState; }, - removePlugins: function() { - for(var i = 0; i < this.plugins.length; i++) { - this.plugins[i].destroy(); - } + removePlugins: function removePlugins() { + this.plugins.forEach(function (plugin) { + return plugin.destroy(); + }); }, - destroy: function() { + destroy: function destroy() { this.restoreInitialState(); + this.removeEvents(); this.removePlugins(); + this.list.destroy(); } }); -module.exports = HookInput; +exports.default = HookInput; -},{"./custom_event_polyfill":2,"./hook":5}],8:[function(require,module,exports){ -var DropLab = require('./droplab')(); -var DATA_TRIGGER = require('./constants').DATA_TRIGGER; -var keyboard = require('./keyboard')(); -var setup = function() { - window.DropLab = DropLab; -}; +/***/ }), +/* 9 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; -module.exports = setup(); - -},{"./constants":1,"./droplab":4,"./keyboard":9}],9:[function(require,module,exports){ -require('./window')(function(w){ - module.exports = function(){ - var currentKey; - var currentFocus; - var isUpArrow = false; - var isDownArrow = false; - var removeHighlight = function removeHighlight(list) { - var listItems = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0); - var listItemsTmp = []; - for(var i = 0; i < listItems.length; i++) { - var listItem = listItems[i]; - listItem.classList.remove('dropdown-active'); - - if (listItem.style.display !== 'none') { - listItemsTmp.push(listItem); - } - } - return listItemsTmp; - }; - - var setMenuForArrows = function setMenuForArrows(list) { - var listItems = removeHighlight(list); - if(list.currentIndex>0){ - if(!listItems[list.currentIndex-1]){ - list.currentIndex = list.currentIndex-1; - } - - if (listItems[list.currentIndex-1]) { - var el = listItems[list.currentIndex-1]; - var filterDropdownEl = el.closest('.filter-dropdown'); - el.classList.add('dropdown-active'); - - if (filterDropdownEl) { - var filterDropdownBottom = filterDropdownEl.offsetHeight; - var elOffsetTop = el.offsetTop - 30; - - if (elOffsetTop > filterDropdownBottom) { - filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom; - } - } - } - } - }; - - var mousedown = function mousedown(e) { - var list = e.detail.hook.list; - removeHighlight(list); - list.show(); - list.currentIndex = 0; - isUpArrow = false; - isDownArrow = false; - }; - var selectItem = function selectItem(list) { - var listItems = removeHighlight(list); - var currentItem = listItems[list.currentIndex-1]; - var listEvent = new CustomEvent('click.dl', { - detail: { - list: list, - selected: currentItem, - data: currentItem.dataset, - }, - }); - list.list.dispatchEvent(listEvent); - list.hide(); - } - - var keydown = function keydown(e){ - var typedOn = e.target; - var list = e.detail.hook.list; - var currentIndex = list.currentIndex; - isUpArrow = false; - isDownArrow = false; - - if(e.detail.which){ - currentKey = e.detail.which; - if(currentKey === 13){ - selectItem(e.detail.hook.list); - return; - } - if(currentKey === 38) { - isUpArrow = true; - } - if(currentKey === 40) { - isDownArrow = true; - } - } else if(e.detail.key) { - currentKey = e.detail.key; - if(currentKey === 'Enter'){ - selectItem(e.detail.hook.list); - return; - } - if(currentKey === 'ArrowUp') { - isUpArrow = true; - } - if(currentKey === 'ArrowDown') { - isDownArrow = true; - } - } - if(isUpArrow){ currentIndex--; } - if(isDownArrow){ currentIndex++; } - if(currentIndex < 0){ currentIndex = 0; } - list.currentIndex = currentIndex; - setMenuForArrows(e.detail.hook.list); - }; - - w.addEventListener('mousedown.dl', mousedown); - w.addEventListener('keydown.dl', keydown); - }; +Object.defineProperty(exports, "__esModule", { + value: true }); -},{"./window":11}],10:[function(require,module,exports){ -var DATA_TRIGGER = require('./constants').DATA_TRIGGER; -var DATA_DROPDOWN = require('./constants').DATA_DROPDOWN; -var toDataCamelCase = function(attr){ - return this.camelize(attr.split('-').slice(1).join(' ')); +var _droplab = __webpack_require__(4); + +var _droplab2 = _interopRequireDefault(_droplab); + +var _constants = __webpack_require__(0); + +var _constants2 = _interopRequireDefault(_constants); + +var _keyboard = __webpack_require__(5); + +var _keyboard2 = _interopRequireDefault(_keyboard); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var DATA_TRIGGER = _constants2.default.DATA_TRIGGER; +var keyboard = (0, _keyboard2.default)(); + +var setup = function setup() { + window.DropLab = (0, _droplab2.default)(); }; -// the tiniest damn templating I can do -var t = function(s,d){ - for(var p in d) - s=s.replace(new RegExp('{{'+p+'}}','g'), d[p]); - return s; -}; +setup(); -var camelize = function(str) { - return str.replace(/(?:^\w|[A-Z]|\b\w)/g, function(letter, index) { - return index == 0 ? letter.toLowerCase() : letter.toUpperCase(); - }).replace(/\s+/g, ''); -}; +exports.default = setup; -var closest = function(thisTag, stopTag) { - while(thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML'){ - thisTag = thisTag.parentNode; - } - return thisTag; -}; - -var isDropDownParts = function(target) { - if(!target || target.tagName === 'HTML') { return false; } - return ( - target.hasAttribute(DATA_TRIGGER) || - target.hasAttribute(DATA_DROPDOWN) - ); -}; - -module.exports = { - toDataCamelCase: toDataCamelCase, - t: t, - camelize: camelize, - closest: closest, - isDropDownParts: isDropDownParts, -}; - -},{"./constants":1}],11:[function(require,module,exports){ -module.exports = function(callback) { - return (function() { - callback(this); - }).call(null); -}; - -},{}]},{},[8])(8) -}); +/***/ }) +/******/ ]); +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c","webpack:///./src/constants.js","webpack:///./~/custom-event-polyfill/custom-event-polyfill.js","webpack:///./src/hook.js","webpack:///./src/utils.js","webpack:///./src/droplab.js","webpack:///./src/keyboard.js","webpack:///./src/dropdown.js","webpack:///./src/hook_button.js","webpack:///./src/hook_input.js","webpack:///./src/index.js"],"names":["DATA_TRIGGER","DATA_DROPDOWN","SELECTED_CLASS","ACTIVE_CLASS","constants","Hook","trigger","list","plugins","config","type","event","id","Object","assign","prototype","addEvents","constructor","utils","toCamelCase","attr","camelize","split","slice","join","t","s","d","p","hasOwnProperty","call","replace","RegExp","str","letter","index","toLowerCase","toUpperCase","closest","thisTag","stopTag","tagName","parentNode","isDropDownParts","target","hasAttribute","DropLab","hook","ready","hooks","queuedData","eventWrapper","loadStatic","addHook","init","dropdownTriggers","apply","document","querySelectorAll","addHooks","addData","args","arguments","applyArgs","setData","destroy","forEach","removeEvents","methodName","push","_addData","data","_processData","_setData","Array","isArray","documentClicked","bind","addEventListener","e","hide","removeEventListener","changeHookList","availableTrigger","getElementById","i","dataset","dropdownActive","splice","availableHook","querySelector","availableList","Element","HookObject","setConfig","obj","fireReady","readyEvent","CustomEvent","detail","dropdown","dispatchEvent","currentKey","currentFocus","isUpArrow","isDownArrow","removeHighlight","itemElements","listItems","length","listItem","classList","remove","style","display","setMenuForArrows","currentIndex","el","filterDropdownEl","add","filterDropdownBottom","offsetHeight","elOffsetTop","offsetTop","scrollTop","mousedown","show","selectItem","currentItem","listEvent","selected","keydown","typedOn","which","key","DropDown","hidden","items","getItems","initTemplateString","initialState","innerHTML","templateString","outerHTML","clickEvent","addSelectedClass","preventDefault","removeSelectedClasses","item","toggle","render","concat","children","map","renderChildren","renderableList","html","template","createElement","setImagesSrc","firstChild","droplab_hidden","images","image","src","getAttribute","removeAttribute","HookButton","addPlugins","create","plugin","clicked","buttonEvent","bubbles","cancelable","restoreInitialState","removePlugins","HookInput","input","keyup","hasRemovedEvents","inputEvent","text","value","mouseEvent","keyEvent","eventName","keyboard","setup","window"],"mappings":"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","file":"./dist/droplab.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 9);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","const DATA_TRIGGER = 'data-dropdown-trigger';\nconst DATA_DROPDOWN = 'data-dropdown';\nconst SELECTED_CLASS = 'droplab-item-selected';\nconst ACTIVE_CLASS = 'droplab-item-active';\n\nconst constants = {\n  DATA_TRIGGER,\n  DATA_DROPDOWN,\n  SELECTED_CLASS,\n  ACTIVE_CLASS,\n};\n\nexport default constants;\n\n\n\n// WEBPACK FOOTER //\n// ./src/constants.js","// Polyfill for creating CustomEvents on IE9/10/11\n\n// code pulled from:\n// https://github.com/d4tocchini/customevent-polyfill\n// https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent#Polyfill\n\ntry {\n    var ce = new window.CustomEvent('test');\n    ce.preventDefault();\n    if (ce.defaultPrevented !== true) {\n        // IE has problems with .preventDefault() on custom events\n        // http://stackoverflow.com/questions/23349191\n        throw new Error('Could not prevent default');\n    }\n} catch(e) {\n  var CustomEvent = function(event, params) {\n    var evt, origPrevent;\n    params = params || {\n      bubbles: false,\n      cancelable: false,\n      detail: undefined\n    };\n\n    evt = document.createEvent(\"CustomEvent\");\n    evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);\n    origPrevent = evt.preventDefault;\n    evt.preventDefault = function () {\n      origPrevent.call(this);\n      try {\n        Object.defineProperty(this, 'defaultPrevented', {\n          get: function () {\n            return true;\n          }\n        });\n      } catch(e) {\n        this.defaultPrevented = true;\n      }\n    };\n    return evt;\n  };\n\n  CustomEvent.prototype = window.Event.prototype;\n  window.CustomEvent = CustomEvent; // expose definition to window\n}\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./~/custom-event-polyfill/custom-event-polyfill.js\n// module id = 1\n// module chunks = 0","import DropDown from './dropdown';\n\nvar Hook = function(trigger, list, plugins, config){\n  this.trigger = trigger;\n  this.list = new DropDown(list);\n  this.type = 'Hook';\n  this.event = 'click';\n  this.plugins = plugins || [];\n  this.config = config || {};\n  this.id = trigger.id;\n};\n\nObject.assign(Hook.prototype, {\n\n  addEvents: function(){},\n\n  constructor: Hook,\n});\n\nexport default Hook;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook.js","import constants from './constants';\n\nconst { DATA_TRIGGER, DATA_DROPDOWN } = constants;\n\nconst utils = {\n  toCamelCase(attr) {\n    return this.camelize(attr.split('-').slice(1).join(' '));\n  },\n\n  t(s, d) {\n    for (const p in d) {\n      if (Object.prototype.hasOwnProperty.call(d, p)) {\n        s = s.replace(new RegExp(`{{${p}}}`, 'g'), d[p]);\n      }\n    }\n    return s;\n  },\n\n  camelize(str) {\n    return str.replace(/(?:^\\w|[A-Z]|\\b\\w)/g, (letter, index) => {\n      return index === 0 ? letter.toLowerCase() : letter.toUpperCase();\n    }).replace(/\\s+/g, '');\n  },\n\n  closest(thisTag, stopTag) {\n    while (thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML') {\n      thisTag = thisTag.parentNode;\n    }\n    return thisTag;\n  },\n\n  isDropDownParts(target) {\n    if (!target || target.tagName === 'HTML') return false;\n    return target.hasAttribute(DATA_TRIGGER) || target.hasAttribute(DATA_DROPDOWN);\n  },\n};\n\n\nexport default utils;\n\n\n\n// WEBPACK FOOTER //\n// ./src/utils.js","import 'custom-event-polyfill';\nimport HookButton from './hook_button';\nimport HookInput from './hook_input';\nimport utils from './utils';\nimport constants from './constants';\nconst DATA_TRIGGER = constants.DATA_TRIGGER;\n\nexport default function () {\n  var DropLab = function(hook, list) {\n    if (!this instanceof DropLab) return new DropLab(hook);\n\n    this.ready = false;\n    this.hooks = [];\n    this.queuedData = [];\n    this.config = {};\n\n    this.eventWrapper = {};\n\n    if (!hook) return this.loadStatic();\n    this.addHook(hook, list);\n    this.init();\n  };\n\n  Object.assign(DropLab.prototype, {\n    loadStatic: function(){\n      var dropdownTriggers = [].slice.apply(document.querySelectorAll(`[${DATA_TRIGGER}]`));\n      this.addHooks(dropdownTriggers).init();\n    },\n\n    addData: function () {\n      var args = [].slice.apply(arguments);\n      this.applyArgs(args, '_addData');\n    },\n\n    setData: function() {\n      var args = [].slice.apply(arguments);\n      this.applyArgs(args, '_setData');\n    },\n\n    destroy: function() {\n      this.hooks.forEach(hook => hook.destroy());\n      this.hooks = [];\n      this.removeEvents();\n    },\n\n    applyArgs: function(args, methodName) {\n      if (this.ready) return this[methodName].apply(this, args);\n\n      this.queuedData = this.queuedData || [];\n      this.queuedData.push(args);\n    },\n\n    _addData: function(trigger, data) {\n      this._processData(trigger, data, 'addData');\n    },\n\n    _setData: function(trigger, data) {\n      this._processData(trigger, data, 'setData');\n    },\n\n    _processData: function(trigger, data, methodName) {\n      this.hooks.forEach((hook) => {\n        if (Array.isArray(trigger)) hook.list[methodName](trigger);\n\n        if (hook.trigger.id === trigger) hook.list[methodName](data);\n      });\n    },\n\n    addEvents: function() {\n      this.eventWrapper.documentClicked = this.documentClicked.bind(this)\n      document.addEventListener('click', this.eventWrapper.documentClicked);\n    },\n\n    documentClicked: function(e) {\n      let thisTag = e.target;\n\n      if (thisTag.tagName !== 'UL') thisTag = utils.closest(thisTag, 'UL');\n      if (utils.isDropDownParts(thisTag, this.hooks) || utils.isDropDownParts(e.target, this.hooks)) return;\n\n      this.hooks.forEach(hook => hook.list.hide());\n    },\n\n    removeEvents: function(){\n      document.removeEventListener('click', this.eventWrapper.documentClicked);\n    },\n\n    changeHookList: function(trigger, list, plugins, config) {\n      const availableTrigger =  typeof trigger === 'string' ? document.getElementById(trigger) : trigger;\n\n\n      this.hooks.forEach((hook, i) => {\n        hook.list.list.dataset.dropdownActive = false;\n\n        if (hook.trigger !== availableTrigger) return;\n\n        hook.destroy();\n        this.hooks.splice(i, 1);\n        this.addHook(availableTrigger, list, plugins, config);\n      });\n    },\n\n    addHook: function(hook, list, plugins, config) {\n      const availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook;\n      let availableList;\n\n      if (typeof list === 'string') {\n        availableList = document.querySelector(list);\n      } else if (list instanceof Element) {\n        availableList = list;\n      } else {\n        availableList = document.querySelector(hook.dataset[utils.toCamelCase(DATA_TRIGGER)]);\n      }\n\n      availableList.dataset.dropdownActive = true;\n\n      const HookObject = availableHook.tagName === 'INPUT' ? HookInput : HookButton;\n      this.hooks.push(new HookObject(availableHook, availableList, plugins, config));\n\n      return this;\n    },\n\n    addHooks: function(hooks, plugins, config) {\n      hooks.forEach(hook => this.addHook(hook, null, plugins, config));\n      return this;\n    },\n\n    setConfig: function(obj){\n      this.config = obj;\n    },\n\n    fireReady: function() {\n      const readyEvent = new CustomEvent('ready.dl', {\n        detail: {\n          dropdown: this,\n        },\n      });\n      document.dispatchEvent(readyEvent);\n\n      this.ready = true;\n    },\n\n    init: function () {\n      this.addEvents();\n\n      this.fireReady();\n\n      this.queuedData.forEach(data => this.addData(data));\n      this.queuedData = [];\n\n      return this;\n    },\n  });\n\n  return DropLab;\n};\n\n\n\n// WEBPACK FOOTER //\n// ./src/droplab.js","import constants from './constants';\n\nexport default function () {\n  var currentKey;\n  var currentFocus;\n  var isUpArrow = false;\n  var isDownArrow = false;\n  var removeHighlight = function removeHighlight(list) {\n    var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0);\n    var listItems = [];\n    for(var i = 0; i < itemElements.length; i++) {\n      var listItem = itemElements[i];\n      listItem.classList.remove(constants.ACTIVE_CLASS);\n\n      if (listItem.style.display !== 'none') {\n        listItems.push(listItem);\n      }\n    }\n    return listItems;\n  };\n\n  var setMenuForArrows = function setMenuForArrows(list) {\n    var listItems = removeHighlight(list);\n    if(list.currentIndex>0){\n      if(!listItems[list.currentIndex-1]){\n        list.currentIndex = list.currentIndex-1;\n      }\n\n      if (listItems[list.currentIndex-1]) {\n        var el = listItems[list.currentIndex-1];\n        var filterDropdownEl = el.closest('.filter-dropdown');\n        el.classList.add(constants.ACTIVE_CLASS);\n\n        if (filterDropdownEl) {\n          var filterDropdownBottom = filterDropdownEl.offsetHeight;\n          var elOffsetTop = el.offsetTop - 30;\n\n          if (elOffsetTop > filterDropdownBottom) {\n            filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom;\n          }\n        }\n      }\n    }\n  };\n\n  var mousedown = function mousedown(e) {\n    var list = e.detail.hook.list;\n    removeHighlight(list);\n    list.show();\n    list.currentIndex = 0;\n    isUpArrow = false;\n    isDownArrow = false;\n  };\n  var selectItem = function selectItem(list) {\n    var listItems = removeHighlight(list);\n    var currentItem = listItems[list.currentIndex-1];\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: list,\n        selected: currentItem,\n        data: currentItem.dataset,\n      },\n    });\n    list.list.dispatchEvent(listEvent);\n    list.hide();\n  }\n\n  var keydown = function keydown(e){\n    var typedOn = e.target;\n    var list = e.detail.hook.list;\n    var currentIndex = list.currentIndex;\n    isUpArrow = false;\n    isDownArrow = false;\n\n    if(e.detail.which){\n      currentKey = e.detail.which;\n      if(currentKey === 13){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 38) {\n        isUpArrow = true;\n      }\n      if(currentKey === 40) {\n        isDownArrow = true;\n      }\n    } else if(e.detail.key) {\n      currentKey = e.detail.key;\n      if(currentKey === 'Enter'){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 'ArrowUp') {\n        isUpArrow = true;\n      }\n      if(currentKey === 'ArrowDown') {\n        isDownArrow = true;\n      }\n    }\n    if(isUpArrow){ currentIndex--; }\n    if(isDownArrow){ currentIndex++; }\n    if(currentIndex < 0){ currentIndex = 0; }\n    list.currentIndex = currentIndex;\n    setMenuForArrows(e.detail.hook.list);\n  };\n\n  document.addEventListener('mousedown.dl', mousedown);\n  document.addEventListener('keydown.dl', keydown);\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/keyboard.js","import 'custom-event-polyfill';\nimport utils from './utils';\nimport constants from '../src/constants';\n\nvar DropDown = function(list) {\n  this.currentIndex = 0;\n  this.hidden = true;\n  this.list = typeof list === 'string' ? document.querySelector(list) : list;\n  this.items = [];\n\n  this.eventWrapper = {};\n\n  this.getItems();\n  this.initTemplateString();\n  this.addEvents();\n\n  this.initialState = list.innerHTML;\n};\n\nObject.assign(DropDown.prototype, {\n  getItems: function() {\n    this.items = [].slice.call(this.list.querySelectorAll('li'));\n    return this.items;\n  },\n\n  initTemplateString: function() {\n    var items = this.items || this.getItems();\n\n    var templateString = '';\n    if (items.length > 0) templateString = items[items.length - 1].outerHTML;\n    this.templateString = templateString;\n\n    return this.templateString;\n  },\n\n  clickEvent: function(e) {\n    var selected = utils.closest(e.target, 'LI');\n    if (!selected) return;\n\n    this.addSelectedClass(selected);\n\n    e.preventDefault();\n    this.hide();\n\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: this,\n        selected: selected,\n        data: e.target.dataset,\n      },\n    });\n    this.list.dispatchEvent(listEvent);\n  },\n\n  addSelectedClass: function (selected) {\n    this.removeSelectedClasses();\n    selected.classList.add(constants.SELECTED_CLASS);\n  },\n\n  removeSelectedClasses: function () {\n    const items = this.items || this.getItems();\n\n    items.forEach((item) => {\n      item.classList.remove(constants.SELECTED_CLASS)\n    });\n  },\n\n  addEvents: function() {\n    this.eventWrapper.clickEvent = this.clickEvent.bind(this)\n    this.list.addEventListener('click', this.eventWrapper.clickEvent);\n  },\n\n  toggle: function() {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  setData: function(data) {\n    this.data = data;\n    this.render(data);\n  },\n\n  addData: function(data) {\n    this.data = (this.data || []).concat(data);\n    this.render(this.data);\n  },\n\n  render: function(data) {\n    const children = data ? data.map(this.renderChildren.bind(this)) : [];\n    const renderableList = this.list.querySelector('ul[data-dynamic]') || this.list;\n\n    renderableList.innerHTML = children.join('');\n  },\n\n  renderChildren: function(data) {\n    var html = utils.t(this.templateString, data);\n    var template = document.createElement('div');\n\n    template.innerHTML = html;\n    this.setImagesSrc(template);\n    template.firstChild.style.display = data.droplab_hidden ? 'none' : 'block';\n\n    return template.firstChild.outerHTML;\n  },\n\n  setImagesSrc: function(template) {\n    const images = [].slice.call(template.querySelectorAll('img[data-src]'));\n\n    images.forEach((image) => {\n      image.src = image.getAttribute('data-src');\n      image.removeAttribute('data-src');\n    });\n  },\n\n  show: function() {\n    if (!this.hidden) return;\n    this.list.style.display = 'block';\n    this.currentIndex = 0;\n    this.hidden = false;\n  },\n\n  hide: function() {\n    if (this.hidden) return;\n    this.list.style.display = 'none';\n    this.currentIndex = 0;\n    this.hidden = true;\n  },\n\n  toggle: function () {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  destroy: function() {\n    this.hide();\n    this.list.removeEventListener('click', this.eventWrapper.clickEvent);\n  }\n});\n\nexport default DropDown;\n\n\n\n// WEBPACK FOOTER //\n// ./src/dropdown.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookButton = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'button';\n  this.event = 'click';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nHookButton.prototype = Object.create(Hook.prototype);\n\nObject.assign(HookButton.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  clicked: function(e){\n    var buttonEvent = new CustomEvent('click.dl', {\n      detail: {\n        hook: this,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(buttonEvent);\n\n    this.list.toggle();\n  },\n\n  addEvents: function(){\n    this.eventWrapper.clicked = this.clicked.bind(this);\n    this.trigger.addEventListener('click', this.eventWrapper.clicked);\n  },\n\n  removeEvents: function(){\n    this.trigger.removeEventListener('click', this.eventWrapper.clicked);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n  },\n\n  constructor: HookButton,\n});\n\n\nexport default HookButton;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_button.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookInput = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'input';\n  this.event = 'input';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nObject.assign(HookInput.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  addEvents: function(){\n    this.eventWrapper.mousedown = this.mousedown.bind(this);\n    this.eventWrapper.input = this.input.bind(this);\n    this.eventWrapper.keyup = this.keyup.bind(this);\n    this.eventWrapper.keydown = this.keydown.bind(this);\n\n    this.trigger.addEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.addEventListener('input', this.eventWrapper.input);\n    this.trigger.addEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.addEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  removeEvents: function() {\n    this.hasRemovedEvents = true;\n\n    this.trigger.removeEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.removeEventListener('input', this.eventWrapper.input);\n    this.trigger.removeEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.removeEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  input: function(e) {\n    if(this.hasRemovedEvents) return;\n\n    this.list.show();\n\n    const inputEvent = new CustomEvent('input.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(inputEvent);\n  },\n\n  mousedown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    const mouseEvent = new CustomEvent('mousedown.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(mouseEvent);\n  },\n\n  keyup: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keyup.dl');\n  },\n\n  keydown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keydown.dl');\n  },\n\n  keyEvent: function(e, eventName) {\n    this.list.show();\n\n    const keyEvent = new CustomEvent(eventName, {\n      detail: {\n        hook: this,\n        text: e.target.value,\n        which: e.which,\n        key: e.key,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(keyEvent);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n\n    this.list.destroy();\n  }\n});\n\nexport default HookInput;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_input.js","import DropLab from './droplab';\nimport constants from './constants';\nimport Keyboard from './keyboard';\n\nconst DATA_TRIGGER = constants.DATA_TRIGGER;\nconst keyboard = Keyboard();\n\nconst setup = function () {\n  window.DropLab = DropLab();\n};\n\nsetup();\n\nexport default setup\n\n\n\n// WEBPACK FOOTER //\n// ./src/index.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/droplab_ajax.js b/app/assets/javascripts/droplab/droplab_ajax.js deleted file mode 100644 index 020f8b4ac65..00000000000 --- a/app/assets/javascripts/droplab/droplab_ajax.js +++ /dev/null @@ -1,103 +0,0 @@ -/* eslint-disable */ -(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g=(g.droplab||(g.droplab = {}));g=(g.ajax||(g.ajax = {}));g=(g.datasource||(g.datasource = {}));g.js = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o -1; - var focusEvent = e.type === 'focus'; - - if (invalidKeyPressed || this.loading) { - return; - } - - if (this.timeout) { - clearTimeout(this.timeout); - } - - this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200); - }, - - trigger: function trigger(getEntireList) { - var config = this.hook.config.droplabAjaxFilter; - var searchValue = this.trigger.value; - - if (!config || !config.endpoint || !config.searchKey) { - return; - } - - if (config.searchValueFunction) { - searchValue = config.searchValueFunction(); - } - - if (config.loadingTemplate && this.hook.list.data === undefined || - this.hook.list.data.length === 0) { - var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); - - var loadingTemplate = document.createElement('div'); - loadingTemplate.innerHTML = config.loadingTemplate; - loadingTemplate.setAttribute('data-loading-template', true); - - this.listTemplate = dynamicList.outerHTML; - dynamicList.outerHTML = loadingTemplate.outerHTML; - } - - if (getEntireList) { - searchValue = ''; - } - - if (config.searchKey === searchValue) { - return this.list.show(); - } - - this.loading = true; - - var params = config.params || {}; - params[config.searchKey] = searchValue; - var self = this; - self.cache = self.cache || {}; - var url = config.endpoint + this.buildParams(params); - var urlCachedData = self.cache[url]; - - if (urlCachedData) { - self._loadData(urlCachedData, config, self); - } else { - this._loadUrlData(url) - .then(function(data) { - self._loadData(data, config, self); - }, function(xhrError) { - // TODO: properly handle errors due to XHR cancellation - return; - }); - } - }, - - _loadUrlData: function _loadUrlData(url) { - var self = this; - return new Promise(function(resolve, reject) { - var xhr = new XMLHttpRequest; - xhr.open('GET', url, true); - xhr.onreadystatechange = function () { - if(xhr.readyState === XMLHttpRequest.DONE) { - if (xhr.status === 200) { - var data = JSON.parse(xhr.responseText); - self.cache[url] = data; - return resolve(data); - } else { - return reject([xhr.responseText, xhr.status]); - } - } - }; - xhr.send(); - }); - }, - - _loadData: function _loadData(data, config, self) { - if (config.loadingTemplate && self.hook.list.data === undefined || - self.hook.list.data.length === 0) { - const dataLoadingTemplate = self.hook.list.list.querySelector('[data-loading-template]'); - - if (dataLoadingTemplate) { - dataLoadingTemplate.outerHTML = self.listTemplate; - } - } - - if (!self.destroyed) { - var hookListChildren = self.hook.list.list.children; - var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic'); - - if (onlyDynamicList && data.length === 0) { - self.hook.list.hide(); - } - - self.hook.list.setData.call(self.hook.list, data); - } - self.notLoading(); - self.hook.list.currentIndex = 0; - }, - - buildParams: function(params) { - if (!params) return ''; - var paramsArray = Object.keys(params).map(function(param) { - return param + '=' + (params[param] || ''); - }); - return '?' + paramsArray.join('&'); - }, - - destroy: function destroy() { - if (this.timeout) { - clearTimeout(this.timeout); - } - - this.destroyed = true; - - this.hook.trigger.removeEventListener('keydown.dl', this.debounceTriggerWrapper); - this.hook.trigger.removeEventListener('focus', this.debounceTriggerWrapper); - } - }; -}); -},{"../window":2}],2:[function(require,module,exports){ -module.exports = function(callback) { - return (function() { - callback(this); - }).call(null); -}; - -},{}]},{},[1])(1) -}); diff --git a/app/assets/javascripts/droplab/droplab_filter.js b/app/assets/javascripts/droplab/droplab_filter.js deleted file mode 100644 index 9b40a3f20a4..00000000000 --- a/app/assets/javascripts/droplab/droplab_filter.js +++ /dev/null @@ -1,74 +0,0 @@ -/* eslint-disable */ -(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g=(g.droplab||(g.droplab = {}));g=(g.filter||(g.filter = {}));g.js = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o -1; + var focusEvent = e.type === 'focus'; + if (invalidKeyPressed || this.loading) { + return; + } + if (this.timeout) { + clearTimeout(this.timeout); + } + this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200); + }, + + trigger: function trigger(getEntireList) { + var config = this.hook.config.droplabAjaxFilter; + var searchValue = this.trigger.value; + if (!config || !config.endpoint || !config.searchKey) { + return; + } + if (config.searchValueFunction) { + searchValue = config.searchValueFunction(); + } + if (config.loadingTemplate && this.hook.list.data === undefined || this.hook.list.data.length === 0) { + var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); + var loadingTemplate = document.createElement('div'); + loadingTemplate.innerHTML = config.loadingTemplate; + loadingTemplate.setAttribute('data-loading-template', true); + this.listTemplate = dynamicList.outerHTML; + dynamicList.outerHTML = loadingTemplate.outerHTML; + } + if (getEntireList) { + searchValue = ''; + } + if (config.searchKey === searchValue) { + return this.list.show(); + } + this.loading = true; + var params = config.params || {}; + params[config.searchKey] = searchValue; + var self = this; + self.cache = self.cache || {}; + var url = config.endpoint + this.buildParams(params); + var urlCachedData = self.cache[url]; + if (urlCachedData) { + self._loadData(urlCachedData, config, self); + } else { + this._loadUrlData(url).then(function (data) { + self._loadData(data, config, self); + }); + } + }, + + _loadUrlData: function _loadUrlData(url) { + var self = this; + return new Promise(function (resolve, reject) { + var xhr = new XMLHttpRequest(); + xhr.open('GET', url, true); + xhr.onreadystatechange = function () { + if (xhr.readyState === XMLHttpRequest.DONE) { + if (xhr.status === 200) { + var data = JSON.parse(xhr.responseText); + self.cache[url] = data; + return resolve(data); + } else { + return reject([xhr.responseText, xhr.status]); + } + } + }; + xhr.send(); + }); + }, + + _loadData: function _loadData(data, config, self) { + var list = self.hook.list; + if (config.loadingTemplate && list.data === undefined || list.data.length === 0) { + var dataLoadingTemplate = list.list.querySelector('[data-loading-template]'); + if (dataLoadingTemplate) { + dataLoadingTemplate.outerHTML = self.listTemplate; + } + } + if (!self.destroyed) { + var hookListChildren = list.list.children; + var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic'); + if (onlyDynamicList && data.length === 0) { + list.hide(); + } + list.setData.call(list, data); + } + self.notLoading(); + list.currentIndex = 0; + }, + + buildParams: function buildParams(params) { + if (!params) return ''; + var paramsArray = Object.keys(params).map(function (param) { + return param + '=' + (params[param] || ''); + }); + return '?' + paramsArray.join('&'); + }, + + destroy: function destroy() { + if (this.timeout) { + clearTimeout(this.timeout); + } + + this.destroyed = true; + this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceTrigger); + this.hook.trigger.removeEventListener('focus', this.eventWrapper.debounceTrigger); + } +}; + +window.droplabAjaxFilter = droplabAjaxFilter; + +exports.default = droplabAjaxFilter; + +/***/ }) + +/******/ }); +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c?ec5f**","webpack:///./src/plugins/ajax_filter.js"],"names":["droplabAjaxFilter","init","hook","destroyed","notLoading","eventWrapper","debounceTrigger","bind","trigger","addEventListener","loading","e","NON_CHARACTER_KEYS","invalidKeyPressed","indexOf","detail","which","keyCode","focusEvent","type","timeout","clearTimeout","setTimeout","getEntireList","config","searchValue","value","endpoint","searchKey","searchValueFunction","loadingTemplate","list","data","undefined","length","dynamicList","querySelector","document","createElement","innerHTML","setAttribute","listTemplate","outerHTML","show","params","self","cache","url","buildParams","urlCachedData","_loadData","_loadUrlData","then","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","JSON","parse","responseText","send","dataLoadingTemplate","hookListChildren","children","onlyDynamicList","hasAttribute","hide","setData","call","currentIndex","paramsArray","Object","keys","map","param","join","destroy","removeEventListener","window"],"mappings":";AAAA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;;AAEA;AACA,mDAA2C,cAAc;;AAEzD;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAK;AACL;AACA;;AAEA;AACA;AACA;AACA,mCAA2B,0BAA0B,EAAE;AACvD,yCAAiC,eAAe;AAChD;AACA;AACA;;AAEA;AACA,8DAAsD,+DAA+D;;AAErH;AACA;;AAEA;AACA;;;;;;;;;;;;;;AChEA,IAAMA,oBAAoB;AACxBC,QAAM,cAASC,IAAT,EAAe;AACnB,SAAKC,SAAL,GAAiB,KAAjB;AACA,SAAKD,IAAL,GAAYA,IAAZ;AACA,SAAKE,UAAL;;AAEA,SAAKC,YAAL,GAAoB,EAApB;AACA,SAAKA,YAAL,CAAkBC,eAAlB,GAAoC,KAAKA,eAAL,CAAqBC,IAArB,CAA0B,IAA1B,CAApC;AACA,SAAKL,IAAL,CAAUM,OAAV,CAAkBC,gBAAlB,CAAmC,YAAnC,EAAiD,KAAKJ,YAAL,CAAkBC,eAAnE;AACA,SAAKJ,IAAL,CAAUM,OAAV,CAAkBC,gBAAlB,CAAmC,OAAnC,EAA4C,KAAKJ,YAAL,CAAkBC,eAA9D;;AAEA,SAAKE,OAAL,CAAa,IAAb;AACD,GAZuB;;AAcxBJ,cAAY,SAASA,UAAT,GAAsB;AAChC,SAAKM,OAAL,GAAe,KAAf;AACD,GAhBuB;;AAkBxBJ,mBAAiB,SAASA,eAAT,CAAyBK,CAAzB,EAA4B;AAC3C,QAAIC,qBAAqB,CAAC,EAAD,EAAK,EAAL,EAAS,EAAT,EAAa,EAAb,EAAiB,EAAjB,EAAqB,EAArB,EAAyB,EAAzB,EAA6B,EAA7B,EAAiC,EAAjC,EAAqC,EAArC,CAAzB;AACA,QAAIC,oBAAoBD,mBAAmBE,OAAnB,CAA2BH,EAAEI,MAAF,CAASC,KAAT,IAAkBL,EAAEI,MAAF,CAASE,OAAtD,IAAiE,CAAC,CAA1F;AACA,QAAIC,aAAaP,EAAEQ,IAAF,KAAW,OAA5B;AACA,QAAIN,qBAAqB,KAAKH,OAA9B,EAAuC;AACrC;AACD;AACD,QAAI,KAAKU,OAAT,EAAkB;AAChBC,mBAAa,KAAKD,OAAlB;AACD;AACD,SAAKA,OAAL,GAAeE,WAAW,KAAKd,OAAL,CAAaD,IAAb,CAAkB,IAAlB,EAAwBW,UAAxB,CAAX,EAAgD,GAAhD,CAAf;AACD,GA7BuB;;AA+BxBV,WAAS,SAASA,OAAT,CAAiBe,aAAjB,EAAgC;AACvC,QAAIC,SAAS,KAAKtB,IAAL,CAAUsB,MAAV,CAAiBxB,iBAA9B;AACA,QAAIyB,cAAc,KAAKjB,OAAL,CAAakB,KAA/B;AACA,QAAI,CAACF,MAAD,IAAW,CAACA,OAAOG,QAAnB,IAA+B,CAACH,OAAOI,SAA3C,EAAsD;AACpD;AACD;AACD,QAAIJ,OAAOK,mBAAX,EAAgC;AAC9BJ,oBAAcD,OAAOK,mBAAP,EAAd;AACD;AACD,QAAIL,OAAOM,eAAP,IAA0B,KAAK5B,IAAL,CAAU6B,IAAV,CAAeC,IAAf,KAAwBC,SAAlD,IACF,KAAK/B,IAAL,CAAU6B,IAAV,CAAeC,IAAf,CAAoBE,MAApB,KAA+B,CADjC,EACoC;AAClC,UAAIC,cAAc,KAAKjC,IAAL,CAAU6B,IAAV,CAAeA,IAAf,CAAoBK,aAApB,CAAkC,gBAAlC,CAAlB;AACA,UAAIN,kBAAkBO,SAASC,aAAT,CAAuB,KAAvB,CAAtB;AACAR,sBAAgBS,SAAhB,GAA4Bf,OAAOM,eAAnC;AACAA,sBAAgBU,YAAhB,CAA6B,uBAA7B,EAAsD,IAAtD;AACA,WAAKC,YAAL,GAAoBN,YAAYO,SAAhC;AACAP,kBAAYO,SAAZ,GAAwBZ,gBAAgBY,SAAxC;AACD;AACD,QAAInB,aAAJ,EAAmB;AACjBE,oBAAc,EAAd;AACD;AACD,QAAID,OAAOI,SAAP,KAAqBH,WAAzB,EAAsC;AACpC,aAAO,KAAKM,IAAL,CAAUY,IAAV,EAAP;AACD;AACD,SAAKjC,OAAL,GAAe,IAAf;AACA,QAAIkC,SAASpB,OAAOoB,MAAP,IAAiB,EAA9B;AACAA,WAAOpB,OAAOI,SAAd,IAA2BH,WAA3B;AACA,QAAIoB,OAAO,IAAX;AACAA,SAAKC,KAAL,GAAaD,KAAKC,KAAL,IAAc,EAA3B;AACA,QAAIC,MAAMvB,OAAOG,QAAP,GAAkB,KAAKqB,WAAL,CAAiBJ,MAAjB,CAA5B;AACA,QAAIK,gBAAgBJ,KAAKC,KAAL,CAAWC,GAAX,CAApB;AACA,QAAIE,aAAJ,EAAmB;AACjBJ,WAAKK,SAAL,CAAeD,aAAf,EAA8BzB,MAA9B,EAAsCqB,IAAtC;AACD,KAFD,MAEO;AACL,WAAKM,YAAL,CAAkBJ,GAAlB,EACGK,IADH,CACQ,UAASpB,IAAT,EAAe;AACnBa,aAAKK,SAAL,CAAelB,IAAf,EAAqBR,MAArB,EAA6BqB,IAA7B;AACD,OAHH;AAID;AACF,GAtEuB;;AAwExBM,gBAAc,SAASA,YAAT,CAAsBJ,GAAtB,EAA2B;AACvC,QAAIF,OAAO,IAAX;AACA,WAAO,IAAIQ,OAAJ,CAAY,UAASC,OAAT,EAAkBC,MAAlB,EAA0B;AAC3C,UAAIC,MAAM,IAAIC,cAAJ,EAAV;AACAD,UAAIE,IAAJ,CAAS,KAAT,EAAgBX,GAAhB,EAAqB,IAArB;AACAS,UAAIG,kBAAJ,GAAyB,YAAY;AACnC,YAAGH,IAAII,UAAJ,KAAmBH,eAAeI,IAArC,EAA2C;AACzC,cAAIL,IAAIM,MAAJ,KAAe,GAAnB,EAAwB;AACtB,gBAAI9B,OAAO+B,KAAKC,KAAL,CAAWR,IAAIS,YAAf,CAAX;AACApB,iBAAKC,KAAL,CAAWC,GAAX,IAAkBf,IAAlB;AACA,mBAAOsB,QAAQtB,IAAR,CAAP;AACD,WAJD,MAIO;AACL,mBAAOuB,OAAO,CAACC,IAAIS,YAAL,EAAmBT,IAAIM,MAAvB,CAAP,CAAP;AACD;AACF;AACF,OAVD;AAWAN,UAAIU,IAAJ;AACD,KAfM,CAAP;AAgBD,GA1FuB;;AA4FxBhB,aAAW,SAASA,SAAT,CAAmBlB,IAAnB,EAAyBR,MAAzB,EAAiCqB,IAAjC,EAAuC;AAChD,QAAMd,OAAOc,KAAK3C,IAAL,CAAU6B,IAAvB;AACA,QAAIP,OAAOM,eAAP,IAA0BC,KAAKC,IAAL,KAAcC,SAAxC,IACFF,KAAKC,IAAL,CAAUE,MAAV,KAAqB,CADvB,EAC0B;AACxB,UAAMiC,sBAAsBpC,KAAKA,IAAL,CAAUK,aAAV,CAAwB,yBAAxB,CAA5B;AACA,UAAI+B,mBAAJ,EAAyB;AACvBA,4BAAoBzB,SAApB,GAAgCG,KAAKJ,YAArC;AACD;AACF;AACD,QAAI,CAACI,KAAK1C,SAAV,EAAqB;AACnB,UAAIiE,mBAAmBrC,KAAKA,IAAL,CAAUsC,QAAjC;AACA,UAAIC,kBAAkBF,iBAAiBlC,MAAjB,KAA4B,CAA5B,IAAiCkC,iBAAiB,CAAjB,EAAoBG,YAApB,CAAiC,cAAjC,CAAvD;AACA,UAAID,mBAAmBtC,KAAKE,MAAL,KAAgB,CAAvC,EAA0C;AACxCH,aAAKyC,IAAL;AACD;AACDzC,WAAK0C,OAAL,CAAaC,IAAb,CAAkB3C,IAAlB,EAAwBC,IAAxB;AACD;AACDa,SAAKzC,UAAL;AACA2B,SAAK4C,YAAL,GAAoB,CAApB;AACD,GA/GuB;;AAiHxB3B,eAAa,qBAASJ,MAAT,EAAiB;AAC5B,QAAI,CAACA,MAAL,EAAa,OAAO,EAAP;AACb,QAAIgC,cAAcC,OAAOC,IAAP,CAAYlC,MAAZ,EAAoBmC,GAApB,CAAwB,UAASC,KAAT,EAAgB;AACxD,aAAOA,QAAQ,GAAR,IAAepC,OAAOoC,KAAP,KAAiB,EAAhC,CAAP;AACD,KAFiB,CAAlB;AAGA,WAAO,MAAMJ,YAAYK,IAAZ,CAAiB,GAAjB,CAAb;AACD,GAvHuB;;AAyHxBC,WAAS,SAASA,OAAT,GAAmB;AAC1B,QAAI,KAAK9D,OAAT,EAAkB;AAChBC,mBAAa,KAAKD,OAAlB;AACD;;AAED,SAAKjB,SAAL,GAAiB,IAAjB;AACA,SAAKD,IAAL,CAAUM,OAAV,CAAkB2E,mBAAlB,CAAsC,YAAtC,EAAoD,KAAK9E,YAAL,CAAkBC,eAAtE;AACA,SAAKJ,IAAL,CAAUM,OAAV,CAAkB2E,mBAAlB,CAAsC,OAAtC,EAA+C,KAAK9E,YAAL,CAAkBC,eAAjE;AACD;AAjIuB,CAA1B;;AAoIA8E,OAAOpF,iBAAP,GAA2BA,iBAA3B;;kBAEeA,iB","file":"./dist/plugins/ajax_filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 11);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","const droplabAjaxFilter = {\n  init: function(hook) {\n    this.destroyed = false;\n    this.hook = hook;\n    this.notLoading();\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceTrigger = this.debounceTrigger.bind(this);\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.addEventListener('focus', this.eventWrapper.debounceTrigger);\n\n    this.trigger(true);\n  },\n\n  notLoading: function notLoading() {\n    this.loading = false;\n  },\n\n  debounceTrigger: function debounceTrigger(e) {\n    var NON_CHARACTER_KEYS = [16, 17, 18, 20, 37, 38, 39, 40, 91, 93];\n    var invalidKeyPressed = NON_CHARACTER_KEYS.indexOf(e.detail.which || e.detail.keyCode) > -1;\n    var focusEvent = e.type === 'focus';\n    if (invalidKeyPressed || this.loading) {\n      return;\n    }\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n    this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200);\n  },\n\n  trigger: function trigger(getEntireList) {\n    var config = this.hook.config.droplabAjaxFilter;\n    var searchValue = this.trigger.value;\n    if (!config || !config.endpoint || !config.searchKey) {\n      return;\n    }\n    if (config.searchValueFunction) {\n      searchValue = config.searchValueFunction();\n    }\n    if (config.loadingTemplate && this.hook.list.data === undefined ||\n      this.hook.list.data.length === 0) {\n      var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', true);\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (getEntireList) {\n      searchValue = '';\n    }\n    if (config.searchKey === searchValue) {\n      return this.list.show();\n    }\n    this.loading = true;\n    var params = config.params || {};\n    params[config.searchKey] = searchValue;\n    var self = this;\n    self.cache = self.cache || {};\n    var url = config.endpoint + this.buildParams(params);\n    var urlCachedData = self.cache[url];\n    if (urlCachedData) {\n      self._loadData(urlCachedData, config, self);\n    } else {\n      this._loadUrlData(url)\n        .then(function(data) {\n          self._loadData(data, config, self);\n        });\n    }\n  },\n\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n\n  _loadData: function _loadData(data, config, self) {\n    const list = self.hook.list;\n    if (config.loadingTemplate && list.data === undefined ||\n      list.data.length === 0) {\n      const dataLoadingTemplate = list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) {\n        dataLoadingTemplate.outerHTML = self.listTemplate;\n      }\n    }\n    if (!self.destroyed) {\n      var hookListChildren = list.list.children;\n      var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic');\n      if (onlyDynamicList && data.length === 0) {\n        list.hide();\n      }\n      list.setData.call(list, data);\n    }\n    self.notLoading();\n    list.currentIndex = 0;\n  },\n\n  buildParams: function(params) {\n    if (!params) return '';\n    var paramsArray = Object.keys(params).map(function(param) {\n      return param + '=' + (params[param] || '');\n    });\n    return '?' + paramsArray.join('&');\n  },\n\n  destroy: function destroy() {\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n\n    this.destroyed = true;\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.removeEventListener('focus', this.eventWrapper.debounceTrigger);\n  }\n};\n\nwindow.droplabAjaxFilter = droplabAjaxFilter;\n\nexport default droplabAjaxFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax_filter.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/filter.js b/app/assets/javascripts/droplab/plugins/filter.js new file mode 100644 index 00000000000..183d137b3a3 --- /dev/null +++ b/app/assets/javascripts/droplab/plugins/filter.js @@ -0,0 +1,172 @@ +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) +/******/ return installedModules[moduleId].exports; +/******/ +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // identity function for calling harmony imports with the correct context +/******/ __webpack_require__.i = function(value) { return value; }; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { +/******/ configurable: false, +/******/ enumerable: true, +/******/ get: getter +/******/ }); +/******/ } +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = 12); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ 12: +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +var droplabFilter = { + keydown: function keydown(e) { + var hiddenCount = 0; + var dataHiddenCount = 0; + + var list = e.detail.hook.list; + var data = list.data; + var value = e.detail.hook.trigger.value.toLowerCase(); + var config = e.detail.hook.config.droplabFilter; + var matches = []; + var filterFunction; + // will only work on dynamically set data + if (!data) { + return; + } + + if (config && config.filterFunction && typeof config.filterFunction === 'function') { + filterFunction = config.filterFunction; + } else { + filterFunction = function filterFunction(o) { + // cheap string search + o.droplab_hidden = o[config.template].toLowerCase().indexOf(value) === -1; + return o; + }; + } + + dataHiddenCount = data.filter(function (o) { + return !o.droplab_hidden; + }).length; + + matches = data.map(function (o) { + return filterFunction(o, value); + }); + + hiddenCount = matches.filter(function (o) { + return !o.droplab_hidden; + }).length; + + if (dataHiddenCount !== hiddenCount) { + list.render(matches); + list.currentIndex = 0; + } + }, + + debounceKeydown: function debounceKeydown(e) { + if ([13, // enter + 16, // shift + 17, // ctrl + 18, // alt + 20, // caps lock + 37, // left arrow + 38, // up arrow + 39, // right arrow + 40, // down arrow + 91, // left window + 92, // right window + 93].indexOf(e.detail.which || e.detail.keyCode) > -1) return; + + if (this.timeout) clearTimeout(this.timeout); + this.timeout = setTimeout(this.keydown.bind(this, e), 200); + }, + + init: function init(hook) { + var config = hook.config.droplabFilter; + + if (!config || !config.template) return; + + this.hook = hook; + + this.eventWrapper = {}; + this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this); + + this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown); + }, + + destroy: function destroy() { + this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown); + + var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); + if (this.listTemplate && dynamicList) { + dynamicList.outerHTML = this.listTemplate; + } + } +}; + +window.droplabFilter = droplabFilter; + +exports.default = droplabFilter; + +/***/ }) + +/******/ }); +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c?ec5f*","webpack:///./src/plugins/filter.js"],"names":["droplabFilter","keydown","e","hiddenCount","dataHiddenCount","list","detail","hook","data","value","trigger","toLowerCase","config","matches","filterFunction","o","droplab_hidden","template","indexOf","filter","length","map","render","currentIndex","debounceKeydown","which","keyCode","timeout","clearTimeout","setTimeout","bind","init","eventWrapper","addEventListener","destroy","removeEventListener","dynamicList","querySelector","listTemplate","outerHTML","window"],"mappings":"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","file":"./dist/plugins/filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 12);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","const droplabFilter = {\n  keydown: function(e){\n    var hiddenCount = 0;\n    var dataHiddenCount = 0;\n\n    var list = e.detail.hook.list;\n    var data = list.data;\n    var value = e.detail.hook.trigger.value.toLowerCase();\n    var config = e.detail.hook.config.droplabFilter;\n    var matches = [];\n    var filterFunction;\n    // will only work on dynamically set data\n    if(!data){\n      return;\n    }\n\n    if (config && config.filterFunction && typeof config.filterFunction === 'function') {\n      filterFunction = config.filterFunction;\n    } else {\n      filterFunction = function(o){\n        // cheap string search\n        o.droplab_hidden = o[config.template].toLowerCase().indexOf(value) === -1;\n        return o;\n      };\n    }\n\n    dataHiddenCount = data.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    matches = data.map(function(o) {\n      return filterFunction(o, value);\n    });\n\n    hiddenCount = matches.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    if (dataHiddenCount !== hiddenCount) {\n      list.render(matches);\n      list.currentIndex = 0;\n    }\n  },\n\n  debounceKeydown: function debounceKeydown(e) {\n    if ([\n      13, // enter\n      16, // shift\n      17, // ctrl\n      18, // alt\n      20, // caps lock\n      37, // left arrow\n      38, // up arrow\n      39, // right arrow\n      40, // down arrow\n      91, // left window\n      92, // right window\n      93, // select\n    ].indexOf(e.detail.which || e.detail.keyCode) > -1) return;\n\n    if (this.timeout) clearTimeout(this.timeout);\n    this.timeout = setTimeout(this.keydown.bind(this, e), 200);\n  },\n\n  init: function init(hook) {\n    var config = hook.config.droplabFilter;\n\n    if (!config || !config.template) return;\n\n    this.hook = hook;\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this);\n\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n  },\n\n  destroy: function destroy() {\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nwindow.droplabFilter = droplabFilter;\n\nexport default droplabFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/filter.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/input_setter.js b/app/assets/javascripts/droplab/plugins/input_setter.js new file mode 100644 index 00000000000..ffc9af0476d --- /dev/null +++ b/app/assets/javascripts/droplab/plugins/input_setter.js @@ -0,0 +1,129 @@ +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) +/******/ return installedModules[moduleId].exports; +/******/ +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // identity function for calling harmony imports with the correct context +/******/ __webpack_require__.i = function(value) { return value; }; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { +/******/ configurable: false, +/******/ enumerable: true, +/******/ get: getter +/******/ }); +/******/ } +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = 13); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ 13: +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +var droplabInputSetter = { + init: function init(hook) { + this.hook = hook; + this.config = hook.config.droplabInputSetter || (this.hook.config.droplabInputSetter = {}); + + this.eventWrapper = {}; + + this.addEvents(); + }, + addEvents: function addEvents() { + this.eventWrapper.setInputs = this.setInputs.bind(this); + this.hook.list.list.addEventListener('click.dl', this.eventWrapper.setInputs); + }, + removeEvents: function removeEvents() { + this.hook.list.list.removeEventListener('click.dl', this.eventWrapper.setInputs); + }, + setInputs: function setInputs(e) { + var _this = this; + + var selectedItem = e.detail.selected; + + if (!Array.isArray(this.config)) this.config = [this.config]; + + this.config.forEach(function (config) { + return _this.setInput(config, selectedItem); + }); + }, + setInput: function setInput(config, selectedItem) { + var input = config.input || this.hook.trigger; + var newValue = selectedItem.getAttribute(config.valueAttribute); + + if (input.tagName === 'INPUT') { + input.value = newValue; + } else { + input.textContent = newValue; + } + }, + destroy: function destroy() { + this.removeEvents(); + } +}; + +window.droplabInputSetter = droplabInputSetter; + +exports.default = droplabInputSetter; + +/***/ }) + +/******/ }); +//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vd2VicGFjay9ib290c3RyYXAgZjM3NjcyYjdmNTI4YjQ3MmE0NGM/ZWM1ZiIsIndlYnBhY2s6Ly8vLi9zcmMvcGx1Z2lucy9pbnB1dF9zZXR0ZXIuanMiXSwibmFtZXMiOlsiZHJvcGxhYklucHV0U2V0dGVyIiwiaW5pdCIsImhvb2siLCJjb25maWciLCJldmVudFdyYXBwZXIiLCJhZGRFdmVudHMiLCJzZXRJbnB1dHMiLCJiaW5kIiwibGlzdCIsImFkZEV2ZW50TGlzdGVuZXIiLCJyZW1vdmVFdmVudHMiLCJyZW1vdmVFdmVudExpc3RlbmVyIiwiZSIsInNlbGVjdGVkSXRlbSIsImRldGFpbCIsInNlbGVjdGVkIiwiQXJyYXkiLCJpc0FycmF5IiwiZm9yRWFjaCIsInNldElucHV0IiwiaW5wdXQiLCJ0cmlnZ2VyIiwibmV3VmFsdWUiLCJnZXRBdHRyaWJ1dGUiLCJ2YWx1ZUF0dHJpYnV0ZSIsInRhZ05hbWUiLCJ2YWx1ZSIsInRleHRDb250ZW50IiwiZGVzdHJveSIsIndpbmRvdyJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBO0FBQ0E7O0FBRUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOztBQUVBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBO0FBQ0E7OztBQUdBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBLG1EQUEyQyxjQUFjOztBQUV6RDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBLGFBQUs7QUFDTDtBQUNBOztBQUVBO0FBQ0E7QUFDQTtBQUNBLG1DQUEyQiwwQkFBMEIsRUFBRTtBQUN2RCx5Q0FBaUMsZUFBZTtBQUNoRDtBQUNBO0FBQ0E7O0FBRUE7QUFDQSw4REFBc0QsK0RBQStEOztBQUVySDtBQUNBOztBQUVBO0FBQ0E7Ozs7Ozs7Ozs7Ozs7O0FDaEVBLElBQU1BLHFCQUFxQjtBQUN6QkMsTUFEeUIsZ0JBQ3BCQyxJQURvQixFQUNkO0FBQ1QsU0FBS0EsSUFBTCxHQUFZQSxJQUFaO0FBQ0EsU0FBS0MsTUFBTCxHQUFjRCxLQUFLQyxNQUFMLENBQVlILGtCQUFaLEtBQW1DLEtBQUtFLElBQUwsQ0FBVUMsTUFBVixDQUFpQkgsa0JBQWpCLEdBQXNDLEVBQXpFLENBQWQ7O0FBRUEsU0FBS0ksWUFBTCxHQUFvQixFQUFwQjs7QUFFQSxTQUFLQyxTQUFMO0FBQ0QsR0FSd0I7QUFVekJBLFdBVnlCLHVCQVViO0FBQ1YsU0FBS0QsWUFBTCxDQUFrQkUsU0FBbEIsR0FBOEIsS0FBS0EsU0FBTCxDQUFlQyxJQUFmLENBQW9CLElBQXBCLENBQTlCO0FBQ0EsU0FBS0wsSUFBTCxDQUFVTSxJQUFWLENBQWVBLElBQWYsQ0FBb0JDLGdCQUFwQixDQUFxQyxVQUFyQyxFQUFpRCxLQUFLTCxZQUFMLENBQWtCRSxTQUFuRTtBQUNELEdBYndCO0FBZXpCSSxjQWZ5QiwwQkFlVjtBQUNiLFNBQUtSLElBQUwsQ0FBVU0sSUFBVixDQUFlQSxJQUFmLENBQW9CRyxtQkFBcEIsQ0FBd0MsVUFBeEMsRUFBb0QsS0FBS1AsWUFBTCxDQUFrQkUsU0FBdEU7QUFDRCxHQWpCd0I7QUFtQnpCQSxXQW5CeUIscUJBbUJmTSxDQW5CZSxFQW1CWjtBQUFBOztBQUNYLFFBQU1DLGVBQWVELEVBQUVFLE1BQUYsQ0FBU0MsUUFBOUI7O0FBRUEsUUFBSSxDQUFDQyxNQUFNQyxPQUFOLENBQWMsS0FBS2QsTUFBbkIsQ0FBTCxFQUFpQyxLQUFLQSxNQUFMLEdBQWMsQ0FBQyxLQUFLQSxNQUFOLENBQWQ7O0FBRWpDLFNBQUtBLE1BQUwsQ0FBWWUsT0FBWixDQUFvQjtBQUFBLGFBQVUsTUFBS0MsUUFBTCxDQUFjaEIsTUFBZCxFQUFzQlUsWUFBdEIsQ0FBVjtBQUFBLEtBQXBCO0FBQ0QsR0F6QndCO0FBMkJ6Qk0sVUEzQnlCLG9CQTJCaEJoQixNQTNCZ0IsRUEyQlJVLFlBM0JRLEVBMkJNO0FBQzdCLFFBQU1PLFFBQVFqQixPQUFPaUIsS0FBUCxJQUFnQixLQUFLbEIsSUFBTCxDQUFVbUIsT0FBeEM7QUFDQSxRQUFNQyxXQUFXVCxhQUFhVSxZQUFiLENBQTBCcEIsT0FBT3FCLGNBQWpDLENBQWpCOztBQUVBLFFBQUlKLE1BQU1LLE9BQU4sS0FBa0IsT0FBdEIsRUFBK0I7QUFDN0JMLFlBQU1NLEtBQU4sR0FBY0osUUFBZDtBQUNELEtBRkQsTUFFTztBQUNMRixZQUFNTyxXQUFOLEdBQW9CTCxRQUFwQjtBQUNEO0FBQ0YsR0FwQ3dCO0FBc0N6Qk0sU0F0Q3lCLHFCQXNDZjtBQUNSLFNBQUtsQixZQUFMO0FBQ0Q7QUF4Q3dCLENBQTNCOztBQTJDQW1CLE9BQU83QixrQkFBUCxHQUE0QkEsa0JBQTVCOztrQkFFZUEsa0IiLCJmaWxlIjoiLi9kaXN0L3BsdWdpbnMvaW5wdXRfc2V0dGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiIFx0Ly8gVGhlIG1vZHVsZSBjYWNoZVxuIFx0dmFyIGluc3RhbGxlZE1vZHVsZXMgPSB7fTtcblxuIFx0Ly8gVGhlIHJlcXVpcmUgZnVuY3Rpb25cbiBcdGZ1bmN0aW9uIF9fd2VicGFja19yZXF1aXJlX18obW9kdWxlSWQpIHtcblxuIFx0XHQvLyBDaGVjayBpZiBtb2R1bGUgaXMgaW4gY2FjaGVcbiBcdFx0aWYoaW5zdGFsbGVkTW9kdWxlc1ttb2R1bGVJZF0pXG4gXHRcdFx0cmV0dXJuIGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdLmV4cG9ydHM7XG5cbiBcdFx0Ly8gQ3JlYXRlIGEgbmV3IG1vZHVsZSAoYW5kIHB1dCBpdCBpbnRvIHRoZSBjYWNoZSlcbiBcdFx0dmFyIG1vZHVsZSA9IGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdID0ge1xuIFx0XHRcdGk6IG1vZHVsZUlkLFxuIFx0XHRcdGw6IGZhbHNlLFxuIFx0XHRcdGV4cG9ydHM6IHt9XG4gXHRcdH07XG5cbiBcdFx0Ly8gRXhlY3V0ZSB0aGUgbW9kdWxlIGZ1bmN0aW9uXG4gXHRcdG1vZHVsZXNbbW9kdWxlSWRdLmNhbGwobW9kdWxlLmV4cG9ydHMsIG1vZHVsZSwgbW9kdWxlLmV4cG9ydHMsIF9fd2VicGFja19yZXF1aXJlX18pO1xuXG4gXHRcdC8vIEZsYWcgdGhlIG1vZHVsZSBhcyBsb2FkZWRcbiBcdFx0bW9kdWxlLmwgPSB0cnVlO1xuXG4gXHRcdC8vIFJldHVybiB0aGUgZXhwb3J0cyBvZiB0aGUgbW9kdWxlXG4gXHRcdHJldHVybiBtb2R1bGUuZXhwb3J0cztcbiBcdH1cblxuXG4gXHQvLyBleHBvc2UgdGhlIG1vZHVsZXMgb2JqZWN0IChfX3dlYnBhY2tfbW9kdWxlc19fKVxuIFx0X193ZWJwYWNrX3JlcXVpcmVfXy5tID0gbW9kdWxlcztcblxuIFx0Ly8gZXhwb3NlIHRoZSBtb2R1bGUgY2FjaGVcbiBcdF9fd2VicGFja19yZXF1aXJlX18uYyA9IGluc3RhbGxlZE1vZHVsZXM7XG5cbiBcdC8vIGlkZW50aXR5IGZ1bmN0aW9uIGZvciBjYWxsaW5nIGhhcm1vbnkgaW1wb3J0cyB3aXRoIHRoZSBjb3JyZWN0IGNvbnRleHRcbiBcdF9fd2VicGFja19yZXF1aXJlX18uaSA9IGZ1bmN0aW9uKHZhbHVlKSB7IHJldHVybiB2YWx1ZTsgfTtcblxuIFx0Ly8gZGVmaW5lIGdldHRlciBmdW5jdGlvbiBmb3IgaGFybW9ueSBleHBvcnRzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQgPSBmdW5jdGlvbihleHBvcnRzLCBuYW1lLCBnZXR0ZXIpIHtcbiBcdFx0aWYoIV9fd2VicGFja19yZXF1aXJlX18ubyhleHBvcnRzLCBuYW1lKSkge1xuIFx0XHRcdE9iamVjdC5kZWZpbmVQcm9wZXJ0eShleHBvcnRzLCBuYW1lLCB7XG4gXHRcdFx0XHRjb25maWd1cmFibGU6IGZhbHNlLFxuIFx0XHRcdFx0ZW51bWVyYWJsZTogdHJ1ZSxcbiBcdFx0XHRcdGdldDogZ2V0dGVyXG4gXHRcdFx0fSk7XG4gXHRcdH1cbiBcdH07XG5cbiBcdC8vIGdldERlZmF1bHRFeHBvcnQgZnVuY3Rpb24gZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBub24taGFybW9ueSBtb2R1bGVzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLm4gPSBmdW5jdGlvbihtb2R1bGUpIHtcbiBcdFx0dmFyIGdldHRlciA9IG1vZHVsZSAmJiBtb2R1bGUuX19lc01vZHVsZSA/XG4gXHRcdFx0ZnVuY3Rpb24gZ2V0RGVmYXVsdCgpIHsgcmV0dXJuIG1vZHVsZVsnZGVmYXVsdCddOyB9IDpcbiBcdFx0XHRmdW5jdGlvbiBnZXRNb2R1bGVFeHBvcnRzKCkgeyByZXR1cm4gbW9kdWxlOyB9O1xuIFx0XHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQoZ2V0dGVyLCAnYScsIGdldHRlcik7XG4gXHRcdHJldHVybiBnZXR0ZXI7XG4gXHR9O1xuXG4gXHQvLyBPYmplY3QucHJvdG90eXBlLmhhc093blByb3BlcnR5LmNhbGxcbiBcdF9fd2VicGFja19yZXF1aXJlX18ubyA9IGZ1bmN0aW9uKG9iamVjdCwgcHJvcGVydHkpIHsgcmV0dXJuIE9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbChvYmplY3QsIHByb3BlcnR5KTsgfTtcblxuIFx0Ly8gX193ZWJwYWNrX3B1YmxpY19wYXRoX19cbiBcdF9fd2VicGFja19yZXF1aXJlX18ucCA9IFwiXCI7XG5cbiBcdC8vIExvYWQgZW50cnkgbW9kdWxlIGFuZCByZXR1cm4gZXhwb3J0c1xuIFx0cmV0dXJuIF9fd2VicGFja19yZXF1aXJlX18oX193ZWJwYWNrX3JlcXVpcmVfXy5zID0gMTMpO1xuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIHdlYnBhY2svYm9vdHN0cmFwIGYzNzY3MmI3ZjUyOGI0NzJhNDRjIiwiY29uc3QgZHJvcGxhYklucHV0U2V0dGVyID0ge1xuICBpbml0KGhvb2spIHtcbiAgICB0aGlzLmhvb2sgPSBob29rO1xuICAgIHRoaXMuY29uZmlnID0gaG9vay5jb25maWcuZHJvcGxhYklucHV0U2V0dGVyIHx8ICh0aGlzLmhvb2suY29uZmlnLmRyb3BsYWJJbnB1dFNldHRlciA9IHt9KTtcblxuICAgIHRoaXMuZXZlbnRXcmFwcGVyID0ge307XG5cbiAgICB0aGlzLmFkZEV2ZW50cygpO1xuICB9LFxuXG4gIGFkZEV2ZW50cygpIHtcbiAgICB0aGlzLmV2ZW50V3JhcHBlci5zZXRJbnB1dHMgPSB0aGlzLnNldElucHV0cy5iaW5kKHRoaXMpO1xuICAgIHRoaXMuaG9vay5saXN0Lmxpc3QuYWRkRXZlbnRMaXN0ZW5lcignY2xpY2suZGwnLCB0aGlzLmV2ZW50V3JhcHBlci5zZXRJbnB1dHMpO1xuICB9LFxuXG4gIHJlbW92ZUV2ZW50cygpIHtcbiAgICB0aGlzLmhvb2subGlzdC5saXN0LnJlbW92ZUV2ZW50TGlzdGVuZXIoJ2NsaWNrLmRsJywgdGhpcy5ldmVudFdyYXBwZXIuc2V0SW5wdXRzKTtcbiAgfSxcblxuICBzZXRJbnB1dHMoZSkge1xuICAgIGNvbnN0IHNlbGVjdGVkSXRlbSA9IGUuZGV0YWlsLnNlbGVjdGVkO1xuXG4gICAgaWYgKCFBcnJheS5pc0FycmF5KHRoaXMuY29uZmlnKSkgdGhpcy5jb25maWcgPSBbdGhpcy5jb25maWddO1xuXG4gICAgdGhpcy5jb25maWcuZm9yRWFjaChjb25maWcgPT4gdGhpcy5zZXRJbnB1dChjb25maWcsIHNlbGVjdGVkSXRlbSkpO1xuICB9LFxuXG4gIHNldElucHV0KGNvbmZpZywgc2VsZWN0ZWRJdGVtKSB7XG4gICAgY29uc3QgaW5wdXQgPSBjb25maWcuaW5wdXQgfHwgdGhpcy5ob29rLnRyaWdnZXI7XG4gICAgY29uc3QgbmV3VmFsdWUgPSBzZWxlY3RlZEl0ZW0uZ2V0QXR0cmlidXRlKGNvbmZpZy52YWx1ZUF0dHJpYnV0ZSk7XG5cbiAgICBpZiAoaW5wdXQudGFnTmFtZSA9PT0gJ0lOUFVUJykge1xuICAgICAgaW5wdXQudmFsdWUgPSBuZXdWYWx1ZTtcbiAgICB9IGVsc2Uge1xuICAgICAgaW5wdXQudGV4dENvbnRlbnQgPSBuZXdWYWx1ZTtcbiAgICB9XG4gIH0sXG5cbiAgZGVzdHJveSgpIHtcbiAgICB0aGlzLnJlbW92ZUV2ZW50cygpO1xuICB9LFxufTtcblxud2luZG93LmRyb3BsYWJJbnB1dFNldHRlciA9IGRyb3BsYWJJbnB1dFNldHRlcjtcblxuZXhwb3J0IGRlZmF1bHQgZHJvcGxhYklucHV0U2V0dGVyO1xuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIC4vc3JjL3BsdWdpbnMvaW5wdXRfc2V0dGVyLmpzIl0sInNvdXJjZVJvb3QiOiIifQ== \ No newline at end of file diff --git a/app/assets/javascripts/filtered_search/dropdown_hint.js b/app/assets/javascripts/filtered_search/dropdown_hint.js index 38ff3fb7158..2927ee3ebf3 100644 --- a/app/assets/javascripts/filtered_search/dropdown_hint.js +++ b/app/assets/javascripts/filtered_search/dropdown_hint.js @@ -55,7 +55,6 @@ require('./filtered_search_dropdown'); renderContent() { const dropdownData = []; - [].forEach.call(this.input.closest('.filtered-search-input-container').querySelectorAll('.dropdown-menu'), (dropdownMenu) => { const { icon, hint, tag } = dropdownMenu.dataset; if (icon && hint && tag) { diff --git a/app/assets/javascripts/filtered_search/dropdown_non_user.js b/app/assets/javascripts/filtered_search/dropdown_non_user.js index b3dc3e502c5..9ee805a08cb 100644 --- a/app/assets/javascripts/filtered_search/dropdown_non_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_non_user.js @@ -16,6 +16,7 @@ require('./filtered_search_dropdown'); }, droplabFilter: { filterFunction: gl.DropdownUtils.filterWithSymbol.bind(null, this.symbol, input), + template: 'title', }, }; } diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown.js b/app/assets/javascripts/filtered_search/filtered_search_dropdown.js index 134bdc6ad80..8679b7d106f 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_dropdown.js +++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown.js @@ -4,7 +4,7 @@ class FilteredSearchDropdown { constructor(droplab, dropdown, input, filter) { this.droplab = droplab; - this.hookId = input && input.getAttribute('data-id'); + this.hookId = input && input.id; this.input = input; this.filter = filter; this.dropdown = dropdown; diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js index f885932bd91..57ad5a8c49e 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_manager.js +++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js @@ -101,7 +101,7 @@ if (e.keyCode === 13) { const dropdown = this.dropdownManager.mapping[this.dropdownManager.currentDropdown]; const dropdownEl = dropdown.element; - const activeElements = dropdownEl.querySelectorAll('.dropdown-active'); + const activeElements = dropdownEl.querySelectorAll('.droplab-item-active'); e.preventDefault(); diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 81d5748191d..5918182bece 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -88,9 +88,9 @@ import './u2f/util'; // droplab import './droplab/droplab'; -import './droplab/droplab_ajax'; -import './droplab/droplab_ajax_filter'; -import './droplab/droplab_filter'; +import './droplab/plugins/ajax'; +import './droplab/plugins/ajax_filter'; +import './droplab/plugins/filter'; // everything else import './abuse_reports'; diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index dd2daa4b872..75dd47cb070 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -326,7 +326,7 @@ } } -.filter-dropdown-item.dropdown-active { +.filter-dropdown-item.droplab-item-active { .btn { @extend %filter-dropdown-item-btn-hover; } diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index f1730b1791c..bd7e80ea477 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -14,7 +14,7 @@ .scroll-container %ul.tokens-container.list-unstyled %li.input-token - %input.form-control.filtered-search{ placeholder: 'Search or filter results...', data: { id: 'filtered-search', 'project-id' => @project.id, 'username-params' => @users.to_json(only: [:id, :username]), 'base-endpoint' => namespace_project_path(@project.namespace, @project) } } + %input#filtered-search.form-control.filtered-search{ placeholder: 'Search or filter results...', data: { 'project-id' => @project.id, 'username-params' => @users.to_json(only: [:id, :username]), 'base-endpoint' => namespace_project_path(@project.namespace, @project) } } = icon('filter') %button.clear-search.hidden{ type: 'button' } = icon('times') diff --git a/spec/features/issues/filtered_search/dropdown_hint_spec.rb b/spec/features/issues/filtered_search/dropdown_hint_spec.rb index 01b657bcada..a5b22247a68 100644 --- a/spec/features/issues/filtered_search/dropdown_hint_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_hint_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -describe 'Dropdown hint', js: true, feature: true do +describe 'Dropdown hint', :js, :feature do include FilteredSearchHelpers include WaitForAjax @@ -9,10 +9,6 @@ describe 'Dropdown hint', js: true, feature: true do let(:filtered_search) { find('.filtered-search') } let(:js_dropdown_hint) { '#js-dropdown-hint' } - def dropdown_hint_size - page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size - end - def click_hint(text) find('#js-dropdown-hint .filter-dropdown .filter-dropdown-item', text: text).click end @@ -46,14 +42,16 @@ describe 'Dropdown hint', js: true, feature: true do it 'does not filter `Keep typing and press Enter`' do filtered_search.set('randomtext') - expect(page).to have_css(js_dropdown_hint, text: 'Keep typing and press Enter', visible: false) - expect(dropdown_hint_size).to eq(0) + hint_dropdown = find(js_dropdown_hint) + + expect(hint_dropdown).to have_content('Keep typing and press Enter') + expect(hint_dropdown).to have_selector('.filter-dropdown .filter-dropdown-item', count: 0) end it 'filters with text' do filtered_search.set('a') - expect(dropdown_hint_size).to eq(3) + expect(find(js_dropdown_hint)).to have_selector('.filter-dropdown .filter-dropdown-item', count: 3) end end diff --git a/spec/features/issues/filtered_search/dropdown_label_spec.rb b/spec/features/issues/filtered_search/dropdown_label_spec.rb index b192064b693..d7d71b0eba9 100644 --- a/spec/features/issues/filtered_search/dropdown_label_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_label_spec.rb @@ -28,10 +28,6 @@ describe 'Dropdown label', js: true, feature: true do filter_dropdown.find('.filter-dropdown-item', text: text).click end - def dropdown_label_size - filter_dropdown.all('.filter-dropdown-item').size - end - def clear_search_field find('.filtered-search-input-container .clear-search').click end @@ -81,7 +77,7 @@ describe 'Dropdown label', js: true, feature: true do filtered_search.set('label:') expect(filter_dropdown).to have_content(bug_label.title) - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) end end @@ -97,7 +93,8 @@ describe 'Dropdown label', js: true, feature: true do expect(filter_dropdown.find('.filter-dropdown-item', text: bug_label.title)).to be_visible expect(filter_dropdown.find('.filter-dropdown-item', text: uppercase_label.title)).to be_visible - expect(dropdown_label_size).to eq(2) + + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 2) clear_search_field init_label_search @@ -106,14 +103,14 @@ describe 'Dropdown label', js: true, feature: true do expect(filter_dropdown.find('.filter-dropdown-item', text: bug_label.title)).to be_visible expect(filter_dropdown.find('.filter-dropdown-item', text: uppercase_label.title)).to be_visible - expect(dropdown_label_size).to eq(2) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 2) end it 'filters by multiple words with or without symbol' do filtered_search.send_keys('Hig') expect(filter_dropdown.find('.filter-dropdown-item', text: two_words_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) clear_search_field init_label_search @@ -121,14 +118,14 @@ describe 'Dropdown label', js: true, feature: true do filtered_search.send_keys('~Hig') expect(filter_dropdown.find('.filter-dropdown-item', text: two_words_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) end it 'filters by multiple words containing single quotes with or without symbol' do filtered_search.send_keys('won\'t') expect(filter_dropdown.find('.filter-dropdown-item', text: wont_fix_single_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) clear_search_field init_label_search @@ -136,14 +133,14 @@ describe 'Dropdown label', js: true, feature: true do filtered_search.send_keys('~won\'t') expect(filter_dropdown.find('.filter-dropdown-item', text: wont_fix_single_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) end it 'filters by multiple words containing double quotes with or without symbol' do filtered_search.send_keys('won"t') expect(filter_dropdown.find('.filter-dropdown-item', text: wont_fix_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) clear_search_field init_label_search @@ -151,14 +148,14 @@ describe 'Dropdown label', js: true, feature: true do filtered_search.send_keys('~won"t') expect(filter_dropdown.find('.filter-dropdown-item', text: wont_fix_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) end it 'filters by special characters with or without symbol' do filtered_search.send_keys('^+') expect(filter_dropdown.find('.filter-dropdown-item', text: special_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) clear_search_field init_label_search @@ -166,7 +163,7 @@ describe 'Dropdown label', js: true, feature: true do filtered_search.send_keys('~^+') expect(filter_dropdown.find('.filter-dropdown-item', text: special_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) end end @@ -280,13 +277,13 @@ describe 'Dropdown label', js: true, feature: true do create(:label, project: project, title: 'bug-label') init_label_search - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) create(:label, project: project) clear_search_field init_label_search - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) end end end diff --git a/spec/features/issues/filtered_search/search_bar_spec.rb b/spec/features/issues/filtered_search/search_bar_spec.rb index 59244d65eec..3b2b6347bc0 100644 --- a/spec/features/issues/filtered_search/search_bar_spec.rb +++ b/spec/features/issues/filtered_search/search_bar_spec.rb @@ -26,7 +26,7 @@ describe 'Search bar', js: true, feature: true do filtered_search.native.send_keys(:down) page.within '#js-dropdown-hint' do - expect(page).to have_selector('.dropdown-active') + expect(page).to have_selector('.droplab-item-active') end end @@ -79,28 +79,30 @@ describe 'Search bar', js: true, feature: true do filtered_search.set('author') - expect(page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size).to eq(1) + expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 1) find('.filtered-search-input-container .clear-search').click filtered_search.click - expect(page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size).to eq(original_size) + expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: original_size) end it 'resets the dropdown filters' do + filtered_search.click + + hint_offset = get_left_style(find('#js-dropdown-hint')['style']) + filtered_search.set('a') - hint_style = page.find('#js-dropdown-hint')['style'] - hint_offset = get_left_style(hint_style) filtered_search.set('author:') - expect(page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size).to eq(0) + find('#js-dropdown-hint', visible: false) find('.filtered-search-input-container .clear-search').click filtered_search.click - expect(page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size).to be > 0 - expect(get_left_style(page.find('#js-dropdown-hint')['style'])).to eq(hint_offset) + expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 4) + expect(get_left_style(find('#js-dropdown-hint')['style'])).to eq(hint_offset) end end end From 06df12e999f68b80c86e8c6d841918a53b80f0c2 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sat, 25 Mar 2017 12:20:49 +0000 Subject: [PATCH 02/70] update droplab --- app/assets/javascripts/droplab/droplab.js | 660 +++++++++--------- .../javascripts/droplab/plugins/ajax.js | 8 +- .../droplab/plugins/ajax_filter.js | 8 +- .../javascripts/droplab/plugins/filter.js | 10 +- .../droplab/plugins/input_setter.js | 8 +- .../filtered_search/dropdown_hint.js | 4 +- .../filtered_search/dropdown_non_user.js | 6 +- .../filtered_search/dropdown_user.js | 4 +- .../filtered_search_dropdown_manager.js | 2 +- app/assets/javascripts/main.js | 6 - 10 files changed, 337 insertions(+), 379 deletions(-) diff --git a/app/assets/javascripts/droplab/droplab.js b/app/assets/javascripts/droplab/droplab.js index b5d6a43b83f..d1d8447d165 100644 --- a/app/assets/javascripts/droplab/droplab.js +++ b/app/assets/javascripts/droplab/droplab.js @@ -63,7 +63,7 @@ /******/ __webpack_require__.p = ""; /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 9); +/******/ return __webpack_require__(__webpack_require__.s = 14); /******/ }) /************************************************************************/ /******/ ([ @@ -81,14 +81,10 @@ var DATA_DROPDOWN = 'data-dropdown'; var SELECTED_CLASS = 'droplab-item-selected'; var ACTIVE_CLASS = 'droplab-item-active'; -var constants = { - DATA_TRIGGER: DATA_TRIGGER, - DATA_DROPDOWN: DATA_DROPDOWN, - SELECTED_CLASS: SELECTED_CLASS, - ACTIVE_CLASS: ACTIVE_CLASS -}; - -exports.default = constants; +exports.DATA_TRIGGER = DATA_TRIGGER; +exports.DATA_DROPDOWN = DATA_DROPDOWN; +exports.SELECTED_CLASS = SELECTED_CLASS; +exports.ACTIVE_CLASS = ACTIVE_CLASS; /***/ }), /* 1 */ @@ -151,7 +147,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -var _dropdown = __webpack_require__(6); +var _dropdown = __webpack_require__(9); var _dropdown2 = _interopRequireDefault(_dropdown); @@ -189,14 +185,6 @@ Object.defineProperty(exports, "__esModule", { var _constants = __webpack_require__(0); -var _constants2 = _interopRequireDefault(_constants); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var DATA_TRIGGER = _constants2.default.DATA_TRIGGER, - DATA_DROPDOWN = _constants2.default.DATA_DROPDOWN; - - var utils = { toCamelCase: function toCamelCase(attr) { return this.camelize(attr.split('-').slice(1).join(' ')); @@ -222,7 +210,7 @@ var utils = { }, isDropDownParts: function isDropDownParts(target) { if (!target || target.tagName === 'HTML') return false; - return target.hasAttribute(DATA_TRIGGER) || target.hasAttribute(DATA_DROPDOWN); + return target.hasAttribute(_constants.DATA_TRIGGER) || target.hasAttribute(_constants.DATA_DROPDOWN); } }; @@ -239,175 +227,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.default = function () { - var DropLab = function DropLab(hook, list) { - if (!this instanceof DropLab) return new DropLab(hook); - - this.ready = false; - this.hooks = []; - this.queuedData = []; - this.config = {}; - - this.eventWrapper = {}; - - if (!hook) return this.loadStatic(); - this.addHook(hook, list); - this.init(); - }; - - Object.assign(DropLab.prototype, { - loadStatic: function loadStatic() { - var dropdownTriggers = [].slice.apply(document.querySelectorAll('[' + DATA_TRIGGER + ']')); - this.addHooks(dropdownTriggers).init(); - }, - - addData: function addData() { - var args = [].slice.apply(arguments); - this.applyArgs(args, '_addData'); - }, - - setData: function setData() { - var args = [].slice.apply(arguments); - this.applyArgs(args, '_setData'); - }, - - destroy: function destroy() { - this.hooks.forEach(function (hook) { - return hook.destroy(); - }); - this.hooks = []; - this.removeEvents(); - }, - - applyArgs: function applyArgs(args, methodName) { - if (this.ready) return this[methodName].apply(this, args); - - this.queuedData = this.queuedData || []; - this.queuedData.push(args); - }, - - _addData: function _addData(trigger, data) { - this._processData(trigger, data, 'addData'); - }, - - _setData: function _setData(trigger, data) { - this._processData(trigger, data, 'setData'); - }, - - _processData: function _processData(trigger, data, methodName) { - this.hooks.forEach(function (hook) { - if (Array.isArray(trigger)) hook.list[methodName](trigger); - - if (hook.trigger.id === trigger) hook.list[methodName](data); - }); - }, - - addEvents: function addEvents() { - this.eventWrapper.documentClicked = this.documentClicked.bind(this); - document.addEventListener('click', this.eventWrapper.documentClicked); - }, - - documentClicked: function documentClicked(e) { - var thisTag = e.target; - - if (thisTag.tagName !== 'UL') thisTag = _utils2.default.closest(thisTag, 'UL'); - if (_utils2.default.isDropDownParts(thisTag, this.hooks) || _utils2.default.isDropDownParts(e.target, this.hooks)) return; - - this.hooks.forEach(function (hook) { - return hook.list.hide(); - }); - }, - - removeEvents: function removeEvents() { - document.removeEventListener('click', this.eventWrapper.documentClicked); - }, - - changeHookList: function changeHookList(trigger, list, plugins, config) { - var _this = this; - - var availableTrigger = typeof trigger === 'string' ? document.getElementById(trigger) : trigger; - - this.hooks.forEach(function (hook, i) { - hook.list.list.dataset.dropdownActive = false; - - if (hook.trigger !== availableTrigger) return; - - hook.destroy(); - _this.hooks.splice(i, 1); - _this.addHook(availableTrigger, list, plugins, config); - }); - }, - - addHook: function addHook(hook, list, plugins, config) { - var availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook; - var availableList = void 0; - - if (typeof list === 'string') { - availableList = document.querySelector(list); - } else if (list instanceof Element) { - availableList = list; - } else { - availableList = document.querySelector(hook.dataset[_utils2.default.toCamelCase(DATA_TRIGGER)]); - } - - availableList.dataset.dropdownActive = true; - - var HookObject = availableHook.tagName === 'INPUT' ? _hook_input2.default : _hook_button2.default; - this.hooks.push(new HookObject(availableHook, availableList, plugins, config)); - - return this; - }, - - addHooks: function addHooks(hooks, plugins, config) { - var _this2 = this; - - hooks.forEach(function (hook) { - return _this2.addHook(hook, null, plugins, config); - }); - return this; - }, - - setConfig: function setConfig(obj) { - this.config = obj; - }, - - fireReady: function fireReady() { - var readyEvent = new CustomEvent('ready.dl', { - detail: { - dropdown: this - } - }); - document.dispatchEvent(readyEvent); - - this.ready = true; - }, - - init: function init() { - var _this3 = this; - - this.addEvents(); - - this.fireReady(); - - this.queuedData.forEach(function (data) { - return _this3.addData(data); - }); - this.queuedData = []; - - return this; - } - }); - - return DropLab; -}; - __webpack_require__(1); -var _hook_button = __webpack_require__(7); +var _hook_button = __webpack_require__(10); var _hook_button2 = _interopRequireDefault(_hook_button); -var _hook_input = __webpack_require__(8); +var _hook_input = __webpack_require__(11); var _hook_input2 = _interopRequireDefault(_hook_input); @@ -415,149 +241,178 @@ var _utils = __webpack_require__(3); var _utils2 = _interopRequireDefault(_utils); -var _constants = __webpack_require__(0); +var _keyboard = __webpack_require__(12); -var _constants2 = _interopRequireDefault(_constants); +var _keyboard2 = _interopRequireDefault(_keyboard); + +var _constants = __webpack_require__(0); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var DATA_TRIGGER = _constants2.default.DATA_TRIGGER; +var DropLab = function DropLab() { + this.ready = false; + this.hooks = []; + this.queuedData = []; + this.config = {}; -; - -/***/ }), -/* 5 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -exports.default = function () { - var currentKey; - var currentFocus; - var isUpArrow = false; - var isDownArrow = false; - var removeHighlight = function removeHighlight(list) { - var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0); - var listItems = []; - for (var i = 0; i < itemElements.length; i++) { - var listItem = itemElements[i]; - listItem.classList.remove(_constants2.default.ACTIVE_CLASS); - - if (listItem.style.display !== 'none') { - listItems.push(listItem); - } - } - return listItems; - }; - - var setMenuForArrows = function setMenuForArrows(list) { - var listItems = removeHighlight(list); - if (list.currentIndex > 0) { - if (!listItems[list.currentIndex - 1]) { - list.currentIndex = list.currentIndex - 1; - } - - if (listItems[list.currentIndex - 1]) { - var el = listItems[list.currentIndex - 1]; - var filterDropdownEl = el.closest('.filter-dropdown'); - el.classList.add(_constants2.default.ACTIVE_CLASS); - - if (filterDropdownEl) { - var filterDropdownBottom = filterDropdownEl.offsetHeight; - var elOffsetTop = el.offsetTop - 30; - - if (elOffsetTop > filterDropdownBottom) { - filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom; - } - } - } - } - }; - - var mousedown = function mousedown(e) { - var list = e.detail.hook.list; - removeHighlight(list); - list.show(); - list.currentIndex = 0; - isUpArrow = false; - isDownArrow = false; - }; - var selectItem = function selectItem(list) { - var listItems = removeHighlight(list); - var currentItem = listItems[list.currentIndex - 1]; - var listEvent = new CustomEvent('click.dl', { - detail: { - list: list, - selected: currentItem, - data: currentItem.dataset - } - }); - list.list.dispatchEvent(listEvent); - list.hide(); - }; - - var keydown = function keydown(e) { - var typedOn = e.target; - var list = e.detail.hook.list; - var currentIndex = list.currentIndex; - isUpArrow = false; - isDownArrow = false; - - if (e.detail.which) { - currentKey = e.detail.which; - if (currentKey === 13) { - selectItem(e.detail.hook.list); - return; - } - if (currentKey === 38) { - isUpArrow = true; - } - if (currentKey === 40) { - isDownArrow = true; - } - } else if (e.detail.key) { - currentKey = e.detail.key; - if (currentKey === 'Enter') { - selectItem(e.detail.hook.list); - return; - } - if (currentKey === 'ArrowUp') { - isUpArrow = true; - } - if (currentKey === 'ArrowDown') { - isDownArrow = true; - } - } - if (isUpArrow) { - currentIndex--; - } - if (isDownArrow) { - currentIndex++; - } - if (currentIndex < 0) { - currentIndex = 0; - } - list.currentIndex = currentIndex; - setMenuForArrows(e.detail.hook.list); - }; - - document.addEventListener('mousedown.dl', mousedown); - document.addEventListener('keydown.dl', keydown); + this.eventWrapper = {}; }; -var _constants = __webpack_require__(0); +Object.assign(DropLab.prototype, { + loadStatic: function loadStatic() { + var dropdownTriggers = [].slice.apply(document.querySelectorAll('[' + _constants.DATA_TRIGGER + ']')); + this.addHooks(dropdownTriggers); + }, -var _constants2 = _interopRequireDefault(_constants); + addData: function addData() { + var args = [].slice.apply(arguments); + this.applyArgs(args, '_addData'); + }, -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + setData: function setData() { + var args = [].slice.apply(arguments); + this.applyArgs(args, '_setData'); + }, + + destroy: function destroy() { + this.hooks.forEach(function (hook) { + return hook.destroy(); + }); + this.hooks = []; + this.removeEvents(); + }, + + applyArgs: function applyArgs(args, methodName) { + if (this.ready) return this[methodName].apply(this, args); + + this.queuedData = this.queuedData || []; + this.queuedData.push(args); + }, + + _addData: function _addData(trigger, data) { + this._processData(trigger, data, 'addData'); + }, + + _setData: function _setData(trigger, data) { + this._processData(trigger, data, 'setData'); + }, + + _processData: function _processData(trigger, data, methodName) { + this.hooks.forEach(function (hook) { + if (Array.isArray(trigger)) hook.list[methodName](trigger); + + if (hook.trigger.id === trigger) hook.list[methodName](data); + }); + }, + + addEvents: function addEvents() { + this.eventWrapper.documentClicked = this.documentClicked.bind(this); + document.addEventListener('click', this.eventWrapper.documentClicked); + }, + + documentClicked: function documentClicked(e) { + var thisTag = e.target; + + if (thisTag.tagName !== 'UL') thisTag = _utils2.default.closest(thisTag, 'UL'); + if (_utils2.default.isDropDownParts(thisTag, this.hooks) || _utils2.default.isDropDownParts(e.target, this.hooks)) return; + + this.hooks.forEach(function (hook) { + return hook.list.hide(); + }); + }, + + removeEvents: function removeEvents() { + document.removeEventListener('click', this.eventWrapper.documentClicked); + }, + + changeHookList: function changeHookList(trigger, list, plugins, config) { + var _this = this; + + var availableTrigger = typeof trigger === 'string' ? document.getElementById(trigger) : trigger; + + this.hooks.forEach(function (hook, i) { + hook.list.list.dataset.dropdownActive = false; + + if (hook.trigger !== availableTrigger) return; + + hook.destroy(); + _this.hooks.splice(i, 1); + _this.addHook(availableTrigger, list, plugins, config); + }); + }, + + addHook: function addHook(hook, list, plugins, config) { + var availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook; + var availableList = void 0; + + if (typeof list === 'string') { + availableList = document.querySelector(list); + } else if (list instanceof Element) { + availableList = list; + } else { + availableList = document.querySelector(hook.dataset[_utils2.default.toCamelCase(_constants.DATA_TRIGGER)]); + } + + availableList.dataset.dropdownActive = true; + + var HookObject = availableHook.tagName === 'INPUT' ? _hook_input2.default : _hook_button2.default; + this.hooks.push(new HookObject(availableHook, availableList, plugins, config)); + + return this; + }, + + addHooks: function addHooks(hooks, plugins, config) { + var _this2 = this; + + hooks.forEach(function (hook) { + return _this2.addHook(hook, null, plugins, config); + }); + return this; + }, + + setConfig: function setConfig(obj) { + this.config = obj; + }, + + fireReady: function fireReady() { + var readyEvent = new CustomEvent('ready.dl', { + detail: { + dropdown: this + } + }); + document.dispatchEvent(readyEvent); + + this.ready = true; + }, + + init: function init(hook, list, plugins, config) { + var _this3 = this; + + hook ? this.addHook(hook, list, plugins, config) : this.loadStatic(); + + this.addEvents(); + + (0, _keyboard2.default)(); + + this.fireReady(); + + this.queuedData.forEach(function (data) { + return _this3.addData(data); + }); + this.queuedData = []; + + return this; + } +}); + +exports.default = DropLab; /***/ }), -/* 6 */ +/* 5 */, +/* 6 */, +/* 7 */, +/* 8 */, +/* 9 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -577,8 +432,6 @@ var _utils2 = _interopRequireDefault(_utils); var _constants = __webpack_require__(0); -var _constants2 = _interopRequireDefault(_constants); - function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } @@ -635,14 +488,14 @@ Object.assign(DropDown.prototype, (_Object$assign = { addSelectedClass: function addSelectedClass(selected) { this.removeSelectedClasses(); - selected.classList.add(_constants2.default.SELECTED_CLASS); + selected.classList.add(_constants.SELECTED_CLASS); }, removeSelectedClasses: function removeSelectedClasses() { var items = this.items || this.getItems(); items.forEach(function (item) { - item.classList.remove(_constants2.default.SELECTED_CLASS); + return item.classList.remove(_constants.SELECTED_CLASS); }); }, @@ -716,7 +569,7 @@ Object.assign(DropDown.prototype, (_Object$assign = { exports.default = DropDown; /***/ }), -/* 7 */ +/* 10 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -802,7 +655,7 @@ Object.assign(HookButton.prototype, { exports.default = HookButton; /***/ }), -/* 8 */ +/* 11 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -943,7 +796,137 @@ Object.assign(HookInput.prototype, { exports.default = HookInput; /***/ }), -/* 9 */ +/* 12 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _constants = __webpack_require__(0); + +var Keyboard = function Keyboard() { + var currentKey; + var currentFocus; + var isUpArrow = false; + var isDownArrow = false; + var removeHighlight = function removeHighlight(list) { + var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0); + var listItems = []; + for (var i = 0; i < itemElements.length; i++) { + var listItem = itemElements[i]; + listItem.classList.remove(_constants.ACTIVE_CLASS); + + if (listItem.style.display !== 'none') { + listItems.push(listItem); + } + } + return listItems; + }; + + var setMenuForArrows = function setMenuForArrows(list) { + var listItems = removeHighlight(list); + if (list.currentIndex > 0) { + if (!listItems[list.currentIndex - 1]) { + list.currentIndex = list.currentIndex - 1; + } + + if (listItems[list.currentIndex - 1]) { + var el = listItems[list.currentIndex - 1]; + var filterDropdownEl = el.closest('.filter-dropdown'); + el.classList.add(_constants.ACTIVE_CLASS); + + if (filterDropdownEl) { + var filterDropdownBottom = filterDropdownEl.offsetHeight; + var elOffsetTop = el.offsetTop - 30; + + if (elOffsetTop > filterDropdownBottom) { + filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom; + } + } + } + } + }; + + var mousedown = function mousedown(e) { + var list = e.detail.hook.list; + removeHighlight(list); + list.show(); + list.currentIndex = 0; + isUpArrow = false; + isDownArrow = false; + }; + var selectItem = function selectItem(list) { + var listItems = removeHighlight(list); + var currentItem = listItems[list.currentIndex - 1]; + var listEvent = new CustomEvent('click.dl', { + detail: { + list: list, + selected: currentItem, + data: currentItem.dataset + } + }); + list.list.dispatchEvent(listEvent); + list.hide(); + }; + + var keydown = function keydown(e) { + var typedOn = e.target; + var list = e.detail.hook.list; + var currentIndex = list.currentIndex; + isUpArrow = false; + isDownArrow = false; + + if (e.detail.which) { + currentKey = e.detail.which; + if (currentKey === 13) { + selectItem(e.detail.hook.list); + return; + } + if (currentKey === 38) { + isUpArrow = true; + } + if (currentKey === 40) { + isDownArrow = true; + } + } else if (e.detail.key) { + currentKey = e.detail.key; + if (currentKey === 'Enter') { + selectItem(e.detail.hook.list); + return; + } + if (currentKey === 'ArrowUp') { + isUpArrow = true; + } + if (currentKey === 'ArrowDown') { + isDownArrow = true; + } + } + if (isUpArrow) { + currentIndex--; + } + if (isDownArrow) { + currentIndex++; + } + if (currentIndex < 0) { + currentIndex = 0; + } + list.currentIndex = currentIndex; + setMenuForArrows(e.detail.hook.list); + }; + + document.addEventListener('mousedown.dl', mousedown); + document.addEventListener('keydown.dl', keydown); +}; + +exports.default = Keyboard; + +/***/ }), +/* 13 */, +/* 14 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -955,29 +938,16 @@ Object.defineProperty(exports, "__esModule", { var _droplab = __webpack_require__(4); -var _droplab2 = _interopRequireDefault(_droplab); - -var _constants = __webpack_require__(0); - -var _constants2 = _interopRequireDefault(_constants); - -var _keyboard = __webpack_require__(5); - -var _keyboard2 = _interopRequireDefault(_keyboard); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var DATA_TRIGGER = _constants2.default.DATA_TRIGGER; -var keyboard = (0, _keyboard2.default)(); - -var setup = function setup() { - window.DropLab = (0, _droplab2.default)(); -}; - -setup(); - -exports.default = setup; +Object.keys(_droplab).forEach(function (key) { + if (key === "default" || key === "__esModule") return; + Object.defineProperty(exports, key, { + enumerable: true, + get: function get() { + return _droplab[key]; + } + }); +}); /***/ }) /******/ ]); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c","webpack:///./src/constants.js","webpack:///./~/custom-event-polyfill/custom-event-polyfill.js","webpack:///./src/hook.js","webpack:///./src/utils.js","webpack:///./src/droplab.js","webpack:///./src/keyboard.js","webpack:///./src/dropdown.js","webpack:///./src/hook_button.js","webpack:///./src/hook_input.js","webpack:///./src/index.js"],"names":["DATA_TRIGGER","DATA_DROPDOWN","SELECTED_CLASS","ACTIVE_CLASS","constants","Hook","trigger","list","plugins","config","type","event","id","Object","assign","prototype","addEvents","constructor","utils","toCamelCase","attr","camelize","split","slice","join","t","s","d","p","hasOwnProperty","call","replace","RegExp","str","letter","index","toLowerCase","toUpperCase","closest","thisTag","stopTag","tagName","parentNode","isDropDownParts","target","hasAttribute","DropLab","hook","ready","hooks","queuedData","eventWrapper","loadStatic","addHook","init","dropdownTriggers","apply","document","querySelectorAll","addHooks","addData","args","arguments","applyArgs","setData","destroy","forEach","removeEvents","methodName","push","_addData","data","_processData","_setData","Array","isArray","documentClicked","bind","addEventListener","e","hide","removeEventListener","changeHookList","availableTrigger","getElementById","i","dataset","dropdownActive","splice","availableHook","querySelector","availableList","Element","HookObject","setConfig","obj","fireReady","readyEvent","CustomEvent","detail","dropdown","dispatchEvent","currentKey","currentFocus","isUpArrow","isDownArrow","removeHighlight","itemElements","listItems","length","listItem","classList","remove","style","display","setMenuForArrows","currentIndex","el","filterDropdownEl","add","filterDropdownBottom","offsetHeight","elOffsetTop","offsetTop","scrollTop","mousedown","show","selectItem","currentItem","listEvent","selected","keydown","typedOn","which","key","DropDown","hidden","items","getItems","initTemplateString","initialState","innerHTML","templateString","outerHTML","clickEvent","addSelectedClass","preventDefault","removeSelectedClasses","item","toggle","render","concat","children","map","renderChildren","renderableList","html","template","createElement","setImagesSrc","firstChild","droplab_hidden","images","image","src","getAttribute","removeAttribute","HookButton","addPlugins","create","plugin","clicked","buttonEvent","bubbles","cancelable","restoreInitialState","removePlugins","HookInput","input","keyup","hasRemovedEvents","inputEvent","text","value","mouseEvent","keyEvent","eventName","keyboard","setup","window"],"mappings":"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","file":"./dist/droplab.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 9);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","const DATA_TRIGGER = 'data-dropdown-trigger';\nconst DATA_DROPDOWN = 'data-dropdown';\nconst SELECTED_CLASS = 'droplab-item-selected';\nconst ACTIVE_CLASS = 'droplab-item-active';\n\nconst constants = {\n  DATA_TRIGGER,\n  DATA_DROPDOWN,\n  SELECTED_CLASS,\n  ACTIVE_CLASS,\n};\n\nexport default constants;\n\n\n\n// WEBPACK FOOTER //\n// ./src/constants.js","// Polyfill for creating CustomEvents on IE9/10/11\n\n// code pulled from:\n// https://github.com/d4tocchini/customevent-polyfill\n// https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent#Polyfill\n\ntry {\n    var ce = new window.CustomEvent('test');\n    ce.preventDefault();\n    if (ce.defaultPrevented !== true) {\n        // IE has problems with .preventDefault() on custom events\n        // http://stackoverflow.com/questions/23349191\n        throw new Error('Could not prevent default');\n    }\n} catch(e) {\n  var CustomEvent = function(event, params) {\n    var evt, origPrevent;\n    params = params || {\n      bubbles: false,\n      cancelable: false,\n      detail: undefined\n    };\n\n    evt = document.createEvent(\"CustomEvent\");\n    evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);\n    origPrevent = evt.preventDefault;\n    evt.preventDefault = function () {\n      origPrevent.call(this);\n      try {\n        Object.defineProperty(this, 'defaultPrevented', {\n          get: function () {\n            return true;\n          }\n        });\n      } catch(e) {\n        this.defaultPrevented = true;\n      }\n    };\n    return evt;\n  };\n\n  CustomEvent.prototype = window.Event.prototype;\n  window.CustomEvent = CustomEvent; // expose definition to window\n}\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./~/custom-event-polyfill/custom-event-polyfill.js\n// module id = 1\n// module chunks = 0","import DropDown from './dropdown';\n\nvar Hook = function(trigger, list, plugins, config){\n  this.trigger = trigger;\n  this.list = new DropDown(list);\n  this.type = 'Hook';\n  this.event = 'click';\n  this.plugins = plugins || [];\n  this.config = config || {};\n  this.id = trigger.id;\n};\n\nObject.assign(Hook.prototype, {\n\n  addEvents: function(){},\n\n  constructor: Hook,\n});\n\nexport default Hook;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook.js","import constants from './constants';\n\nconst { DATA_TRIGGER, DATA_DROPDOWN } = constants;\n\nconst utils = {\n  toCamelCase(attr) {\n    return this.camelize(attr.split('-').slice(1).join(' '));\n  },\n\n  t(s, d) {\n    for (const p in d) {\n      if (Object.prototype.hasOwnProperty.call(d, p)) {\n        s = s.replace(new RegExp(`{{${p}}}`, 'g'), d[p]);\n      }\n    }\n    return s;\n  },\n\n  camelize(str) {\n    return str.replace(/(?:^\\w|[A-Z]|\\b\\w)/g, (letter, index) => {\n      return index === 0 ? letter.toLowerCase() : letter.toUpperCase();\n    }).replace(/\\s+/g, '');\n  },\n\n  closest(thisTag, stopTag) {\n    while (thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML') {\n      thisTag = thisTag.parentNode;\n    }\n    return thisTag;\n  },\n\n  isDropDownParts(target) {\n    if (!target || target.tagName === 'HTML') return false;\n    return target.hasAttribute(DATA_TRIGGER) || target.hasAttribute(DATA_DROPDOWN);\n  },\n};\n\n\nexport default utils;\n\n\n\n// WEBPACK FOOTER //\n// ./src/utils.js","import 'custom-event-polyfill';\nimport HookButton from './hook_button';\nimport HookInput from './hook_input';\nimport utils from './utils';\nimport constants from './constants';\nconst DATA_TRIGGER = constants.DATA_TRIGGER;\n\nexport default function () {\n  var DropLab = function(hook, list) {\n    if (!this instanceof DropLab) return new DropLab(hook);\n\n    this.ready = false;\n    this.hooks = [];\n    this.queuedData = [];\n    this.config = {};\n\n    this.eventWrapper = {};\n\n    if (!hook) return this.loadStatic();\n    this.addHook(hook, list);\n    this.init();\n  };\n\n  Object.assign(DropLab.prototype, {\n    loadStatic: function(){\n      var dropdownTriggers = [].slice.apply(document.querySelectorAll(`[${DATA_TRIGGER}]`));\n      this.addHooks(dropdownTriggers).init();\n    },\n\n    addData: function () {\n      var args = [].slice.apply(arguments);\n      this.applyArgs(args, '_addData');\n    },\n\n    setData: function() {\n      var args = [].slice.apply(arguments);\n      this.applyArgs(args, '_setData');\n    },\n\n    destroy: function() {\n      this.hooks.forEach(hook => hook.destroy());\n      this.hooks = [];\n      this.removeEvents();\n    },\n\n    applyArgs: function(args, methodName) {\n      if (this.ready) return this[methodName].apply(this, args);\n\n      this.queuedData = this.queuedData || [];\n      this.queuedData.push(args);\n    },\n\n    _addData: function(trigger, data) {\n      this._processData(trigger, data, 'addData');\n    },\n\n    _setData: function(trigger, data) {\n      this._processData(trigger, data, 'setData');\n    },\n\n    _processData: function(trigger, data, methodName) {\n      this.hooks.forEach((hook) => {\n        if (Array.isArray(trigger)) hook.list[methodName](trigger);\n\n        if (hook.trigger.id === trigger) hook.list[methodName](data);\n      });\n    },\n\n    addEvents: function() {\n      this.eventWrapper.documentClicked = this.documentClicked.bind(this)\n      document.addEventListener('click', this.eventWrapper.documentClicked);\n    },\n\n    documentClicked: function(e) {\n      let thisTag = e.target;\n\n      if (thisTag.tagName !== 'UL') thisTag = utils.closest(thisTag, 'UL');\n      if (utils.isDropDownParts(thisTag, this.hooks) || utils.isDropDownParts(e.target, this.hooks)) return;\n\n      this.hooks.forEach(hook => hook.list.hide());\n    },\n\n    removeEvents: function(){\n      document.removeEventListener('click', this.eventWrapper.documentClicked);\n    },\n\n    changeHookList: function(trigger, list, plugins, config) {\n      const availableTrigger =  typeof trigger === 'string' ? document.getElementById(trigger) : trigger;\n\n\n      this.hooks.forEach((hook, i) => {\n        hook.list.list.dataset.dropdownActive = false;\n\n        if (hook.trigger !== availableTrigger) return;\n\n        hook.destroy();\n        this.hooks.splice(i, 1);\n        this.addHook(availableTrigger, list, plugins, config);\n      });\n    },\n\n    addHook: function(hook, list, plugins, config) {\n      const availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook;\n      let availableList;\n\n      if (typeof list === 'string') {\n        availableList = document.querySelector(list);\n      } else if (list instanceof Element) {\n        availableList = list;\n      } else {\n        availableList = document.querySelector(hook.dataset[utils.toCamelCase(DATA_TRIGGER)]);\n      }\n\n      availableList.dataset.dropdownActive = true;\n\n      const HookObject = availableHook.tagName === 'INPUT' ? HookInput : HookButton;\n      this.hooks.push(new HookObject(availableHook, availableList, plugins, config));\n\n      return this;\n    },\n\n    addHooks: function(hooks, plugins, config) {\n      hooks.forEach(hook => this.addHook(hook, null, plugins, config));\n      return this;\n    },\n\n    setConfig: function(obj){\n      this.config = obj;\n    },\n\n    fireReady: function() {\n      const readyEvent = new CustomEvent('ready.dl', {\n        detail: {\n          dropdown: this,\n        },\n      });\n      document.dispatchEvent(readyEvent);\n\n      this.ready = true;\n    },\n\n    init: function () {\n      this.addEvents();\n\n      this.fireReady();\n\n      this.queuedData.forEach(data => this.addData(data));\n      this.queuedData = [];\n\n      return this;\n    },\n  });\n\n  return DropLab;\n};\n\n\n\n// WEBPACK FOOTER //\n// ./src/droplab.js","import constants from './constants';\n\nexport default function () {\n  var currentKey;\n  var currentFocus;\n  var isUpArrow = false;\n  var isDownArrow = false;\n  var removeHighlight = function removeHighlight(list) {\n    var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0);\n    var listItems = [];\n    for(var i = 0; i < itemElements.length; i++) {\n      var listItem = itemElements[i];\n      listItem.classList.remove(constants.ACTIVE_CLASS);\n\n      if (listItem.style.display !== 'none') {\n        listItems.push(listItem);\n      }\n    }\n    return listItems;\n  };\n\n  var setMenuForArrows = function setMenuForArrows(list) {\n    var listItems = removeHighlight(list);\n    if(list.currentIndex>0){\n      if(!listItems[list.currentIndex-1]){\n        list.currentIndex = list.currentIndex-1;\n      }\n\n      if (listItems[list.currentIndex-1]) {\n        var el = listItems[list.currentIndex-1];\n        var filterDropdownEl = el.closest('.filter-dropdown');\n        el.classList.add(constants.ACTIVE_CLASS);\n\n        if (filterDropdownEl) {\n          var filterDropdownBottom = filterDropdownEl.offsetHeight;\n          var elOffsetTop = el.offsetTop - 30;\n\n          if (elOffsetTop > filterDropdownBottom) {\n            filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom;\n          }\n        }\n      }\n    }\n  };\n\n  var mousedown = function mousedown(e) {\n    var list = e.detail.hook.list;\n    removeHighlight(list);\n    list.show();\n    list.currentIndex = 0;\n    isUpArrow = false;\n    isDownArrow = false;\n  };\n  var selectItem = function selectItem(list) {\n    var listItems = removeHighlight(list);\n    var currentItem = listItems[list.currentIndex-1];\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: list,\n        selected: currentItem,\n        data: currentItem.dataset,\n      },\n    });\n    list.list.dispatchEvent(listEvent);\n    list.hide();\n  }\n\n  var keydown = function keydown(e){\n    var typedOn = e.target;\n    var list = e.detail.hook.list;\n    var currentIndex = list.currentIndex;\n    isUpArrow = false;\n    isDownArrow = false;\n\n    if(e.detail.which){\n      currentKey = e.detail.which;\n      if(currentKey === 13){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 38) {\n        isUpArrow = true;\n      }\n      if(currentKey === 40) {\n        isDownArrow = true;\n      }\n    } else if(e.detail.key) {\n      currentKey = e.detail.key;\n      if(currentKey === 'Enter'){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 'ArrowUp') {\n        isUpArrow = true;\n      }\n      if(currentKey === 'ArrowDown') {\n        isDownArrow = true;\n      }\n    }\n    if(isUpArrow){ currentIndex--; }\n    if(isDownArrow){ currentIndex++; }\n    if(currentIndex < 0){ currentIndex = 0; }\n    list.currentIndex = currentIndex;\n    setMenuForArrows(e.detail.hook.list);\n  };\n\n  document.addEventListener('mousedown.dl', mousedown);\n  document.addEventListener('keydown.dl', keydown);\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/keyboard.js","import 'custom-event-polyfill';\nimport utils from './utils';\nimport constants from '../src/constants';\n\nvar DropDown = function(list) {\n  this.currentIndex = 0;\n  this.hidden = true;\n  this.list = typeof list === 'string' ? document.querySelector(list) : list;\n  this.items = [];\n\n  this.eventWrapper = {};\n\n  this.getItems();\n  this.initTemplateString();\n  this.addEvents();\n\n  this.initialState = list.innerHTML;\n};\n\nObject.assign(DropDown.prototype, {\n  getItems: function() {\n    this.items = [].slice.call(this.list.querySelectorAll('li'));\n    return this.items;\n  },\n\n  initTemplateString: function() {\n    var items = this.items || this.getItems();\n\n    var templateString = '';\n    if (items.length > 0) templateString = items[items.length - 1].outerHTML;\n    this.templateString = templateString;\n\n    return this.templateString;\n  },\n\n  clickEvent: function(e) {\n    var selected = utils.closest(e.target, 'LI');\n    if (!selected) return;\n\n    this.addSelectedClass(selected);\n\n    e.preventDefault();\n    this.hide();\n\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: this,\n        selected: selected,\n        data: e.target.dataset,\n      },\n    });\n    this.list.dispatchEvent(listEvent);\n  },\n\n  addSelectedClass: function (selected) {\n    this.removeSelectedClasses();\n    selected.classList.add(constants.SELECTED_CLASS);\n  },\n\n  removeSelectedClasses: function () {\n    const items = this.items || this.getItems();\n\n    items.forEach((item) => {\n      item.classList.remove(constants.SELECTED_CLASS)\n    });\n  },\n\n  addEvents: function() {\n    this.eventWrapper.clickEvent = this.clickEvent.bind(this)\n    this.list.addEventListener('click', this.eventWrapper.clickEvent);\n  },\n\n  toggle: function() {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  setData: function(data) {\n    this.data = data;\n    this.render(data);\n  },\n\n  addData: function(data) {\n    this.data = (this.data || []).concat(data);\n    this.render(this.data);\n  },\n\n  render: function(data) {\n    const children = data ? data.map(this.renderChildren.bind(this)) : [];\n    const renderableList = this.list.querySelector('ul[data-dynamic]') || this.list;\n\n    renderableList.innerHTML = children.join('');\n  },\n\n  renderChildren: function(data) {\n    var html = utils.t(this.templateString, data);\n    var template = document.createElement('div');\n\n    template.innerHTML = html;\n    this.setImagesSrc(template);\n    template.firstChild.style.display = data.droplab_hidden ? 'none' : 'block';\n\n    return template.firstChild.outerHTML;\n  },\n\n  setImagesSrc: function(template) {\n    const images = [].slice.call(template.querySelectorAll('img[data-src]'));\n\n    images.forEach((image) => {\n      image.src = image.getAttribute('data-src');\n      image.removeAttribute('data-src');\n    });\n  },\n\n  show: function() {\n    if (!this.hidden) return;\n    this.list.style.display = 'block';\n    this.currentIndex = 0;\n    this.hidden = false;\n  },\n\n  hide: function() {\n    if (this.hidden) return;\n    this.list.style.display = 'none';\n    this.currentIndex = 0;\n    this.hidden = true;\n  },\n\n  toggle: function () {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  destroy: function() {\n    this.hide();\n    this.list.removeEventListener('click', this.eventWrapper.clickEvent);\n  }\n});\n\nexport default DropDown;\n\n\n\n// WEBPACK FOOTER //\n// ./src/dropdown.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookButton = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'button';\n  this.event = 'click';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nHookButton.prototype = Object.create(Hook.prototype);\n\nObject.assign(HookButton.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  clicked: function(e){\n    var buttonEvent = new CustomEvent('click.dl', {\n      detail: {\n        hook: this,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(buttonEvent);\n\n    this.list.toggle();\n  },\n\n  addEvents: function(){\n    this.eventWrapper.clicked = this.clicked.bind(this);\n    this.trigger.addEventListener('click', this.eventWrapper.clicked);\n  },\n\n  removeEvents: function(){\n    this.trigger.removeEventListener('click', this.eventWrapper.clicked);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n  },\n\n  constructor: HookButton,\n});\n\n\nexport default HookButton;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_button.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookInput = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'input';\n  this.event = 'input';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nObject.assign(HookInput.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  addEvents: function(){\n    this.eventWrapper.mousedown = this.mousedown.bind(this);\n    this.eventWrapper.input = this.input.bind(this);\n    this.eventWrapper.keyup = this.keyup.bind(this);\n    this.eventWrapper.keydown = this.keydown.bind(this);\n\n    this.trigger.addEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.addEventListener('input', this.eventWrapper.input);\n    this.trigger.addEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.addEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  removeEvents: function() {\n    this.hasRemovedEvents = true;\n\n    this.trigger.removeEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.removeEventListener('input', this.eventWrapper.input);\n    this.trigger.removeEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.removeEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  input: function(e) {\n    if(this.hasRemovedEvents) return;\n\n    this.list.show();\n\n    const inputEvent = new CustomEvent('input.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(inputEvent);\n  },\n\n  mousedown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    const mouseEvent = new CustomEvent('mousedown.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(mouseEvent);\n  },\n\n  keyup: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keyup.dl');\n  },\n\n  keydown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keydown.dl');\n  },\n\n  keyEvent: function(e, eventName) {\n    this.list.show();\n\n    const keyEvent = new CustomEvent(eventName, {\n      detail: {\n        hook: this,\n        text: e.target.value,\n        which: e.which,\n        key: e.key,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(keyEvent);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n\n    this.list.destroy();\n  }\n});\n\nexport default HookInput;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_input.js","import DropLab from './droplab';\nimport constants from './constants';\nimport Keyboard from './keyboard';\n\nconst DATA_TRIGGER = constants.DATA_TRIGGER;\nconst keyboard = Keyboard();\n\nconst setup = function () {\n  window.DropLab = DropLab();\n};\n\nsetup();\n\nexport default setup\n\n\n\n// WEBPACK FOOTER //\n// ./src/index.js"],"sourceRoot":""} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca","webpack:///./src/constants.js","webpack:///./~/custom-event-polyfill/custom-event-polyfill.js","webpack:///./src/hook.js","webpack:///./src/utils.js","webpack:///./src/droplab.js","webpack:///./src/dropdown.js","webpack:///./src/hook_button.js","webpack:///./src/hook_input.js","webpack:///./src/keyboard.js","webpack:///./src/index.js"],"names":["DATA_TRIGGER","DATA_DROPDOWN","SELECTED_CLASS","ACTIVE_CLASS","Hook","trigger","list","plugins","config","type","event","id","Object","assign","prototype","addEvents","constructor","utils","toCamelCase","attr","camelize","split","slice","join","t","s","d","p","hasOwnProperty","call","replace","RegExp","str","letter","index","toLowerCase","toUpperCase","closest","thisTag","stopTag","tagName","parentNode","isDropDownParts","target","hasAttribute","DropLab","ready","hooks","queuedData","eventWrapper","loadStatic","dropdownTriggers","apply","document","querySelectorAll","addHooks","addData","args","arguments","applyArgs","setData","destroy","forEach","hook","removeEvents","methodName","push","_addData","data","_processData","_setData","Array","isArray","documentClicked","bind","addEventListener","e","hide","removeEventListener","changeHookList","availableTrigger","getElementById","i","dataset","dropdownActive","splice","addHook","availableHook","querySelector","availableList","Element","HookObject","setConfig","obj","fireReady","readyEvent","CustomEvent","detail","dropdown","dispatchEvent","init","DropDown","currentIndex","hidden","items","getItems","initTemplateString","initialState","innerHTML","templateString","length","outerHTML","clickEvent","selected","addSelectedClass","preventDefault","listEvent","removeSelectedClasses","classList","add","item","remove","toggle","show","render","concat","children","map","renderChildren","renderableList","html","template","createElement","setImagesSrc","firstChild","style","display","droplab_hidden","images","image","src","getAttribute","removeAttribute","HookButton","addPlugins","create","plugin","clicked","buttonEvent","bubbles","cancelable","restoreInitialState","removePlugins","HookInput","mousedown","input","keyup","keydown","hasRemovedEvents","inputEvent","text","value","mouseEvent","keyEvent","eventName","which","key","Keyboard","currentKey","currentFocus","isUpArrow","isDownArrow","removeHighlight","itemElements","listItems","listItem","setMenuForArrows","el","filterDropdownEl","filterDropdownBottom","offsetHeight","elOffsetTop","offsetTop","scrollTop","selectItem","currentItem","typedOn"],"mappings":"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","file":"./dist/droplab.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 14);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","const DATA_TRIGGER = 'data-dropdown-trigger';\nconst DATA_DROPDOWN = 'data-dropdown';\nconst SELECTED_CLASS = 'droplab-item-selected';\nconst ACTIVE_CLASS = 'droplab-item-active';\n\nexport {\n  DATA_TRIGGER,\n  DATA_DROPDOWN,\n  SELECTED_CLASS,\n  ACTIVE_CLASS,\n};\n\n\n\n// WEBPACK FOOTER //\n// ./src/constants.js","// Polyfill for creating CustomEvents on IE9/10/11\n\n// code pulled from:\n// https://github.com/d4tocchini/customevent-polyfill\n// https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent#Polyfill\n\ntry {\n    var ce = new window.CustomEvent('test');\n    ce.preventDefault();\n    if (ce.defaultPrevented !== true) {\n        // IE has problems with .preventDefault() on custom events\n        // http://stackoverflow.com/questions/23349191\n        throw new Error('Could not prevent default');\n    }\n} catch(e) {\n  var CustomEvent = function(event, params) {\n    var evt, origPrevent;\n    params = params || {\n      bubbles: false,\n      cancelable: false,\n      detail: undefined\n    };\n\n    evt = document.createEvent(\"CustomEvent\");\n    evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);\n    origPrevent = evt.preventDefault;\n    evt.preventDefault = function () {\n      origPrevent.call(this);\n      try {\n        Object.defineProperty(this, 'defaultPrevented', {\n          get: function () {\n            return true;\n          }\n        });\n      } catch(e) {\n        this.defaultPrevented = true;\n      }\n    };\n    return evt;\n  };\n\n  CustomEvent.prototype = window.Event.prototype;\n  window.CustomEvent = CustomEvent; // expose definition to window\n}\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./~/custom-event-polyfill/custom-event-polyfill.js\n// module id = 1\n// module chunks = 0 1","import DropDown from './dropdown';\n\nvar Hook = function(trigger, list, plugins, config){\n  this.trigger = trigger;\n  this.list = new DropDown(list);\n  this.type = 'Hook';\n  this.event = 'click';\n  this.plugins = plugins || [];\n  this.config = config || {};\n  this.id = trigger.id;\n};\n\nObject.assign(Hook.prototype, {\n\n  addEvents: function(){},\n\n  constructor: Hook,\n});\n\nexport default Hook;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook.js","import { DATA_TRIGGER, DATA_DROPDOWN } from './constants';\n\nconst utils = {\n  toCamelCase(attr) {\n    return this.camelize(attr.split('-').slice(1).join(' '));\n  },\n\n  t(s, d) {\n    for (const p in d) {\n      if (Object.prototype.hasOwnProperty.call(d, p)) {\n        s = s.replace(new RegExp(`{{${p}}}`, 'g'), d[p]);\n      }\n    }\n    return s;\n  },\n\n  camelize(str) {\n    return str.replace(/(?:^\\w|[A-Z]|\\b\\w)/g, (letter, index) => {\n      return index === 0 ? letter.toLowerCase() : letter.toUpperCase();\n    }).replace(/\\s+/g, '');\n  },\n\n  closest(thisTag, stopTag) {\n    while (thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML') {\n      thisTag = thisTag.parentNode;\n    }\n    return thisTag;\n  },\n\n  isDropDownParts(target) {\n    if (!target || target.tagName === 'HTML') return false;\n    return target.hasAttribute(DATA_TRIGGER) || target.hasAttribute(DATA_DROPDOWN);\n  },\n};\n\n\nexport default utils;\n\n\n\n// WEBPACK FOOTER //\n// ./src/utils.js","import 'custom-event-polyfill';\nimport HookButton from './hook_button';\nimport HookInput from './hook_input';\nimport utils from './utils';\nimport Keyboard from './keyboard';\nimport { DATA_TRIGGER } from './constants';\n\nvar DropLab = function() {\n  this.ready = false;\n  this.hooks = [];\n  this.queuedData = [];\n  this.config = {};\n\n  this.eventWrapper = {};\n};\n\nObject.assign(DropLab.prototype, {\n  loadStatic: function(){\n    var dropdownTriggers = [].slice.apply(document.querySelectorAll(`[${DATA_TRIGGER}]`));\n    this.addHooks(dropdownTriggers);\n  },\n\n  addData: function () {\n    var args = [].slice.apply(arguments);\n    this.applyArgs(args, '_addData');\n  },\n\n  setData: function() {\n    var args = [].slice.apply(arguments);\n    this.applyArgs(args, '_setData');\n  },\n\n  destroy: function() {\n    this.hooks.forEach(hook => hook.destroy());\n    this.hooks = [];\n    this.removeEvents();\n  },\n\n  applyArgs: function(args, methodName) {\n    if (this.ready) return this[methodName].apply(this, args);\n\n    this.queuedData = this.queuedData || [];\n    this.queuedData.push(args);\n  },\n\n  _addData: function(trigger, data) {\n    this._processData(trigger, data, 'addData');\n  },\n\n  _setData: function(trigger, data) {\n    this._processData(trigger, data, 'setData');\n  },\n\n  _processData: function(trigger, data, methodName) {\n    this.hooks.forEach((hook) => {\n      if (Array.isArray(trigger)) hook.list[methodName](trigger);\n\n      if (hook.trigger.id === trigger) hook.list[methodName](data);\n    });\n  },\n\n  addEvents: function() {\n    this.eventWrapper.documentClicked = this.documentClicked.bind(this)\n    document.addEventListener('click', this.eventWrapper.documentClicked);\n  },\n\n  documentClicked: function(e) {\n    let thisTag = e.target;\n\n    if (thisTag.tagName !== 'UL') thisTag = utils.closest(thisTag, 'UL');\n    if (utils.isDropDownParts(thisTag, this.hooks) || utils.isDropDownParts(e.target, this.hooks)) return;\n\n    this.hooks.forEach(hook => hook.list.hide());\n  },\n\n  removeEvents: function(){\n    document.removeEventListener('click', this.eventWrapper.documentClicked);\n  },\n\n  changeHookList: function(trigger, list, plugins, config) {\n    const availableTrigger =  typeof trigger === 'string' ? document.getElementById(trigger) : trigger;\n\n\n    this.hooks.forEach((hook, i) => {\n      hook.list.list.dataset.dropdownActive = false;\n\n      if (hook.trigger !== availableTrigger) return;\n\n      hook.destroy();\n      this.hooks.splice(i, 1);\n      this.addHook(availableTrigger, list, plugins, config);\n    });\n  },\n\n  addHook: function(hook, list, plugins, config) {\n    const availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook;\n    let availableList;\n\n    if (typeof list === 'string') {\n      availableList = document.querySelector(list);\n    } else if (list instanceof Element) {\n      availableList = list;\n    } else {\n      availableList = document.querySelector(hook.dataset[utils.toCamelCase(DATA_TRIGGER)]);\n    }\n\n    availableList.dataset.dropdownActive = true;\n\n    const HookObject = availableHook.tagName === 'INPUT' ? HookInput : HookButton;\n    this.hooks.push(new HookObject(availableHook, availableList, plugins, config));\n\n    return this;\n  },\n\n  addHooks: function(hooks, plugins, config) {\n    hooks.forEach(hook => this.addHook(hook, null, plugins, config));\n    return this;\n  },\n\n  setConfig: function(obj){\n    this.config = obj;\n  },\n\n  fireReady: function() {\n    const readyEvent = new CustomEvent('ready.dl', {\n      detail: {\n        dropdown: this,\n      },\n    });\n    document.dispatchEvent(readyEvent);\n\n    this.ready = true;\n  },\n\n  init: function (hook, list, plugins, config) {\n    hook ? this.addHook(hook, list, plugins, config) : this.loadStatic();\n\n    this.addEvents();\n\n    Keyboard();\n\n    this.fireReady();\n\n    this.queuedData.forEach(data => this.addData(data));\n    this.queuedData = [];\n\n    return this;\n  },\n});\n\nexport default DropLab;\n\n\n\n// WEBPACK FOOTER //\n// ./src/droplab.js","import 'custom-event-polyfill';\nimport utils from './utils';\nimport { SELECTED_CLASS } from '../src/constants';\n\nvar DropDown = function(list) {\n  this.currentIndex = 0;\n  this.hidden = true;\n  this.list = typeof list === 'string' ? document.querySelector(list) : list;\n  this.items = [];\n\n  this.eventWrapper = {};\n\n  this.getItems();\n  this.initTemplateString();\n  this.addEvents();\n\n  this.initialState = list.innerHTML;\n};\n\nObject.assign(DropDown.prototype, {\n  getItems: function() {\n    this.items = [].slice.call(this.list.querySelectorAll('li'));\n    return this.items;\n  },\n\n  initTemplateString: function() {\n    var items = this.items || this.getItems();\n\n    var templateString = '';\n    if (items.length > 0) templateString = items[items.length - 1].outerHTML;\n    this.templateString = templateString;\n\n    return this.templateString;\n  },\n\n  clickEvent: function(e) {\n    var selected = utils.closest(e.target, 'LI');\n    if (!selected) return;\n\n    this.addSelectedClass(selected);\n\n    e.preventDefault();\n    this.hide();\n\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: this,\n        selected: selected,\n        data: e.target.dataset,\n      },\n    });\n    this.list.dispatchEvent(listEvent);\n  },\n\n  addSelectedClass: function (selected) {\n    this.removeSelectedClasses();\n    selected.classList.add(SELECTED_CLASS);\n  },\n\n  removeSelectedClasses: function () {\n    const items = this.items || this.getItems();\n\n    items.forEach(item => item.classList.remove(SELECTED_CLASS));\n  },\n\n  addEvents: function() {\n    this.eventWrapper.clickEvent = this.clickEvent.bind(this)\n    this.list.addEventListener('click', this.eventWrapper.clickEvent);\n  },\n\n  toggle: function() {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  setData: function(data) {\n    this.data = data;\n    this.render(data);\n  },\n\n  addData: function(data) {\n    this.data = (this.data || []).concat(data);\n    this.render(this.data);\n  },\n\n  render: function(data) {\n    const children = data ? data.map(this.renderChildren.bind(this)) : [];\n    const renderableList = this.list.querySelector('ul[data-dynamic]') || this.list;\n\n    renderableList.innerHTML = children.join('');\n  },\n\n  renderChildren: function(data) {\n    var html = utils.t(this.templateString, data);\n    var template = document.createElement('div');\n\n    template.innerHTML = html;\n    this.setImagesSrc(template);\n    template.firstChild.style.display = data.droplab_hidden ? 'none' : 'block';\n\n    return template.firstChild.outerHTML;\n  },\n\n  setImagesSrc: function(template) {\n    const images = [].slice.call(template.querySelectorAll('img[data-src]'));\n\n    images.forEach((image) => {\n      image.src = image.getAttribute('data-src');\n      image.removeAttribute('data-src');\n    });\n  },\n\n  show: function() {\n    if (!this.hidden) return;\n    this.list.style.display = 'block';\n    this.currentIndex = 0;\n    this.hidden = false;\n  },\n\n  hide: function() {\n    if (this.hidden) return;\n    this.list.style.display = 'none';\n    this.currentIndex = 0;\n    this.hidden = true;\n  },\n\n  toggle: function () {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  destroy: function() {\n    this.hide();\n    this.list.removeEventListener('click', this.eventWrapper.clickEvent);\n  }\n});\n\nexport default DropDown;\n\n\n\n// WEBPACK FOOTER //\n// ./src/dropdown.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookButton = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'button';\n  this.event = 'click';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nHookButton.prototype = Object.create(Hook.prototype);\n\nObject.assign(HookButton.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  clicked: function(e){\n    var buttonEvent = new CustomEvent('click.dl', {\n      detail: {\n        hook: this,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(buttonEvent);\n\n    this.list.toggle();\n  },\n\n  addEvents: function(){\n    this.eventWrapper.clicked = this.clicked.bind(this);\n    this.trigger.addEventListener('click', this.eventWrapper.clicked);\n  },\n\n  removeEvents: function(){\n    this.trigger.removeEventListener('click', this.eventWrapper.clicked);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n  },\n\n  constructor: HookButton,\n});\n\n\nexport default HookButton;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_button.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookInput = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'input';\n  this.event = 'input';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nObject.assign(HookInput.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  addEvents: function(){\n    this.eventWrapper.mousedown = this.mousedown.bind(this);\n    this.eventWrapper.input = this.input.bind(this);\n    this.eventWrapper.keyup = this.keyup.bind(this);\n    this.eventWrapper.keydown = this.keydown.bind(this);\n\n    this.trigger.addEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.addEventListener('input', this.eventWrapper.input);\n    this.trigger.addEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.addEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  removeEvents: function() {\n    this.hasRemovedEvents = true;\n\n    this.trigger.removeEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.removeEventListener('input', this.eventWrapper.input);\n    this.trigger.removeEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.removeEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  input: function(e) {\n    if(this.hasRemovedEvents) return;\n\n    this.list.show();\n\n    const inputEvent = new CustomEvent('input.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(inputEvent);\n  },\n\n  mousedown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    const mouseEvent = new CustomEvent('mousedown.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(mouseEvent);\n  },\n\n  keyup: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keyup.dl');\n  },\n\n  keydown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keydown.dl');\n  },\n\n  keyEvent: function(e, eventName) {\n    this.list.show();\n\n    const keyEvent = new CustomEvent(eventName, {\n      detail: {\n        hook: this,\n        text: e.target.value,\n        which: e.which,\n        key: e.key,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(keyEvent);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n\n    this.list.destroy();\n  }\n});\n\nexport default HookInput;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_input.js","import { ACTIVE_CLASS } from './constants';\n\nconst Keyboard = function () {\n  var currentKey;\n  var currentFocus;\n  var isUpArrow = false;\n  var isDownArrow = false;\n  var removeHighlight = function removeHighlight(list) {\n    var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0);\n    var listItems = [];\n    for(var i = 0; i < itemElements.length; i++) {\n      var listItem = itemElements[i];\n      listItem.classList.remove(ACTIVE_CLASS);\n\n      if (listItem.style.display !== 'none') {\n        listItems.push(listItem);\n      }\n    }\n    return listItems;\n  };\n\n  var setMenuForArrows = function setMenuForArrows(list) {\n    var listItems = removeHighlight(list);\n    if(list.currentIndex>0){\n      if(!listItems[list.currentIndex-1]){\n        list.currentIndex = list.currentIndex-1;\n      }\n\n      if (listItems[list.currentIndex-1]) {\n        var el = listItems[list.currentIndex-1];\n        var filterDropdownEl = el.closest('.filter-dropdown');\n        el.classList.add(ACTIVE_CLASS);\n\n        if (filterDropdownEl) {\n          var filterDropdownBottom = filterDropdownEl.offsetHeight;\n          var elOffsetTop = el.offsetTop - 30;\n\n          if (elOffsetTop > filterDropdownBottom) {\n            filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom;\n          }\n        }\n      }\n    }\n  };\n\n  var mousedown = function mousedown(e) {\n    var list = e.detail.hook.list;\n    removeHighlight(list);\n    list.show();\n    list.currentIndex = 0;\n    isUpArrow = false;\n    isDownArrow = false;\n  };\n  var selectItem = function selectItem(list) {\n    var listItems = removeHighlight(list);\n    var currentItem = listItems[list.currentIndex-1];\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: list,\n        selected: currentItem,\n        data: currentItem.dataset,\n      },\n    });\n    list.list.dispatchEvent(listEvent);\n    list.hide();\n  }\n\n  var keydown = function keydown(e){\n    var typedOn = e.target;\n    var list = e.detail.hook.list;\n    var currentIndex = list.currentIndex;\n    isUpArrow = false;\n    isDownArrow = false;\n\n    if(e.detail.which){\n      currentKey = e.detail.which;\n      if(currentKey === 13){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 38) {\n        isUpArrow = true;\n      }\n      if(currentKey === 40) {\n        isDownArrow = true;\n      }\n    } else if(e.detail.key) {\n      currentKey = e.detail.key;\n      if(currentKey === 'Enter'){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 'ArrowUp') {\n        isUpArrow = true;\n      }\n      if(currentKey === 'ArrowDown') {\n        isDownArrow = true;\n      }\n    }\n    if(isUpArrow){ currentIndex--; }\n    if(isDownArrow){ currentIndex++; }\n    if(currentIndex < 0){ currentIndex = 0; }\n    list.currentIndex = currentIndex;\n    setMenuForArrows(e.detail.hook.list);\n  };\n\n  document.addEventListener('mousedown.dl', mousedown);\n  document.addEventListener('keydown.dl', keydown);\n};\n\nexport default Keyboard;\n\n\n\n// WEBPACK FOOTER //\n// ./src/keyboard.js","export * from './droplab';\n\n\n\n// WEBPACK FOOTER //\n// ./src/index.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/ajax.js b/app/assets/javascripts/droplab/plugins/ajax.js index e68983416ec..afc423b7f0e 100644 --- a/app/assets/javascripts/droplab/plugins/ajax.js +++ b/app/assets/javascripts/droplab/plugins/ajax.js @@ -63,12 +63,12 @@ /******/ __webpack_require__.p = ""; /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 10); +/******/ return __webpack_require__(__webpack_require__.s = 5); /******/ }) /************************************************************************/ /******/ ({ -/***/ 10: +/***/ 5: /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -149,11 +149,9 @@ var droplabAjax = { } }; -window.droplabAjax = droplabAjax; - exports.default = droplabAjax; /***/ }) /******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c?ec5f***","webpack:///./src/plugins/ajax.js"],"names":["droplabAjaxException","message","droplabAjax","_loadUrlData","url","self","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","data","JSON","parse","responseText","cache","send","_loadData","config","loadingTemplate","dataLoadingTemplate","hook","list","querySelector","outerHTML","listTemplate","destroyed","method","call","init","endpoint","dynamicList","document","createElement","innerHTML","setAttribute","then","d","catch","e","destroy","window"],"mappings":"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","file":"./dist/plugins/ajax.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 10);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","function droplabAjaxException(message) {\n  this.message = message;\n}\n\nconst droplabAjax = {\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n  _loadData: function _loadData(data, config, self) {\n    if (config.loadingTemplate) {\n      var dataLoadingTemplate = self.hook.list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) dataLoadingTemplate.outerHTML = self.listTemplate;\n    }\n\n    if (!self.destroyed) self.hook.list[config.method].call(self.hook.list, data);\n  },\n  init: function init(hook) {\n    var self = this;\n    self.destroyed = false;\n    self.cache = self.cache || {};\n    var config = hook.config.droplabAjax;\n    this.hook = hook;\n    if (!config || !config.endpoint || !config.method) {\n      return;\n    }\n    if (config.method !== 'setData' && config.method !== 'addData') {\n      return;\n    }\n    if (config.loadingTemplate) {\n      var dynamicList = hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', '');\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (self.cache[config.endpoint]) {\n      self._loadData(self.cache[config.endpoint], config, self);\n    } else {\n      this._loadUrlData(config.endpoint)\n        .then(function(d) {\n          self._loadData(d, config, self);\n        }).catch(function(e) {\n          throw new droplabAjaxException(e.message || e);\n        });\n    }\n  },\n  destroy: function() {\n    this.destroyed = true;\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nwindow.droplabAjax = droplabAjax;\n\nexport default droplabAjax;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax.js"],"sourceRoot":""} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca?0abf********","webpack:///./src/plugins/ajax/ajax.js?2178"],"names":["droplabAjaxException","message","droplabAjax","_loadUrlData","url","self","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","data","JSON","parse","responseText","cache","send","_loadData","config","loadingTemplate","dataLoadingTemplate","hook","list","querySelector","outerHTML","listTemplate","destroyed","method","call","init","endpoint","dynamicList","document","createElement","innerHTML","setAttribute","then","d","catch","e","destroy"],"mappings":"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","file":"./dist/plugins/ajax.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 5);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","function droplabAjaxException(message) {\n  this.message = message;\n}\n\nconst droplabAjax = {\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n  _loadData: function _loadData(data, config, self) {\n    if (config.loadingTemplate) {\n      var dataLoadingTemplate = self.hook.list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) dataLoadingTemplate.outerHTML = self.listTemplate;\n    }\n\n    if (!self.destroyed) self.hook.list[config.method].call(self.hook.list, data);\n  },\n  init: function init(hook) {\n    var self = this;\n    self.destroyed = false;\n    self.cache = self.cache || {};\n    var config = hook.config.droplabAjax;\n    this.hook = hook;\n    if (!config || !config.endpoint || !config.method) {\n      return;\n    }\n    if (config.method !== 'setData' && config.method !== 'addData') {\n      return;\n    }\n    if (config.loadingTemplate) {\n      var dynamicList = hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', '');\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (self.cache[config.endpoint]) {\n      self._loadData(self.cache[config.endpoint], config, self);\n    } else {\n      this._loadUrlData(config.endpoint)\n        .then(function(d) {\n          self._loadData(d, config, self);\n        }).catch(function(e) {\n          throw new droplabAjaxException(e.message || e);\n        });\n    }\n  },\n  destroy: function() {\n    this.destroyed = true;\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nexport default droplabAjax;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax/ajax.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/ajax_filter.js b/app/assets/javascripts/droplab/plugins/ajax_filter.js index b5892694e60..3e6532c7709 100644 --- a/app/assets/javascripts/droplab/plugins/ajax_filter.js +++ b/app/assets/javascripts/droplab/plugins/ajax_filter.js @@ -63,12 +63,12 @@ /******/ __webpack_require__.p = ""; /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 11); +/******/ return __webpack_require__(__webpack_require__.s = 6); /******/ }) /************************************************************************/ /******/ ({ -/***/ 11: +/***/ 6: /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -206,11 +206,9 @@ var droplabAjaxFilter = { } }; -window.droplabAjaxFilter = droplabAjaxFilter; - exports.default = droplabAjaxFilter; /***/ }) /******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c?ec5f**","webpack:///./src/plugins/ajax_filter.js"],"names":["droplabAjaxFilter","init","hook","destroyed","notLoading","eventWrapper","debounceTrigger","bind","trigger","addEventListener","loading","e","NON_CHARACTER_KEYS","invalidKeyPressed","indexOf","detail","which","keyCode","focusEvent","type","timeout","clearTimeout","setTimeout","getEntireList","config","searchValue","value","endpoint","searchKey","searchValueFunction","loadingTemplate","list","data","undefined","length","dynamicList","querySelector","document","createElement","innerHTML","setAttribute","listTemplate","outerHTML","show","params","self","cache","url","buildParams","urlCachedData","_loadData","_loadUrlData","then","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","JSON","parse","responseText","send","dataLoadingTemplate","hookListChildren","children","onlyDynamicList","hasAttribute","hide","setData","call","currentIndex","paramsArray","Object","keys","map","param","join","destroy","removeEventListener","window"],"mappings":"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","file":"./dist/plugins/ajax_filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 11);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","const droplabAjaxFilter = {\n  init: function(hook) {\n    this.destroyed = false;\n    this.hook = hook;\n    this.notLoading();\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceTrigger = this.debounceTrigger.bind(this);\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.addEventListener('focus', this.eventWrapper.debounceTrigger);\n\n    this.trigger(true);\n  },\n\n  notLoading: function notLoading() {\n    this.loading = false;\n  },\n\n  debounceTrigger: function debounceTrigger(e) {\n    var NON_CHARACTER_KEYS = [16, 17, 18, 20, 37, 38, 39, 40, 91, 93];\n    var invalidKeyPressed = NON_CHARACTER_KEYS.indexOf(e.detail.which || e.detail.keyCode) > -1;\n    var focusEvent = e.type === 'focus';\n    if (invalidKeyPressed || this.loading) {\n      return;\n    }\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n    this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200);\n  },\n\n  trigger: function trigger(getEntireList) {\n    var config = this.hook.config.droplabAjaxFilter;\n    var searchValue = this.trigger.value;\n    if (!config || !config.endpoint || !config.searchKey) {\n      return;\n    }\n    if (config.searchValueFunction) {\n      searchValue = config.searchValueFunction();\n    }\n    if (config.loadingTemplate && this.hook.list.data === undefined ||\n      this.hook.list.data.length === 0) {\n      var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', true);\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (getEntireList) {\n      searchValue = '';\n    }\n    if (config.searchKey === searchValue) {\n      return this.list.show();\n    }\n    this.loading = true;\n    var params = config.params || {};\n    params[config.searchKey] = searchValue;\n    var self = this;\n    self.cache = self.cache || {};\n    var url = config.endpoint + this.buildParams(params);\n    var urlCachedData = self.cache[url];\n    if (urlCachedData) {\n      self._loadData(urlCachedData, config, self);\n    } else {\n      this._loadUrlData(url)\n        .then(function(data) {\n          self._loadData(data, config, self);\n        });\n    }\n  },\n\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n\n  _loadData: function _loadData(data, config, self) {\n    const list = self.hook.list;\n    if (config.loadingTemplate && list.data === undefined ||\n      list.data.length === 0) {\n      const dataLoadingTemplate = list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) {\n        dataLoadingTemplate.outerHTML = self.listTemplate;\n      }\n    }\n    if (!self.destroyed) {\n      var hookListChildren = list.list.children;\n      var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic');\n      if (onlyDynamicList && data.length === 0) {\n        list.hide();\n      }\n      list.setData.call(list, data);\n    }\n    self.notLoading();\n    list.currentIndex = 0;\n  },\n\n  buildParams: function(params) {\n    if (!params) return '';\n    var paramsArray = Object.keys(params).map(function(param) {\n      return param + '=' + (params[param] || '');\n    });\n    return '?' + paramsArray.join('&');\n  },\n\n  destroy: function destroy() {\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n\n    this.destroyed = true;\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.removeEventListener('focus', this.eventWrapper.debounceTrigger);\n  }\n};\n\nwindow.droplabAjaxFilter = droplabAjaxFilter;\n\nexport default droplabAjaxFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax_filter.js"],"sourceRoot":""} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca?0abf*******","webpack:///./src/plugins/ajax_filter/ajax_filter.js?c3e5"],"names":["droplabAjaxFilter","init","hook","destroyed","notLoading","eventWrapper","debounceTrigger","bind","trigger","addEventListener","loading","e","NON_CHARACTER_KEYS","invalidKeyPressed","indexOf","detail","which","keyCode","focusEvent","type","timeout","clearTimeout","setTimeout","getEntireList","config","searchValue","value","endpoint","searchKey","searchValueFunction","loadingTemplate","list","data","undefined","length","dynamicList","querySelector","document","createElement","innerHTML","setAttribute","listTemplate","outerHTML","show","params","self","cache","url","buildParams","urlCachedData","_loadData","_loadUrlData","then","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","JSON","parse","responseText","send","dataLoadingTemplate","hookListChildren","children","onlyDynamicList","hasAttribute","hide","setData","call","currentIndex","paramsArray","Object","keys","map","param","join","destroy","removeEventListener"],"mappings":"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","file":"./dist/plugins/ajax_filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 6);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","const droplabAjaxFilter = {\n  init: function(hook) {\n    this.destroyed = false;\n    this.hook = hook;\n    this.notLoading();\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceTrigger = this.debounceTrigger.bind(this);\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.addEventListener('focus', this.eventWrapper.debounceTrigger);\n\n    this.trigger(true);\n  },\n\n  notLoading: function notLoading() {\n    this.loading = false;\n  },\n\n  debounceTrigger: function debounceTrigger(e) {\n    var NON_CHARACTER_KEYS = [16, 17, 18, 20, 37, 38, 39, 40, 91, 93];\n    var invalidKeyPressed = NON_CHARACTER_KEYS.indexOf(e.detail.which || e.detail.keyCode) > -1;\n    var focusEvent = e.type === 'focus';\n    if (invalidKeyPressed || this.loading) {\n      return;\n    }\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n    this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200);\n  },\n\n  trigger: function trigger(getEntireList) {\n    var config = this.hook.config.droplabAjaxFilter;\n    var searchValue = this.trigger.value;\n    if (!config || !config.endpoint || !config.searchKey) {\n      return;\n    }\n    if (config.searchValueFunction) {\n      searchValue = config.searchValueFunction();\n    }\n    if (config.loadingTemplate && this.hook.list.data === undefined ||\n      this.hook.list.data.length === 0) {\n      var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', true);\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (getEntireList) {\n      searchValue = '';\n    }\n    if (config.searchKey === searchValue) {\n      return this.list.show();\n    }\n    this.loading = true;\n    var params = config.params || {};\n    params[config.searchKey] = searchValue;\n    var self = this;\n    self.cache = self.cache || {};\n    var url = config.endpoint + this.buildParams(params);\n    var urlCachedData = self.cache[url];\n    if (urlCachedData) {\n      self._loadData(urlCachedData, config, self);\n    } else {\n      this._loadUrlData(url)\n        .then(function(data) {\n          self._loadData(data, config, self);\n        });\n    }\n  },\n\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n\n  _loadData: function _loadData(data, config, self) {\n    const list = self.hook.list;\n    if (config.loadingTemplate && list.data === undefined ||\n      list.data.length === 0) {\n      const dataLoadingTemplate = list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) {\n        dataLoadingTemplate.outerHTML = self.listTemplate;\n      }\n    }\n    if (!self.destroyed) {\n      var hookListChildren = list.list.children;\n      var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic');\n      if (onlyDynamicList && data.length === 0) {\n        list.hide();\n      }\n      list.setData.call(list, data);\n    }\n    self.notLoading();\n    list.currentIndex = 0;\n  },\n\n  buildParams: function(params) {\n    if (!params) return '';\n    var paramsArray = Object.keys(params).map(function(param) {\n      return param + '=' + (params[param] || '');\n    });\n    return '?' + paramsArray.join('&');\n  },\n\n  destroy: function destroy() {\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n\n    this.destroyed = true;\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.removeEventListener('focus', this.eventWrapper.debounceTrigger);\n  }\n};\n\nexport default droplabAjaxFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax_filter/ajax_filter.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/filter.js b/app/assets/javascripts/droplab/plugins/filter.js index 183d137b3a3..3d81fbd7d2f 100644 --- a/app/assets/javascripts/droplab/plugins/filter.js +++ b/app/assets/javascripts/droplab/plugins/filter.js @@ -63,12 +63,12 @@ /******/ __webpack_require__.p = ""; /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 12); +/******/ return __webpack_require__(__webpack_require__.s = 7); /******/ }) /************************************************************************/ /******/ ({ -/***/ 12: +/***/ 7: /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -150,10 +150,12 @@ var droplabFilter = { this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this); this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown); + this.hook.trigger.addEventListener('mousedown.dl', this.eventWrapper.debounceKeydown); }, destroy: function destroy() { this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown); + this.hook.trigger.removeEventListener('mousedown.dl', this.eventWrapper.debounceKeydown); var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); if (this.listTemplate && dynamicList) { @@ -162,11 +164,9 @@ var droplabFilter = { } }; -window.droplabFilter = droplabFilter; - exports.default = droplabFilter; /***/ }) /******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c?ec5f*","webpack:///./src/plugins/filter.js"],"names":["droplabFilter","keydown","e","hiddenCount","dataHiddenCount","list","detail","hook","data","value","trigger","toLowerCase","config","matches","filterFunction","o","droplab_hidden","template","indexOf","filter","length","map","render","currentIndex","debounceKeydown","which","keyCode","timeout","clearTimeout","setTimeout","bind","init","eventWrapper","addEventListener","destroy","removeEventListener","dynamicList","querySelector","listTemplate","outerHTML","window"],"mappings":"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","file":"./dist/plugins/filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 12);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","const droplabFilter = {\n  keydown: function(e){\n    var hiddenCount = 0;\n    var dataHiddenCount = 0;\n\n    var list = e.detail.hook.list;\n    var data = list.data;\n    var value = e.detail.hook.trigger.value.toLowerCase();\n    var config = e.detail.hook.config.droplabFilter;\n    var matches = [];\n    var filterFunction;\n    // will only work on dynamically set data\n    if(!data){\n      return;\n    }\n\n    if (config && config.filterFunction && typeof config.filterFunction === 'function') {\n      filterFunction = config.filterFunction;\n    } else {\n      filterFunction = function(o){\n        // cheap string search\n        o.droplab_hidden = o[config.template].toLowerCase().indexOf(value) === -1;\n        return o;\n      };\n    }\n\n    dataHiddenCount = data.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    matches = data.map(function(o) {\n      return filterFunction(o, value);\n    });\n\n    hiddenCount = matches.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    if (dataHiddenCount !== hiddenCount) {\n      list.render(matches);\n      list.currentIndex = 0;\n    }\n  },\n\n  debounceKeydown: function debounceKeydown(e) {\n    if ([\n      13, // enter\n      16, // shift\n      17, // ctrl\n      18, // alt\n      20, // caps lock\n      37, // left arrow\n      38, // up arrow\n      39, // right arrow\n      40, // down arrow\n      91, // left window\n      92, // right window\n      93, // select\n    ].indexOf(e.detail.which || e.detail.keyCode) > -1) return;\n\n    if (this.timeout) clearTimeout(this.timeout);\n    this.timeout = setTimeout(this.keydown.bind(this, e), 200);\n  },\n\n  init: function init(hook) {\n    var config = hook.config.droplabFilter;\n\n    if (!config || !config.template) return;\n\n    this.hook = hook;\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this);\n\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n  },\n\n  destroy: function destroy() {\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nwindow.droplabFilter = droplabFilter;\n\nexport default droplabFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/filter.js"],"sourceRoot":""} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca?0abf******","webpack:///./src/plugins/filter/filter.js?f41a"],"names":["droplabFilter","keydown","e","hiddenCount","dataHiddenCount","list","detail","hook","data","value","trigger","toLowerCase","config","matches","filterFunction","o","droplab_hidden","template","indexOf","filter","length","map","render","currentIndex","debounceKeydown","which","keyCode","timeout","clearTimeout","setTimeout","bind","init","eventWrapper","addEventListener","destroy","removeEventListener","dynamicList","querySelector","listTemplate","outerHTML"],"mappings":"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","file":"./dist/plugins/filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 7);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","const droplabFilter = {\n  keydown: function(e){\n    var hiddenCount = 0;\n    var dataHiddenCount = 0;\n\n    var list = e.detail.hook.list;\n    var data = list.data;\n    var value = e.detail.hook.trigger.value.toLowerCase();\n    var config = e.detail.hook.config.droplabFilter;\n    var matches = [];\n    var filterFunction;\n    // will only work on dynamically set data\n    if(!data){\n      return;\n    }\n\n    if (config && config.filterFunction && typeof config.filterFunction === 'function') {\n      filterFunction = config.filterFunction;\n    } else {\n      filterFunction = function(o){\n        // cheap string search\n        o.droplab_hidden = o[config.template].toLowerCase().indexOf(value) === -1;\n        return o;\n      };\n    }\n\n    dataHiddenCount = data.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    matches = data.map(function(o) {\n      return filterFunction(o, value);\n    });\n\n    hiddenCount = matches.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    if (dataHiddenCount !== hiddenCount) {\n      list.render(matches);\n      list.currentIndex = 0;\n    }\n  },\n\n  debounceKeydown: function debounceKeydown(e) {\n    if ([\n      13, // enter\n      16, // shift\n      17, // ctrl\n      18, // alt\n      20, // caps lock\n      37, // left arrow\n      38, // up arrow\n      39, // right arrow\n      40, // down arrow\n      91, // left window\n      92, // right window\n      93, // select\n    ].indexOf(e.detail.which || e.detail.keyCode) > -1) return;\n\n    if (this.timeout) clearTimeout(this.timeout);\n    this.timeout = setTimeout(this.keydown.bind(this, e), 200);\n  },\n\n  init: function init(hook) {\n    var config = hook.config.droplabFilter;\n\n    if (!config || !config.template) return;\n\n    this.hook = hook;\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this);\n\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n    this.hook.trigger.addEventListener('mousedown.dl', this.eventWrapper.debounceKeydown);\n  },\n\n  destroy: function destroy() {\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n    this.hook.trigger.removeEventListener('mousedown.dl', this.eventWrapper.debounceKeydown);\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nexport default droplabFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/filter/filter.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/input_setter.js b/app/assets/javascripts/droplab/plugins/input_setter.js index ffc9af0476d..2ee9a796634 100644 --- a/app/assets/javascripts/droplab/plugins/input_setter.js +++ b/app/assets/javascripts/droplab/plugins/input_setter.js @@ -63,12 +63,12 @@ /******/ __webpack_require__.p = ""; /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 13); +/******/ return __webpack_require__(__webpack_require__.s = 8); /******/ }) /************************************************************************/ /******/ ({ -/***/ 13: +/***/ 8: /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -119,11 +119,9 @@ var droplabInputSetter = { } }; -window.droplabInputSetter = droplabInputSetter; - exports.default = droplabInputSetter; /***/ }) /******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vd2VicGFjay9ib290c3RyYXAgZjM3NjcyYjdmNTI4YjQ3MmE0NGM/ZWM1ZiIsIndlYnBhY2s6Ly8vLi9zcmMvcGx1Z2lucy9pbnB1dF9zZXR0ZXIuanMiXSwibmFtZXMiOlsiZHJvcGxhYklucHV0U2V0dGVyIiwiaW5pdCIsImhvb2siLCJjb25maWciLCJldmVudFdyYXBwZXIiLCJhZGRFdmVudHMiLCJzZXRJbnB1dHMiLCJiaW5kIiwibGlzdCIsImFkZEV2ZW50TGlzdGVuZXIiLCJyZW1vdmVFdmVudHMiLCJyZW1vdmVFdmVudExpc3RlbmVyIiwiZSIsInNlbGVjdGVkSXRlbSIsImRldGFpbCIsInNlbGVjdGVkIiwiQXJyYXkiLCJpc0FycmF5IiwiZm9yRWFjaCIsInNldElucHV0IiwiaW5wdXQiLCJ0cmlnZ2VyIiwibmV3VmFsdWUiLCJnZXRBdHRyaWJ1dGUiLCJ2YWx1ZUF0dHJpYnV0ZSIsInRhZ05hbWUiLCJ2YWx1ZSIsInRleHRDb250ZW50IiwiZGVzdHJveSIsIndpbmRvdyJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBO0FBQ0E7O0FBRUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOztBQUVBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBO0FBQ0E7OztBQUdBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBLG1EQUEyQyxjQUFjOztBQUV6RDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBLGFBQUs7QUFDTDtBQUNBOztBQUVBO0FBQ0E7QUFDQTtBQUNBLG1DQUEyQiwwQkFBMEIsRUFBRTtBQUN2RCx5Q0FBaUMsZUFBZTtBQUNoRDtBQUNBO0FBQ0E7O0FBRUE7QUFDQSw4REFBc0QsK0RBQStEOztBQUVySDtBQUNBOztBQUVBO0FBQ0E7Ozs7Ozs7Ozs7Ozs7O0FDaEVBLElBQU1BLHFCQUFxQjtBQUN6QkMsTUFEeUIsZ0JBQ3BCQyxJQURvQixFQUNkO0FBQ1QsU0FBS0EsSUFBTCxHQUFZQSxJQUFaO0FBQ0EsU0FBS0MsTUFBTCxHQUFjRCxLQUFLQyxNQUFMLENBQVlILGtCQUFaLEtBQW1DLEtBQUtFLElBQUwsQ0FBVUMsTUFBVixDQUFpQkgsa0JBQWpCLEdBQXNDLEVBQXpFLENBQWQ7O0FBRUEsU0FBS0ksWUFBTCxHQUFvQixFQUFwQjs7QUFFQSxTQUFLQyxTQUFMO0FBQ0QsR0FSd0I7QUFVekJBLFdBVnlCLHVCQVViO0FBQ1YsU0FBS0QsWUFBTCxDQUFrQkUsU0FBbEIsR0FBOEIsS0FBS0EsU0FBTCxDQUFlQyxJQUFmLENBQW9CLElBQXBCLENBQTlCO0FBQ0EsU0FBS0wsSUFBTCxDQUFVTSxJQUFWLENBQWVBLElBQWYsQ0FBb0JDLGdCQUFwQixDQUFxQyxVQUFyQyxFQUFpRCxLQUFLTCxZQUFMLENBQWtCRSxTQUFuRTtBQUNELEdBYndCO0FBZXpCSSxjQWZ5QiwwQkFlVjtBQUNiLFNBQUtSLElBQUwsQ0FBVU0sSUFBVixDQUFlQSxJQUFmLENBQW9CRyxtQkFBcEIsQ0FBd0MsVUFBeEMsRUFBb0QsS0FBS1AsWUFBTCxDQUFrQkUsU0FBdEU7QUFDRCxHQWpCd0I7QUFtQnpCQSxXQW5CeUIscUJBbUJmTSxDQW5CZSxFQW1CWjtBQUFBOztBQUNYLFFBQU1DLGVBQWVELEVBQUVFLE1BQUYsQ0FBU0MsUUFBOUI7O0FBRUEsUUFBSSxDQUFDQyxNQUFNQyxPQUFOLENBQWMsS0FBS2QsTUFBbkIsQ0FBTCxFQUFpQyxLQUFLQSxNQUFMLEdBQWMsQ0FBQyxLQUFLQSxNQUFOLENBQWQ7O0FBRWpDLFNBQUtBLE1BQUwsQ0FBWWUsT0FBWixDQUFvQjtBQUFBLGFBQVUsTUFBS0MsUUFBTCxDQUFjaEIsTUFBZCxFQUFzQlUsWUFBdEIsQ0FBVjtBQUFBLEtBQXBCO0FBQ0QsR0F6QndCO0FBMkJ6Qk0sVUEzQnlCLG9CQTJCaEJoQixNQTNCZ0IsRUEyQlJVLFlBM0JRLEVBMkJNO0FBQzdCLFFBQU1PLFFBQVFqQixPQUFPaUIsS0FBUCxJQUFnQixLQUFLbEIsSUFBTCxDQUFVbUIsT0FBeEM7QUFDQSxRQUFNQyxXQUFXVCxhQUFhVSxZQUFiLENBQTBCcEIsT0FBT3FCLGNBQWpDLENBQWpCOztBQUVBLFFBQUlKLE1BQU1LLE9BQU4sS0FBa0IsT0FBdEIsRUFBK0I7QUFDN0JMLFlBQU1NLEtBQU4sR0FBY0osUUFBZDtBQUNELEtBRkQsTUFFTztBQUNMRixZQUFNTyxXQUFOLEdBQW9CTCxRQUFwQjtBQUNEO0FBQ0YsR0FwQ3dCO0FBc0N6Qk0sU0F0Q3lCLHFCQXNDZjtBQUNSLFNBQUtsQixZQUFMO0FBQ0Q7QUF4Q3dCLENBQTNCOztBQTJDQW1CLE9BQU83QixrQkFBUCxHQUE0QkEsa0JBQTVCOztrQkFFZUEsa0IiLCJmaWxlIjoiLi9kaXN0L3BsdWdpbnMvaW5wdXRfc2V0dGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiIFx0Ly8gVGhlIG1vZHVsZSBjYWNoZVxuIFx0dmFyIGluc3RhbGxlZE1vZHVsZXMgPSB7fTtcblxuIFx0Ly8gVGhlIHJlcXVpcmUgZnVuY3Rpb25cbiBcdGZ1bmN0aW9uIF9fd2VicGFja19yZXF1aXJlX18obW9kdWxlSWQpIHtcblxuIFx0XHQvLyBDaGVjayBpZiBtb2R1bGUgaXMgaW4gY2FjaGVcbiBcdFx0aWYoaW5zdGFsbGVkTW9kdWxlc1ttb2R1bGVJZF0pXG4gXHRcdFx0cmV0dXJuIGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdLmV4cG9ydHM7XG5cbiBcdFx0Ly8gQ3JlYXRlIGEgbmV3IG1vZHVsZSAoYW5kIHB1dCBpdCBpbnRvIHRoZSBjYWNoZSlcbiBcdFx0dmFyIG1vZHVsZSA9IGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdID0ge1xuIFx0XHRcdGk6IG1vZHVsZUlkLFxuIFx0XHRcdGw6IGZhbHNlLFxuIFx0XHRcdGV4cG9ydHM6IHt9XG4gXHRcdH07XG5cbiBcdFx0Ly8gRXhlY3V0ZSB0aGUgbW9kdWxlIGZ1bmN0aW9uXG4gXHRcdG1vZHVsZXNbbW9kdWxlSWRdLmNhbGwobW9kdWxlLmV4cG9ydHMsIG1vZHVsZSwgbW9kdWxlLmV4cG9ydHMsIF9fd2VicGFja19yZXF1aXJlX18pO1xuXG4gXHRcdC8vIEZsYWcgdGhlIG1vZHVsZSBhcyBsb2FkZWRcbiBcdFx0bW9kdWxlLmwgPSB0cnVlO1xuXG4gXHRcdC8vIFJldHVybiB0aGUgZXhwb3J0cyBvZiB0aGUgbW9kdWxlXG4gXHRcdHJldHVybiBtb2R1bGUuZXhwb3J0cztcbiBcdH1cblxuXG4gXHQvLyBleHBvc2UgdGhlIG1vZHVsZXMgb2JqZWN0IChfX3dlYnBhY2tfbW9kdWxlc19fKVxuIFx0X193ZWJwYWNrX3JlcXVpcmVfXy5tID0gbW9kdWxlcztcblxuIFx0Ly8gZXhwb3NlIHRoZSBtb2R1bGUgY2FjaGVcbiBcdF9fd2VicGFja19yZXF1aXJlX18uYyA9IGluc3RhbGxlZE1vZHVsZXM7XG5cbiBcdC8vIGlkZW50aXR5IGZ1bmN0aW9uIGZvciBjYWxsaW5nIGhhcm1vbnkgaW1wb3J0cyB3aXRoIHRoZSBjb3JyZWN0IGNvbnRleHRcbiBcdF9fd2VicGFja19yZXF1aXJlX18uaSA9IGZ1bmN0aW9uKHZhbHVlKSB7IHJldHVybiB2YWx1ZTsgfTtcblxuIFx0Ly8gZGVmaW5lIGdldHRlciBmdW5jdGlvbiBmb3IgaGFybW9ueSBleHBvcnRzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQgPSBmdW5jdGlvbihleHBvcnRzLCBuYW1lLCBnZXR0ZXIpIHtcbiBcdFx0aWYoIV9fd2VicGFja19yZXF1aXJlX18ubyhleHBvcnRzLCBuYW1lKSkge1xuIFx0XHRcdE9iamVjdC5kZWZpbmVQcm9wZXJ0eShleHBvcnRzLCBuYW1lLCB7XG4gXHRcdFx0XHRjb25maWd1cmFibGU6IGZhbHNlLFxuIFx0XHRcdFx0ZW51bWVyYWJsZTogdHJ1ZSxcbiBcdFx0XHRcdGdldDogZ2V0dGVyXG4gXHRcdFx0fSk7XG4gXHRcdH1cbiBcdH07XG5cbiBcdC8vIGdldERlZmF1bHRFeHBvcnQgZnVuY3Rpb24gZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBub24taGFybW9ueSBtb2R1bGVzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLm4gPSBmdW5jdGlvbihtb2R1bGUpIHtcbiBcdFx0dmFyIGdldHRlciA9IG1vZHVsZSAmJiBtb2R1bGUuX19lc01vZHVsZSA/XG4gXHRcdFx0ZnVuY3Rpb24gZ2V0RGVmYXVsdCgpIHsgcmV0dXJuIG1vZHVsZVsnZGVmYXVsdCddOyB9IDpcbiBcdFx0XHRmdW5jdGlvbiBnZXRNb2R1bGVFeHBvcnRzKCkgeyByZXR1cm4gbW9kdWxlOyB9O1xuIFx0XHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQoZ2V0dGVyLCAnYScsIGdldHRlcik7XG4gXHRcdHJldHVybiBnZXR0ZXI7XG4gXHR9O1xuXG4gXHQvLyBPYmplY3QucHJvdG90eXBlLmhhc093blByb3BlcnR5LmNhbGxcbiBcdF9fd2VicGFja19yZXF1aXJlX18ubyA9IGZ1bmN0aW9uKG9iamVjdCwgcHJvcGVydHkpIHsgcmV0dXJuIE9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbChvYmplY3QsIHByb3BlcnR5KTsgfTtcblxuIFx0Ly8gX193ZWJwYWNrX3B1YmxpY19wYXRoX19cbiBcdF9fd2VicGFja19yZXF1aXJlX18ucCA9IFwiXCI7XG5cbiBcdC8vIExvYWQgZW50cnkgbW9kdWxlIGFuZCByZXR1cm4gZXhwb3J0c1xuIFx0cmV0dXJuIF9fd2VicGFja19yZXF1aXJlX18oX193ZWJwYWNrX3JlcXVpcmVfXy5zID0gMTMpO1xuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIHdlYnBhY2svYm9vdHN0cmFwIGYzNzY3MmI3ZjUyOGI0NzJhNDRjIiwiY29uc3QgZHJvcGxhYklucHV0U2V0dGVyID0ge1xuICBpbml0KGhvb2spIHtcbiAgICB0aGlzLmhvb2sgPSBob29rO1xuICAgIHRoaXMuY29uZmlnID0gaG9vay5jb25maWcuZHJvcGxhYklucHV0U2V0dGVyIHx8ICh0aGlzLmhvb2suY29uZmlnLmRyb3BsYWJJbnB1dFNldHRlciA9IHt9KTtcblxuICAgIHRoaXMuZXZlbnRXcmFwcGVyID0ge307XG5cbiAgICB0aGlzLmFkZEV2ZW50cygpO1xuICB9LFxuXG4gIGFkZEV2ZW50cygpIHtcbiAgICB0aGlzLmV2ZW50V3JhcHBlci5zZXRJbnB1dHMgPSB0aGlzLnNldElucHV0cy5iaW5kKHRoaXMpO1xuICAgIHRoaXMuaG9vay5saXN0Lmxpc3QuYWRkRXZlbnRMaXN0ZW5lcignY2xpY2suZGwnLCB0aGlzLmV2ZW50V3JhcHBlci5zZXRJbnB1dHMpO1xuICB9LFxuXG4gIHJlbW92ZUV2ZW50cygpIHtcbiAgICB0aGlzLmhvb2subGlzdC5saXN0LnJlbW92ZUV2ZW50TGlzdGVuZXIoJ2NsaWNrLmRsJywgdGhpcy5ldmVudFdyYXBwZXIuc2V0SW5wdXRzKTtcbiAgfSxcblxuICBzZXRJbnB1dHMoZSkge1xuICAgIGNvbnN0IHNlbGVjdGVkSXRlbSA9IGUuZGV0YWlsLnNlbGVjdGVkO1xuXG4gICAgaWYgKCFBcnJheS5pc0FycmF5KHRoaXMuY29uZmlnKSkgdGhpcy5jb25maWcgPSBbdGhpcy5jb25maWddO1xuXG4gICAgdGhpcy5jb25maWcuZm9yRWFjaChjb25maWcgPT4gdGhpcy5zZXRJbnB1dChjb25maWcsIHNlbGVjdGVkSXRlbSkpO1xuICB9LFxuXG4gIHNldElucHV0KGNvbmZpZywgc2VsZWN0ZWRJdGVtKSB7XG4gICAgY29uc3QgaW5wdXQgPSBjb25maWcuaW5wdXQgfHwgdGhpcy5ob29rLnRyaWdnZXI7XG4gICAgY29uc3QgbmV3VmFsdWUgPSBzZWxlY3RlZEl0ZW0uZ2V0QXR0cmlidXRlKGNvbmZpZy52YWx1ZUF0dHJpYnV0ZSk7XG5cbiAgICBpZiAoaW5wdXQudGFnTmFtZSA9PT0gJ0lOUFVUJykge1xuICAgICAgaW5wdXQudmFsdWUgPSBuZXdWYWx1ZTtcbiAgICB9IGVsc2Uge1xuICAgICAgaW5wdXQudGV4dENvbnRlbnQgPSBuZXdWYWx1ZTtcbiAgICB9XG4gIH0sXG5cbiAgZGVzdHJveSgpIHtcbiAgICB0aGlzLnJlbW92ZUV2ZW50cygpO1xuICB9LFxufTtcblxud2luZG93LmRyb3BsYWJJbnB1dFNldHRlciA9IGRyb3BsYWJJbnB1dFNldHRlcjtcblxuZXhwb3J0IGRlZmF1bHQgZHJvcGxhYklucHV0U2V0dGVyO1xuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIC4vc3JjL3BsdWdpbnMvaW5wdXRfc2V0dGVyLmpzIl0sInNvdXJjZVJvb3QiOiIifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vd2VicGFjay9ib290c3RyYXAgOTMzZmY3ZDVlZDM5M2RjNjNiY2E/MGFiZioqKioqIiwid2VicGFjazovLy8uL3NyYy9wbHVnaW5zL2lucHV0X3NldHRlci9pbnB1dF9zZXR0ZXIuanM/NTY5NyJdLCJuYW1lcyI6WyJkcm9wbGFiSW5wdXRTZXR0ZXIiLCJpbml0IiwiaG9vayIsImNvbmZpZyIsImV2ZW50V3JhcHBlciIsImFkZEV2ZW50cyIsInNldElucHV0cyIsImJpbmQiLCJsaXN0IiwiYWRkRXZlbnRMaXN0ZW5lciIsInJlbW92ZUV2ZW50cyIsInJlbW92ZUV2ZW50TGlzdGVuZXIiLCJlIiwic2VsZWN0ZWRJdGVtIiwiZGV0YWlsIiwic2VsZWN0ZWQiLCJBcnJheSIsImlzQXJyYXkiLCJmb3JFYWNoIiwic2V0SW5wdXQiLCJpbnB1dCIsInRyaWdnZXIiLCJuZXdWYWx1ZSIsImdldEF0dHJpYnV0ZSIsInZhbHVlQXR0cmlidXRlIiwidGFnTmFtZSIsInZhbHVlIiwidGV4dENvbnRlbnQiLCJkZXN0cm95Il0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTs7QUFFQTtBQUNBOztBQUVBO0FBQ0E7QUFDQTs7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBOztBQUVBO0FBQ0E7QUFDQTs7O0FBR0E7QUFDQTs7QUFFQTtBQUNBOztBQUVBO0FBQ0EsbURBQTJDLGNBQWM7O0FBRXpEO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EsYUFBSztBQUNMO0FBQ0E7O0FBRUE7QUFDQTtBQUNBO0FBQ0EsbUNBQTJCLDBCQUEwQixFQUFFO0FBQ3ZELHlDQUFpQyxlQUFlO0FBQ2hEO0FBQ0E7QUFDQTs7QUFFQTtBQUNBLDhEQUFzRCwrREFBK0Q7O0FBRXJIO0FBQ0E7O0FBRUE7QUFDQTs7Ozs7Ozs7Ozs7Ozs7QUNoRUEsSUFBTUEscUJBQXFCO0FBQ3pCQyxNQUR5QixnQkFDcEJDLElBRG9CLEVBQ2Q7QUFDVCxTQUFLQSxJQUFMLEdBQVlBLElBQVo7QUFDQSxTQUFLQyxNQUFMLEdBQWNELEtBQUtDLE1BQUwsQ0FBWUgsa0JBQVosS0FBbUMsS0FBS0UsSUFBTCxDQUFVQyxNQUFWLENBQWlCSCxrQkFBakIsR0FBc0MsRUFBekUsQ0FBZDs7QUFFQSxTQUFLSSxZQUFMLEdBQW9CLEVBQXBCOztBQUVBLFNBQUtDLFNBQUw7QUFDRCxHQVJ3QjtBQVV6QkEsV0FWeUIsdUJBVWI7QUFDVixTQUFLRCxZQUFMLENBQWtCRSxTQUFsQixHQUE4QixLQUFLQSxTQUFMLENBQWVDLElBQWYsQ0FBb0IsSUFBcEIsQ0FBOUI7QUFDQSxTQUFLTCxJQUFMLENBQVVNLElBQVYsQ0FBZUEsSUFBZixDQUFvQkMsZ0JBQXBCLENBQXFDLFVBQXJDLEVBQWlELEtBQUtMLFlBQUwsQ0FBa0JFLFNBQW5FO0FBQ0QsR0Fid0I7QUFlekJJLGNBZnlCLDBCQWVWO0FBQ2IsU0FBS1IsSUFBTCxDQUFVTSxJQUFWLENBQWVBLElBQWYsQ0FBb0JHLG1CQUFwQixDQUF3QyxVQUF4QyxFQUFvRCxLQUFLUCxZQUFMLENBQWtCRSxTQUF0RTtBQUNELEdBakJ3QjtBQW1CekJBLFdBbkJ5QixxQkFtQmZNLENBbkJlLEVBbUJaO0FBQUE7O0FBQ1gsUUFBTUMsZUFBZUQsRUFBRUUsTUFBRixDQUFTQyxRQUE5Qjs7QUFFQSxRQUFJLENBQUNDLE1BQU1DLE9BQU4sQ0FBYyxLQUFLZCxNQUFuQixDQUFMLEVBQWlDLEtBQUtBLE1BQUwsR0FBYyxDQUFDLEtBQUtBLE1BQU4sQ0FBZDs7QUFFakMsU0FBS0EsTUFBTCxDQUFZZSxPQUFaLENBQW9CO0FBQUEsYUFBVSxNQUFLQyxRQUFMLENBQWNoQixNQUFkLEVBQXNCVSxZQUF0QixDQUFWO0FBQUEsS0FBcEI7QUFDRCxHQXpCd0I7QUEyQnpCTSxVQTNCeUIsb0JBMkJoQmhCLE1BM0JnQixFQTJCUlUsWUEzQlEsRUEyQk07QUFDN0IsUUFBTU8sUUFBUWpCLE9BQU9pQixLQUFQLElBQWdCLEtBQUtsQixJQUFMLENBQVVtQixPQUF4QztBQUNBLFFBQU1DLFdBQVdULGFBQWFVLFlBQWIsQ0FBMEJwQixPQUFPcUIsY0FBakMsQ0FBakI7O0FBRUEsUUFBSUosTUFBTUssT0FBTixLQUFrQixPQUF0QixFQUErQjtBQUM3QkwsWUFBTU0sS0FBTixHQUFjSixRQUFkO0FBQ0QsS0FGRCxNQUVPO0FBQ0xGLFlBQU1PLFdBQU4sR0FBb0JMLFFBQXBCO0FBQ0Q7QUFDRixHQXBDd0I7QUFzQ3pCTSxTQXRDeUIscUJBc0NmO0FBQ1IsU0FBS2xCLFlBQUw7QUFDRDtBQXhDd0IsQ0FBM0I7O2tCQTJDZVYsa0IiLCJmaWxlIjoiLi9kaXN0L3BsdWdpbnMvaW5wdXRfc2V0dGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiIFx0Ly8gVGhlIG1vZHVsZSBjYWNoZVxuIFx0dmFyIGluc3RhbGxlZE1vZHVsZXMgPSB7fTtcblxuIFx0Ly8gVGhlIHJlcXVpcmUgZnVuY3Rpb25cbiBcdGZ1bmN0aW9uIF9fd2VicGFja19yZXF1aXJlX18obW9kdWxlSWQpIHtcblxuIFx0XHQvLyBDaGVjayBpZiBtb2R1bGUgaXMgaW4gY2FjaGVcbiBcdFx0aWYoaW5zdGFsbGVkTW9kdWxlc1ttb2R1bGVJZF0pXG4gXHRcdFx0cmV0dXJuIGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdLmV4cG9ydHM7XG5cbiBcdFx0Ly8gQ3JlYXRlIGEgbmV3IG1vZHVsZSAoYW5kIHB1dCBpdCBpbnRvIHRoZSBjYWNoZSlcbiBcdFx0dmFyIG1vZHVsZSA9IGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdID0ge1xuIFx0XHRcdGk6IG1vZHVsZUlkLFxuIFx0XHRcdGw6IGZhbHNlLFxuIFx0XHRcdGV4cG9ydHM6IHt9XG4gXHRcdH07XG5cbiBcdFx0Ly8gRXhlY3V0ZSB0aGUgbW9kdWxlIGZ1bmN0aW9uXG4gXHRcdG1vZHVsZXNbbW9kdWxlSWRdLmNhbGwobW9kdWxlLmV4cG9ydHMsIG1vZHVsZSwgbW9kdWxlLmV4cG9ydHMsIF9fd2VicGFja19yZXF1aXJlX18pO1xuXG4gXHRcdC8vIEZsYWcgdGhlIG1vZHVsZSBhcyBsb2FkZWRcbiBcdFx0bW9kdWxlLmwgPSB0cnVlO1xuXG4gXHRcdC8vIFJldHVybiB0aGUgZXhwb3J0cyBvZiB0aGUgbW9kdWxlXG4gXHRcdHJldHVybiBtb2R1bGUuZXhwb3J0cztcbiBcdH1cblxuXG4gXHQvLyBleHBvc2UgdGhlIG1vZHVsZXMgb2JqZWN0IChfX3dlYnBhY2tfbW9kdWxlc19fKVxuIFx0X193ZWJwYWNrX3JlcXVpcmVfXy5tID0gbW9kdWxlcztcblxuIFx0Ly8gZXhwb3NlIHRoZSBtb2R1bGUgY2FjaGVcbiBcdF9fd2VicGFja19yZXF1aXJlX18uYyA9IGluc3RhbGxlZE1vZHVsZXM7XG5cbiBcdC8vIGlkZW50aXR5IGZ1bmN0aW9uIGZvciBjYWxsaW5nIGhhcm1vbnkgaW1wb3J0cyB3aXRoIHRoZSBjb3JyZWN0IGNvbnRleHRcbiBcdF9fd2VicGFja19yZXF1aXJlX18uaSA9IGZ1bmN0aW9uKHZhbHVlKSB7IHJldHVybiB2YWx1ZTsgfTtcblxuIFx0Ly8gZGVmaW5lIGdldHRlciBmdW5jdGlvbiBmb3IgaGFybW9ueSBleHBvcnRzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQgPSBmdW5jdGlvbihleHBvcnRzLCBuYW1lLCBnZXR0ZXIpIHtcbiBcdFx0aWYoIV9fd2VicGFja19yZXF1aXJlX18ubyhleHBvcnRzLCBuYW1lKSkge1xuIFx0XHRcdE9iamVjdC5kZWZpbmVQcm9wZXJ0eShleHBvcnRzLCBuYW1lLCB7XG4gXHRcdFx0XHRjb25maWd1cmFibGU6IGZhbHNlLFxuIFx0XHRcdFx0ZW51bWVyYWJsZTogdHJ1ZSxcbiBcdFx0XHRcdGdldDogZ2V0dGVyXG4gXHRcdFx0fSk7XG4gXHRcdH1cbiBcdH07XG5cbiBcdC8vIGdldERlZmF1bHRFeHBvcnQgZnVuY3Rpb24gZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBub24taGFybW9ueSBtb2R1bGVzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLm4gPSBmdW5jdGlvbihtb2R1bGUpIHtcbiBcdFx0dmFyIGdldHRlciA9IG1vZHVsZSAmJiBtb2R1bGUuX19lc01vZHVsZSA/XG4gXHRcdFx0ZnVuY3Rpb24gZ2V0RGVmYXVsdCgpIHsgcmV0dXJuIG1vZHVsZVsnZGVmYXVsdCddOyB9IDpcbiBcdFx0XHRmdW5jdGlvbiBnZXRNb2R1bGVFeHBvcnRzKCkgeyByZXR1cm4gbW9kdWxlOyB9O1xuIFx0XHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQoZ2V0dGVyLCAnYScsIGdldHRlcik7XG4gXHRcdHJldHVybiBnZXR0ZXI7XG4gXHR9O1xuXG4gXHQvLyBPYmplY3QucHJvdG90eXBlLmhhc093blByb3BlcnR5LmNhbGxcbiBcdF9fd2VicGFja19yZXF1aXJlX18ubyA9IGZ1bmN0aW9uKG9iamVjdCwgcHJvcGVydHkpIHsgcmV0dXJuIE9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbChvYmplY3QsIHByb3BlcnR5KTsgfTtcblxuIFx0Ly8gX193ZWJwYWNrX3B1YmxpY19wYXRoX19cbiBcdF9fd2VicGFja19yZXF1aXJlX18ucCA9IFwiXCI7XG5cbiBcdC8vIExvYWQgZW50cnkgbW9kdWxlIGFuZCByZXR1cm4gZXhwb3J0c1xuIFx0cmV0dXJuIF9fd2VicGFja19yZXF1aXJlX18oX193ZWJwYWNrX3JlcXVpcmVfXy5zID0gOCk7XG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gd2VicGFjay9ib290c3RyYXAgOTMzZmY3ZDVlZDM5M2RjNjNiY2EiLCJjb25zdCBkcm9wbGFiSW5wdXRTZXR0ZXIgPSB7XG4gIGluaXQoaG9vaykge1xuICAgIHRoaXMuaG9vayA9IGhvb2s7XG4gICAgdGhpcy5jb25maWcgPSBob29rLmNvbmZpZy5kcm9wbGFiSW5wdXRTZXR0ZXIgfHwgKHRoaXMuaG9vay5jb25maWcuZHJvcGxhYklucHV0U2V0dGVyID0ge30pO1xuXG4gICAgdGhpcy5ldmVudFdyYXBwZXIgPSB7fTtcblxuICAgIHRoaXMuYWRkRXZlbnRzKCk7XG4gIH0sXG5cbiAgYWRkRXZlbnRzKCkge1xuICAgIHRoaXMuZXZlbnRXcmFwcGVyLnNldElucHV0cyA9IHRoaXMuc2V0SW5wdXRzLmJpbmQodGhpcyk7XG4gICAgdGhpcy5ob29rLmxpc3QubGlzdC5hZGRFdmVudExpc3RlbmVyKCdjbGljay5kbCcsIHRoaXMuZXZlbnRXcmFwcGVyLnNldElucHV0cyk7XG4gIH0sXG5cbiAgcmVtb3ZlRXZlbnRzKCkge1xuICAgIHRoaXMuaG9vay5saXN0Lmxpc3QucmVtb3ZlRXZlbnRMaXN0ZW5lcignY2xpY2suZGwnLCB0aGlzLmV2ZW50V3JhcHBlci5zZXRJbnB1dHMpO1xuICB9LFxuXG4gIHNldElucHV0cyhlKSB7XG4gICAgY29uc3Qgc2VsZWN0ZWRJdGVtID0gZS5kZXRhaWwuc2VsZWN0ZWQ7XG5cbiAgICBpZiAoIUFycmF5LmlzQXJyYXkodGhpcy5jb25maWcpKSB0aGlzLmNvbmZpZyA9IFt0aGlzLmNvbmZpZ107XG5cbiAgICB0aGlzLmNvbmZpZy5mb3JFYWNoKGNvbmZpZyA9PiB0aGlzLnNldElucHV0KGNvbmZpZywgc2VsZWN0ZWRJdGVtKSk7XG4gIH0sXG5cbiAgc2V0SW5wdXQoY29uZmlnLCBzZWxlY3RlZEl0ZW0pIHtcbiAgICBjb25zdCBpbnB1dCA9IGNvbmZpZy5pbnB1dCB8fCB0aGlzLmhvb2sudHJpZ2dlcjtcbiAgICBjb25zdCBuZXdWYWx1ZSA9IHNlbGVjdGVkSXRlbS5nZXRBdHRyaWJ1dGUoY29uZmlnLnZhbHVlQXR0cmlidXRlKTtcblxuICAgIGlmIChpbnB1dC50YWdOYW1lID09PSAnSU5QVVQnKSB7XG4gICAgICBpbnB1dC52YWx1ZSA9IG5ld1ZhbHVlO1xuICAgIH0gZWxzZSB7XG4gICAgICBpbnB1dC50ZXh0Q29udGVudCA9IG5ld1ZhbHVlO1xuICAgIH1cbiAgfSxcblxuICBkZXN0cm95KCkge1xuICAgIHRoaXMucmVtb3ZlRXZlbnRzKCk7XG4gIH0sXG59O1xuXG5leHBvcnQgZGVmYXVsdCBkcm9wbGFiSW5wdXRTZXR0ZXI7XG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gLi9zcmMvcGx1Z2lucy9pbnB1dF9zZXR0ZXIvaW5wdXRfc2V0dGVyLmpzIl0sInNvdXJjZVJvb3QiOiIifQ== \ No newline at end of file diff --git a/app/assets/javascripts/filtered_search/dropdown_hint.js b/app/assets/javascripts/filtered_search/dropdown_hint.js index 475aef219da..d3401dd0838 100644 --- a/app/assets/javascripts/filtered_search/dropdown_hint.js +++ b/app/assets/javascripts/filtered_search/dropdown_hint.js @@ -1,6 +1,6 @@ -require('./filtered_search_dropdown'); +import droplabFilter from '../droplab/plugins/filter'; -/* global droplabFilter */ +require('./filtered_search_dropdown'); (() => { class DropdownHint extends gl.FilteredSearchDropdown { diff --git a/app/assets/javascripts/filtered_search/dropdown_non_user.js b/app/assets/javascripts/filtered_search/dropdown_non_user.js index 9ee805a08cb..c30e673f8ba 100644 --- a/app/assets/javascripts/filtered_search/dropdown_non_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_non_user.js @@ -1,7 +1,7 @@ -require('./filtered_search_dropdown'); +import droplabAjax from '../droplab/plugins/ajax'; +import droplabFilter from '../droplab/plugins/filter'; -/* global droplabAjax */ -/* global droplabFilter */ +require('./filtered_search_dropdown'); (() => { class DropdownNonUser extends gl.FilteredSearchDropdown { diff --git a/app/assets/javascripts/filtered_search/dropdown_user.js b/app/assets/javascripts/filtered_search/dropdown_user.js index 04e2afad02f..fe95ccb41f8 100644 --- a/app/assets/javascripts/filtered_search/dropdown_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_user.js @@ -1,6 +1,6 @@ -require('./filtered_search_dropdown'); +import droplabAjaxFilter from '../droplab/plugins/ajax_filter'; -/* global droplabAjaxFilter */ +require('./filtered_search_dropdown'); (() => { class DropdownUser extends gl.FilteredSearchDropdown { diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js index 5fbe0450bb8..29aa4c1bb44 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js +++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js @@ -1,4 +1,4 @@ -/* global DropLab */ +import DropLab from '../droplab/droplab'; import FilteredSearchContainer from './container'; (() => { diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index bdc5d913e86..e2f015c8e82 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -75,12 +75,6 @@ import './u2f/error'; import './u2f/register'; import './u2f/util'; -// droplab -import './droplab/droplab'; -import './droplab/plugins/ajax'; -import './droplab/plugins/ajax_filter'; -import './droplab/plugins/filter'; - // everything else import './abuse_reports'; import './activities'; From 8db88bdf202e2aee354bb257e6def40335c1273a Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sat, 25 Mar 2017 15:44:25 +0000 Subject: [PATCH 03/70] Prep for moving droplab to npm --- .babelrc | 1 - .eslintignore | 1 - app/assets/javascripts/droplab/droplab.js | 953 ------------------ .../javascripts/droplab/plugins/ajax.js | 157 --- .../droplab/plugins/ajax_filter.js | 214 ---- .../javascripts/droplab/plugins/filter.js | 172 ---- .../droplab/plugins/input_setter.js | 127 --- .../filtered_search/dropdown_hint.js | 8 +- .../filtered_search/dropdown_non_user.js | 12 +- .../filtered_search/dropdown_user.js | 8 +- .../filtered_search_dropdown_manager.js | 2 +- yarn.lock | 932 +++++++++-------- 12 files changed, 537 insertions(+), 2050 deletions(-) delete mode 100644 app/assets/javascripts/droplab/droplab.js delete mode 100644 app/assets/javascripts/droplab/plugins/ajax.js delete mode 100644 app/assets/javascripts/droplab/plugins/ajax_filter.js delete mode 100644 app/assets/javascripts/droplab/plugins/filter.js delete mode 100644 app/assets/javascripts/droplab/plugins/input_setter.js diff --git a/.babelrc b/.babelrc index ee4c391da30..2bae7ca9fbf 100644 --- a/.babelrc +++ b/.babelrc @@ -8,7 +8,6 @@ "plugins": [ ["istanbul", { "exclude": [ - "app/assets/javascripts/droplab/**/*", "spec/javascripts/**/*" ] }], diff --git a/.eslintignore b/.eslintignore index fe0766d8a44..c742b08c005 100644 --- a/.eslintignore +++ b/.eslintignore @@ -5,6 +5,5 @@ /public/ /tmp/ /vendor/ -/app/assets/javascripts/droplab karma.config.js webpack.config.js diff --git a/app/assets/javascripts/droplab/droplab.js b/app/assets/javascripts/droplab/droplab.js deleted file mode 100644 index d1d8447d165..00000000000 --- a/app/assets/javascripts/droplab/droplab.js +++ /dev/null @@ -1,953 +0,0 @@ -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) -/******/ return installedModules[moduleId].exports; -/******/ -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // identity function for calling harmony imports with the correct context -/******/ __webpack_require__.i = function(value) { return value; }; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { -/******/ configurable: false, -/******/ enumerable: true, -/******/ get: getter -/******/ }); -/******/ } -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 14); -/******/ }) -/************************************************************************/ -/******/ ([ -/* 0 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -var DATA_TRIGGER = 'data-dropdown-trigger'; -var DATA_DROPDOWN = 'data-dropdown'; -var SELECTED_CLASS = 'droplab-item-selected'; -var ACTIVE_CLASS = 'droplab-item-active'; - -exports.DATA_TRIGGER = DATA_TRIGGER; -exports.DATA_DROPDOWN = DATA_DROPDOWN; -exports.SELECTED_CLASS = SELECTED_CLASS; -exports.ACTIVE_CLASS = ACTIVE_CLASS; - -/***/ }), -/* 1 */ -/***/ (function(module, exports) { - -// Polyfill for creating CustomEvents on IE9/10/11 - -// code pulled from: -// https://github.com/d4tocchini/customevent-polyfill -// https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent#Polyfill - -try { - var ce = new window.CustomEvent('test'); - ce.preventDefault(); - if (ce.defaultPrevented !== true) { - // IE has problems with .preventDefault() on custom events - // http://stackoverflow.com/questions/23349191 - throw new Error('Could not prevent default'); - } -} catch(e) { - var CustomEvent = function(event, params) { - var evt, origPrevent; - params = params || { - bubbles: false, - cancelable: false, - detail: undefined - }; - - evt = document.createEvent("CustomEvent"); - evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail); - origPrevent = evt.preventDefault; - evt.preventDefault = function () { - origPrevent.call(this); - try { - Object.defineProperty(this, 'defaultPrevented', { - get: function () { - return true; - } - }); - } catch(e) { - this.defaultPrevented = true; - } - }; - return evt; - }; - - CustomEvent.prototype = window.Event.prototype; - window.CustomEvent = CustomEvent; // expose definition to window -} - - -/***/ }), -/* 2 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _dropdown = __webpack_require__(9); - -var _dropdown2 = _interopRequireDefault(_dropdown); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var Hook = function Hook(trigger, list, plugins, config) { - this.trigger = trigger; - this.list = new _dropdown2.default(list); - this.type = 'Hook'; - this.event = 'click'; - this.plugins = plugins || []; - this.config = config || {}; - this.id = trigger.id; -}; - -Object.assign(Hook.prototype, { - - addEvents: function addEvents() {}, - - constructor: Hook -}); - -exports.default = Hook; - -/***/ }), -/* 3 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _constants = __webpack_require__(0); - -var utils = { - toCamelCase: function toCamelCase(attr) { - return this.camelize(attr.split('-').slice(1).join(' ')); - }, - t: function t(s, d) { - for (var p in d) { - if (Object.prototype.hasOwnProperty.call(d, p)) { - s = s.replace(new RegExp('{{' + p + '}}', 'g'), d[p]); - } - } - return s; - }, - camelize: function camelize(str) { - return str.replace(/(?:^\w|[A-Z]|\b\w)/g, function (letter, index) { - return index === 0 ? letter.toLowerCase() : letter.toUpperCase(); - }).replace(/\s+/g, ''); - }, - closest: function closest(thisTag, stopTag) { - while (thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML') { - thisTag = thisTag.parentNode; - } - return thisTag; - }, - isDropDownParts: function isDropDownParts(target) { - if (!target || target.tagName === 'HTML') return false; - return target.hasAttribute(_constants.DATA_TRIGGER) || target.hasAttribute(_constants.DATA_DROPDOWN); - } -}; - -exports.default = utils; - -/***/ }), -/* 4 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -__webpack_require__(1); - -var _hook_button = __webpack_require__(10); - -var _hook_button2 = _interopRequireDefault(_hook_button); - -var _hook_input = __webpack_require__(11); - -var _hook_input2 = _interopRequireDefault(_hook_input); - -var _utils = __webpack_require__(3); - -var _utils2 = _interopRequireDefault(_utils); - -var _keyboard = __webpack_require__(12); - -var _keyboard2 = _interopRequireDefault(_keyboard); - -var _constants = __webpack_require__(0); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var DropLab = function DropLab() { - this.ready = false; - this.hooks = []; - this.queuedData = []; - this.config = {}; - - this.eventWrapper = {}; -}; - -Object.assign(DropLab.prototype, { - loadStatic: function loadStatic() { - var dropdownTriggers = [].slice.apply(document.querySelectorAll('[' + _constants.DATA_TRIGGER + ']')); - this.addHooks(dropdownTriggers); - }, - - addData: function addData() { - var args = [].slice.apply(arguments); - this.applyArgs(args, '_addData'); - }, - - setData: function setData() { - var args = [].slice.apply(arguments); - this.applyArgs(args, '_setData'); - }, - - destroy: function destroy() { - this.hooks.forEach(function (hook) { - return hook.destroy(); - }); - this.hooks = []; - this.removeEvents(); - }, - - applyArgs: function applyArgs(args, methodName) { - if (this.ready) return this[methodName].apply(this, args); - - this.queuedData = this.queuedData || []; - this.queuedData.push(args); - }, - - _addData: function _addData(trigger, data) { - this._processData(trigger, data, 'addData'); - }, - - _setData: function _setData(trigger, data) { - this._processData(trigger, data, 'setData'); - }, - - _processData: function _processData(trigger, data, methodName) { - this.hooks.forEach(function (hook) { - if (Array.isArray(trigger)) hook.list[methodName](trigger); - - if (hook.trigger.id === trigger) hook.list[methodName](data); - }); - }, - - addEvents: function addEvents() { - this.eventWrapper.documentClicked = this.documentClicked.bind(this); - document.addEventListener('click', this.eventWrapper.documentClicked); - }, - - documentClicked: function documentClicked(e) { - var thisTag = e.target; - - if (thisTag.tagName !== 'UL') thisTag = _utils2.default.closest(thisTag, 'UL'); - if (_utils2.default.isDropDownParts(thisTag, this.hooks) || _utils2.default.isDropDownParts(e.target, this.hooks)) return; - - this.hooks.forEach(function (hook) { - return hook.list.hide(); - }); - }, - - removeEvents: function removeEvents() { - document.removeEventListener('click', this.eventWrapper.documentClicked); - }, - - changeHookList: function changeHookList(trigger, list, plugins, config) { - var _this = this; - - var availableTrigger = typeof trigger === 'string' ? document.getElementById(trigger) : trigger; - - this.hooks.forEach(function (hook, i) { - hook.list.list.dataset.dropdownActive = false; - - if (hook.trigger !== availableTrigger) return; - - hook.destroy(); - _this.hooks.splice(i, 1); - _this.addHook(availableTrigger, list, plugins, config); - }); - }, - - addHook: function addHook(hook, list, plugins, config) { - var availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook; - var availableList = void 0; - - if (typeof list === 'string') { - availableList = document.querySelector(list); - } else if (list instanceof Element) { - availableList = list; - } else { - availableList = document.querySelector(hook.dataset[_utils2.default.toCamelCase(_constants.DATA_TRIGGER)]); - } - - availableList.dataset.dropdownActive = true; - - var HookObject = availableHook.tagName === 'INPUT' ? _hook_input2.default : _hook_button2.default; - this.hooks.push(new HookObject(availableHook, availableList, plugins, config)); - - return this; - }, - - addHooks: function addHooks(hooks, plugins, config) { - var _this2 = this; - - hooks.forEach(function (hook) { - return _this2.addHook(hook, null, plugins, config); - }); - return this; - }, - - setConfig: function setConfig(obj) { - this.config = obj; - }, - - fireReady: function fireReady() { - var readyEvent = new CustomEvent('ready.dl', { - detail: { - dropdown: this - } - }); - document.dispatchEvent(readyEvent); - - this.ready = true; - }, - - init: function init(hook, list, plugins, config) { - var _this3 = this; - - hook ? this.addHook(hook, list, plugins, config) : this.loadStatic(); - - this.addEvents(); - - (0, _keyboard2.default)(); - - this.fireReady(); - - this.queuedData.forEach(function (data) { - return _this3.addData(data); - }); - this.queuedData = []; - - return this; - } -}); - -exports.default = DropLab; - -/***/ }), -/* 5 */, -/* 6 */, -/* 7 */, -/* 8 */, -/* 9 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _Object$assign; - -__webpack_require__(1); - -var _utils = __webpack_require__(3); - -var _utils2 = _interopRequireDefault(_utils); - -var _constants = __webpack_require__(0); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -var DropDown = function DropDown(list) { - this.currentIndex = 0; - this.hidden = true; - this.list = typeof list === 'string' ? document.querySelector(list) : list; - this.items = []; - - this.eventWrapper = {}; - - this.getItems(); - this.initTemplateString(); - this.addEvents(); - - this.initialState = list.innerHTML; -}; - -Object.assign(DropDown.prototype, (_Object$assign = { - getItems: function getItems() { - this.items = [].slice.call(this.list.querySelectorAll('li')); - return this.items; - }, - - initTemplateString: function initTemplateString() { - var items = this.items || this.getItems(); - - var templateString = ''; - if (items.length > 0) templateString = items[items.length - 1].outerHTML; - this.templateString = templateString; - - return this.templateString; - }, - - clickEvent: function clickEvent(e) { - var selected = _utils2.default.closest(e.target, 'LI'); - if (!selected) return; - - this.addSelectedClass(selected); - - e.preventDefault(); - this.hide(); - - var listEvent = new CustomEvent('click.dl', { - detail: { - list: this, - selected: selected, - data: e.target.dataset - } - }); - this.list.dispatchEvent(listEvent); - }, - - addSelectedClass: function addSelectedClass(selected) { - this.removeSelectedClasses(); - selected.classList.add(_constants.SELECTED_CLASS); - }, - - removeSelectedClasses: function removeSelectedClasses() { - var items = this.items || this.getItems(); - - items.forEach(function (item) { - return item.classList.remove(_constants.SELECTED_CLASS); - }); - }, - - addEvents: function addEvents() { - this.eventWrapper.clickEvent = this.clickEvent.bind(this); - this.list.addEventListener('click', this.eventWrapper.clickEvent); - }, - - toggle: function toggle() { - this.hidden ? this.show() : this.hide(); - }, - - setData: function setData(data) { - this.data = data; - this.render(data); - }, - - addData: function addData(data) { - this.data = (this.data || []).concat(data); - this.render(this.data); - }, - - render: function render(data) { - var children = data ? data.map(this.renderChildren.bind(this)) : []; - var renderableList = this.list.querySelector('ul[data-dynamic]') || this.list; - - renderableList.innerHTML = children.join(''); - }, - - renderChildren: function renderChildren(data) { - var html = _utils2.default.t(this.templateString, data); - var template = document.createElement('div'); - - template.innerHTML = html; - this.setImagesSrc(template); - template.firstChild.style.display = data.droplab_hidden ? 'none' : 'block'; - - return template.firstChild.outerHTML; - }, - - setImagesSrc: function setImagesSrc(template) { - var images = [].slice.call(template.querySelectorAll('img[data-src]')); - - images.forEach(function (image) { - image.src = image.getAttribute('data-src'); - image.removeAttribute('data-src'); - }); - }, - - show: function show() { - if (!this.hidden) return; - this.list.style.display = 'block'; - this.currentIndex = 0; - this.hidden = false; - }, - - hide: function hide() { - if (this.hidden) return; - this.list.style.display = 'none'; - this.currentIndex = 0; - this.hidden = true; - } - -}, _defineProperty(_Object$assign, 'toggle', function toggle() { - this.hidden ? this.show() : this.hide(); -}), _defineProperty(_Object$assign, 'destroy', function destroy() { - this.hide(); - this.list.removeEventListener('click', this.eventWrapper.clickEvent); -}), _Object$assign)); - -exports.default = DropDown; - -/***/ }), -/* 10 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -__webpack_require__(1); - -var _hook = __webpack_require__(2); - -var _hook2 = _interopRequireDefault(_hook); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var HookButton = function HookButton(trigger, list, plugins, config) { - _hook2.default.call(this, trigger, list, plugins, config); - - this.type = 'button'; - this.event = 'click'; - - this.eventWrapper = {}; - - this.addEvents(); - this.addPlugins(); -}; - -HookButton.prototype = Object.create(_hook2.default.prototype); - -Object.assign(HookButton.prototype, { - addPlugins: function addPlugins() { - var _this = this; - - this.plugins.forEach(function (plugin) { - return plugin.init(_this); - }); - }, - - clicked: function clicked(e) { - var buttonEvent = new CustomEvent('click.dl', { - detail: { - hook: this - }, - bubbles: true, - cancelable: true - }); - e.target.dispatchEvent(buttonEvent); - - this.list.toggle(); - }, - - addEvents: function addEvents() { - this.eventWrapper.clicked = this.clicked.bind(this); - this.trigger.addEventListener('click', this.eventWrapper.clicked); - }, - - removeEvents: function removeEvents() { - this.trigger.removeEventListener('click', this.eventWrapper.clicked); - }, - - restoreInitialState: function restoreInitialState() { - this.list.list.innerHTML = this.list.initialState; - }, - - removePlugins: function removePlugins() { - this.plugins.forEach(function (plugin) { - return plugin.destroy(); - }); - }, - - destroy: function destroy() { - this.restoreInitialState(); - - this.removeEvents(); - this.removePlugins(); - }, - - constructor: HookButton -}); - -exports.default = HookButton; - -/***/ }), -/* 11 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -__webpack_require__(1); - -var _hook = __webpack_require__(2); - -var _hook2 = _interopRequireDefault(_hook); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var HookInput = function HookInput(trigger, list, plugins, config) { - _hook2.default.call(this, trigger, list, plugins, config); - - this.type = 'input'; - this.event = 'input'; - - this.eventWrapper = {}; - - this.addEvents(); - this.addPlugins(); -}; - -Object.assign(HookInput.prototype, { - addPlugins: function addPlugins() { - var _this = this; - - this.plugins.forEach(function (plugin) { - return plugin.init(_this); - }); - }, - - addEvents: function addEvents() { - this.eventWrapper.mousedown = this.mousedown.bind(this); - this.eventWrapper.input = this.input.bind(this); - this.eventWrapper.keyup = this.keyup.bind(this); - this.eventWrapper.keydown = this.keydown.bind(this); - - this.trigger.addEventListener('mousedown', this.eventWrapper.mousedown); - this.trigger.addEventListener('input', this.eventWrapper.input); - this.trigger.addEventListener('keyup', this.eventWrapper.keyup); - this.trigger.addEventListener('keydown', this.eventWrapper.keydown); - }, - - removeEvents: function removeEvents() { - this.hasRemovedEvents = true; - - this.trigger.removeEventListener('mousedown', this.eventWrapper.mousedown); - this.trigger.removeEventListener('input', this.eventWrapper.input); - this.trigger.removeEventListener('keyup', this.eventWrapper.keyup); - this.trigger.removeEventListener('keydown', this.eventWrapper.keydown); - }, - - input: function input(e) { - if (this.hasRemovedEvents) return; - - this.list.show(); - - var inputEvent = new CustomEvent('input.dl', { - detail: { - hook: this, - text: e.target.value - }, - bubbles: true, - cancelable: true - }); - e.target.dispatchEvent(inputEvent); - }, - - mousedown: function mousedown(e) { - if (this.hasRemovedEvents) return; - - var mouseEvent = new CustomEvent('mousedown.dl', { - detail: { - hook: this, - text: e.target.value - }, - bubbles: true, - cancelable: true - }); - e.target.dispatchEvent(mouseEvent); - }, - - keyup: function keyup(e) { - if (this.hasRemovedEvents) return; - - this.keyEvent(e, 'keyup.dl'); - }, - - keydown: function keydown(e) { - if (this.hasRemovedEvents) return; - - this.keyEvent(e, 'keydown.dl'); - }, - - keyEvent: function keyEvent(e, eventName) { - this.list.show(); - - var keyEvent = new CustomEvent(eventName, { - detail: { - hook: this, - text: e.target.value, - which: e.which, - key: e.key - }, - bubbles: true, - cancelable: true - }); - e.target.dispatchEvent(keyEvent); - }, - - restoreInitialState: function restoreInitialState() { - this.list.list.innerHTML = this.list.initialState; - }, - - removePlugins: function removePlugins() { - this.plugins.forEach(function (plugin) { - return plugin.destroy(); - }); - }, - - destroy: function destroy() { - this.restoreInitialState(); - - this.removeEvents(); - this.removePlugins(); - - this.list.destroy(); - } -}); - -exports.default = HookInput; - -/***/ }), -/* 12 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _constants = __webpack_require__(0); - -var Keyboard = function Keyboard() { - var currentKey; - var currentFocus; - var isUpArrow = false; - var isDownArrow = false; - var removeHighlight = function removeHighlight(list) { - var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0); - var listItems = []; - for (var i = 0; i < itemElements.length; i++) { - var listItem = itemElements[i]; - listItem.classList.remove(_constants.ACTIVE_CLASS); - - if (listItem.style.display !== 'none') { - listItems.push(listItem); - } - } - return listItems; - }; - - var setMenuForArrows = function setMenuForArrows(list) { - var listItems = removeHighlight(list); - if (list.currentIndex > 0) { - if (!listItems[list.currentIndex - 1]) { - list.currentIndex = list.currentIndex - 1; - } - - if (listItems[list.currentIndex - 1]) { - var el = listItems[list.currentIndex - 1]; - var filterDropdownEl = el.closest('.filter-dropdown'); - el.classList.add(_constants.ACTIVE_CLASS); - - if (filterDropdownEl) { - var filterDropdownBottom = filterDropdownEl.offsetHeight; - var elOffsetTop = el.offsetTop - 30; - - if (elOffsetTop > filterDropdownBottom) { - filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom; - } - } - } - } - }; - - var mousedown = function mousedown(e) { - var list = e.detail.hook.list; - removeHighlight(list); - list.show(); - list.currentIndex = 0; - isUpArrow = false; - isDownArrow = false; - }; - var selectItem = function selectItem(list) { - var listItems = removeHighlight(list); - var currentItem = listItems[list.currentIndex - 1]; - var listEvent = new CustomEvent('click.dl', { - detail: { - list: list, - selected: currentItem, - data: currentItem.dataset - } - }); - list.list.dispatchEvent(listEvent); - list.hide(); - }; - - var keydown = function keydown(e) { - var typedOn = e.target; - var list = e.detail.hook.list; - var currentIndex = list.currentIndex; - isUpArrow = false; - isDownArrow = false; - - if (e.detail.which) { - currentKey = e.detail.which; - if (currentKey === 13) { - selectItem(e.detail.hook.list); - return; - } - if (currentKey === 38) { - isUpArrow = true; - } - if (currentKey === 40) { - isDownArrow = true; - } - } else if (e.detail.key) { - currentKey = e.detail.key; - if (currentKey === 'Enter') { - selectItem(e.detail.hook.list); - return; - } - if (currentKey === 'ArrowUp') { - isUpArrow = true; - } - if (currentKey === 'ArrowDown') { - isDownArrow = true; - } - } - if (isUpArrow) { - currentIndex--; - } - if (isDownArrow) { - currentIndex++; - } - if (currentIndex < 0) { - currentIndex = 0; - } - list.currentIndex = currentIndex; - setMenuForArrows(e.detail.hook.list); - }; - - document.addEventListener('mousedown.dl', mousedown); - document.addEventListener('keydown.dl', keydown); -}; - -exports.default = Keyboard; - -/***/ }), -/* 13 */, -/* 14 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _droplab = __webpack_require__(4); - -Object.keys(_droplab).forEach(function (key) { - if (key === "default" || key === "__esModule") return; - Object.defineProperty(exports, key, { - enumerable: true, - get: function get() { - return _droplab[key]; - } - }); -}); - -/***/ }) -/******/ ]); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca","webpack:///./src/constants.js","webpack:///./~/custom-event-polyfill/custom-event-polyfill.js","webpack:///./src/hook.js","webpack:///./src/utils.js","webpack:///./src/droplab.js","webpack:///./src/dropdown.js","webpack:///./src/hook_button.js","webpack:///./src/hook_input.js","webpack:///./src/keyboard.js","webpack:///./src/index.js"],"names":["DATA_TRIGGER","DATA_DROPDOWN","SELECTED_CLASS","ACTIVE_CLASS","Hook","trigger","list","plugins","config","type","event","id","Object","assign","prototype","addEvents","constructor","utils","toCamelCase","attr","camelize","split","slice","join","t","s","d","p","hasOwnProperty","call","replace","RegExp","str","letter","index","toLowerCase","toUpperCase","closest","thisTag","stopTag","tagName","parentNode","isDropDownParts","target","hasAttribute","DropLab","ready","hooks","queuedData","eventWrapper","loadStatic","dropdownTriggers","apply","document","querySelectorAll","addHooks","addData","args","arguments","applyArgs","setData","destroy","forEach","hook","removeEvents","methodName","push","_addData","data","_processData","_setData","Array","isArray","documentClicked","bind","addEventListener","e","hide","removeEventListener","changeHookList","availableTrigger","getElementById","i","dataset","dropdownActive","splice","addHook","availableHook","querySelector","availableList","Element","HookObject","setConfig","obj","fireReady","readyEvent","CustomEvent","detail","dropdown","dispatchEvent","init","DropDown","currentIndex","hidden","items","getItems","initTemplateString","initialState","innerHTML","templateString","length","outerHTML","clickEvent","selected","addSelectedClass","preventDefault","listEvent","removeSelectedClasses","classList","add","item","remove","toggle","show","render","concat","children","map","renderChildren","renderableList","html","template","createElement","setImagesSrc","firstChild","style","display","droplab_hidden","images","image","src","getAttribute","removeAttribute","HookButton","addPlugins","create","plugin","clicked","buttonEvent","bubbles","cancelable","restoreInitialState","removePlugins","HookInput","mousedown","input","keyup","keydown","hasRemovedEvents","inputEvent","text","value","mouseEvent","keyEvent","eventName","which","key","Keyboard","currentKey","currentFocus","isUpArrow","isDownArrow","removeHighlight","itemElements","listItems","listItem","setMenuForArrows","el","filterDropdownEl","filterDropdownBottom","offsetHeight","elOffsetTop","offsetTop","scrollTop","selectItem","currentItem","typedOn"],"mappings":"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","file":"./dist/droplab.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 14);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","const DATA_TRIGGER = 'data-dropdown-trigger';\nconst DATA_DROPDOWN = 'data-dropdown';\nconst SELECTED_CLASS = 'droplab-item-selected';\nconst ACTIVE_CLASS = 'droplab-item-active';\n\nexport {\n  DATA_TRIGGER,\n  DATA_DROPDOWN,\n  SELECTED_CLASS,\n  ACTIVE_CLASS,\n};\n\n\n\n// WEBPACK FOOTER //\n// ./src/constants.js","// Polyfill for creating CustomEvents on IE9/10/11\n\n// code pulled from:\n// https://github.com/d4tocchini/customevent-polyfill\n// https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent#Polyfill\n\ntry {\n    var ce = new window.CustomEvent('test');\n    ce.preventDefault();\n    if (ce.defaultPrevented !== true) {\n        // IE has problems with .preventDefault() on custom events\n        // http://stackoverflow.com/questions/23349191\n        throw new Error('Could not prevent default');\n    }\n} catch(e) {\n  var CustomEvent = function(event, params) {\n    var evt, origPrevent;\n    params = params || {\n      bubbles: false,\n      cancelable: false,\n      detail: undefined\n    };\n\n    evt = document.createEvent(\"CustomEvent\");\n    evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);\n    origPrevent = evt.preventDefault;\n    evt.preventDefault = function () {\n      origPrevent.call(this);\n      try {\n        Object.defineProperty(this, 'defaultPrevented', {\n          get: function () {\n            return true;\n          }\n        });\n      } catch(e) {\n        this.defaultPrevented = true;\n      }\n    };\n    return evt;\n  };\n\n  CustomEvent.prototype = window.Event.prototype;\n  window.CustomEvent = CustomEvent; // expose definition to window\n}\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./~/custom-event-polyfill/custom-event-polyfill.js\n// module id = 1\n// module chunks = 0 1","import DropDown from './dropdown';\n\nvar Hook = function(trigger, list, plugins, config){\n  this.trigger = trigger;\n  this.list = new DropDown(list);\n  this.type = 'Hook';\n  this.event = 'click';\n  this.plugins = plugins || [];\n  this.config = config || {};\n  this.id = trigger.id;\n};\n\nObject.assign(Hook.prototype, {\n\n  addEvents: function(){},\n\n  constructor: Hook,\n});\n\nexport default Hook;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook.js","import { DATA_TRIGGER, DATA_DROPDOWN } from './constants';\n\nconst utils = {\n  toCamelCase(attr) {\n    return this.camelize(attr.split('-').slice(1).join(' '));\n  },\n\n  t(s, d) {\n    for (const p in d) {\n      if (Object.prototype.hasOwnProperty.call(d, p)) {\n        s = s.replace(new RegExp(`{{${p}}}`, 'g'), d[p]);\n      }\n    }\n    return s;\n  },\n\n  camelize(str) {\n    return str.replace(/(?:^\\w|[A-Z]|\\b\\w)/g, (letter, index) => {\n      return index === 0 ? letter.toLowerCase() : letter.toUpperCase();\n    }).replace(/\\s+/g, '');\n  },\n\n  closest(thisTag, stopTag) {\n    while (thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML') {\n      thisTag = thisTag.parentNode;\n    }\n    return thisTag;\n  },\n\n  isDropDownParts(target) {\n    if (!target || target.tagName === 'HTML') return false;\n    return target.hasAttribute(DATA_TRIGGER) || target.hasAttribute(DATA_DROPDOWN);\n  },\n};\n\n\nexport default utils;\n\n\n\n// WEBPACK FOOTER //\n// ./src/utils.js","import 'custom-event-polyfill';\nimport HookButton from './hook_button';\nimport HookInput from './hook_input';\nimport utils from './utils';\nimport Keyboard from './keyboard';\nimport { DATA_TRIGGER } from './constants';\n\nvar DropLab = function() {\n  this.ready = false;\n  this.hooks = [];\n  this.queuedData = [];\n  this.config = {};\n\n  this.eventWrapper = {};\n};\n\nObject.assign(DropLab.prototype, {\n  loadStatic: function(){\n    var dropdownTriggers = [].slice.apply(document.querySelectorAll(`[${DATA_TRIGGER}]`));\n    this.addHooks(dropdownTriggers);\n  },\n\n  addData: function () {\n    var args = [].slice.apply(arguments);\n    this.applyArgs(args, '_addData');\n  },\n\n  setData: function() {\n    var args = [].slice.apply(arguments);\n    this.applyArgs(args, '_setData');\n  },\n\n  destroy: function() {\n    this.hooks.forEach(hook => hook.destroy());\n    this.hooks = [];\n    this.removeEvents();\n  },\n\n  applyArgs: function(args, methodName) {\n    if (this.ready) return this[methodName].apply(this, args);\n\n    this.queuedData = this.queuedData || [];\n    this.queuedData.push(args);\n  },\n\n  _addData: function(trigger, data) {\n    this._processData(trigger, data, 'addData');\n  },\n\n  _setData: function(trigger, data) {\n    this._processData(trigger, data, 'setData');\n  },\n\n  _processData: function(trigger, data, methodName) {\n    this.hooks.forEach((hook) => {\n      if (Array.isArray(trigger)) hook.list[methodName](trigger);\n\n      if (hook.trigger.id === trigger) hook.list[methodName](data);\n    });\n  },\n\n  addEvents: function() {\n    this.eventWrapper.documentClicked = this.documentClicked.bind(this)\n    document.addEventListener('click', this.eventWrapper.documentClicked);\n  },\n\n  documentClicked: function(e) {\n    let thisTag = e.target;\n\n    if (thisTag.tagName !== 'UL') thisTag = utils.closest(thisTag, 'UL');\n    if (utils.isDropDownParts(thisTag, this.hooks) || utils.isDropDownParts(e.target, this.hooks)) return;\n\n    this.hooks.forEach(hook => hook.list.hide());\n  },\n\n  removeEvents: function(){\n    document.removeEventListener('click', this.eventWrapper.documentClicked);\n  },\n\n  changeHookList: function(trigger, list, plugins, config) {\n    const availableTrigger =  typeof trigger === 'string' ? document.getElementById(trigger) : trigger;\n\n\n    this.hooks.forEach((hook, i) => {\n      hook.list.list.dataset.dropdownActive = false;\n\n      if (hook.trigger !== availableTrigger) return;\n\n      hook.destroy();\n      this.hooks.splice(i, 1);\n      this.addHook(availableTrigger, list, plugins, config);\n    });\n  },\n\n  addHook: function(hook, list, plugins, config) {\n    const availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook;\n    let availableList;\n\n    if (typeof list === 'string') {\n      availableList = document.querySelector(list);\n    } else if (list instanceof Element) {\n      availableList = list;\n    } else {\n      availableList = document.querySelector(hook.dataset[utils.toCamelCase(DATA_TRIGGER)]);\n    }\n\n    availableList.dataset.dropdownActive = true;\n\n    const HookObject = availableHook.tagName === 'INPUT' ? HookInput : HookButton;\n    this.hooks.push(new HookObject(availableHook, availableList, plugins, config));\n\n    return this;\n  },\n\n  addHooks: function(hooks, plugins, config) {\n    hooks.forEach(hook => this.addHook(hook, null, plugins, config));\n    return this;\n  },\n\n  setConfig: function(obj){\n    this.config = obj;\n  },\n\n  fireReady: function() {\n    const readyEvent = new CustomEvent('ready.dl', {\n      detail: {\n        dropdown: this,\n      },\n    });\n    document.dispatchEvent(readyEvent);\n\n    this.ready = true;\n  },\n\n  init: function (hook, list, plugins, config) {\n    hook ? this.addHook(hook, list, plugins, config) : this.loadStatic();\n\n    this.addEvents();\n\n    Keyboard();\n\n    this.fireReady();\n\n    this.queuedData.forEach(data => this.addData(data));\n    this.queuedData = [];\n\n    return this;\n  },\n});\n\nexport default DropLab;\n\n\n\n// WEBPACK FOOTER //\n// ./src/droplab.js","import 'custom-event-polyfill';\nimport utils from './utils';\nimport { SELECTED_CLASS } from '../src/constants';\n\nvar DropDown = function(list) {\n  this.currentIndex = 0;\n  this.hidden = true;\n  this.list = typeof list === 'string' ? document.querySelector(list) : list;\n  this.items = [];\n\n  this.eventWrapper = {};\n\n  this.getItems();\n  this.initTemplateString();\n  this.addEvents();\n\n  this.initialState = list.innerHTML;\n};\n\nObject.assign(DropDown.prototype, {\n  getItems: function() {\n    this.items = [].slice.call(this.list.querySelectorAll('li'));\n    return this.items;\n  },\n\n  initTemplateString: function() {\n    var items = this.items || this.getItems();\n\n    var templateString = '';\n    if (items.length > 0) templateString = items[items.length - 1].outerHTML;\n    this.templateString = templateString;\n\n    return this.templateString;\n  },\n\n  clickEvent: function(e) {\n    var selected = utils.closest(e.target, 'LI');\n    if (!selected) return;\n\n    this.addSelectedClass(selected);\n\n    e.preventDefault();\n    this.hide();\n\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: this,\n        selected: selected,\n        data: e.target.dataset,\n      },\n    });\n    this.list.dispatchEvent(listEvent);\n  },\n\n  addSelectedClass: function (selected) {\n    this.removeSelectedClasses();\n    selected.classList.add(SELECTED_CLASS);\n  },\n\n  removeSelectedClasses: function () {\n    const items = this.items || this.getItems();\n\n    items.forEach(item => item.classList.remove(SELECTED_CLASS));\n  },\n\n  addEvents: function() {\n    this.eventWrapper.clickEvent = this.clickEvent.bind(this)\n    this.list.addEventListener('click', this.eventWrapper.clickEvent);\n  },\n\n  toggle: function() {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  setData: function(data) {\n    this.data = data;\n    this.render(data);\n  },\n\n  addData: function(data) {\n    this.data = (this.data || []).concat(data);\n    this.render(this.data);\n  },\n\n  render: function(data) {\n    const children = data ? data.map(this.renderChildren.bind(this)) : [];\n    const renderableList = this.list.querySelector('ul[data-dynamic]') || this.list;\n\n    renderableList.innerHTML = children.join('');\n  },\n\n  renderChildren: function(data) {\n    var html = utils.t(this.templateString, data);\n    var template = document.createElement('div');\n\n    template.innerHTML = html;\n    this.setImagesSrc(template);\n    template.firstChild.style.display = data.droplab_hidden ? 'none' : 'block';\n\n    return template.firstChild.outerHTML;\n  },\n\n  setImagesSrc: function(template) {\n    const images = [].slice.call(template.querySelectorAll('img[data-src]'));\n\n    images.forEach((image) => {\n      image.src = image.getAttribute('data-src');\n      image.removeAttribute('data-src');\n    });\n  },\n\n  show: function() {\n    if (!this.hidden) return;\n    this.list.style.display = 'block';\n    this.currentIndex = 0;\n    this.hidden = false;\n  },\n\n  hide: function() {\n    if (this.hidden) return;\n    this.list.style.display = 'none';\n    this.currentIndex = 0;\n    this.hidden = true;\n  },\n\n  toggle: function () {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  destroy: function() {\n    this.hide();\n    this.list.removeEventListener('click', this.eventWrapper.clickEvent);\n  }\n});\n\nexport default DropDown;\n\n\n\n// WEBPACK FOOTER //\n// ./src/dropdown.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookButton = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'button';\n  this.event = 'click';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nHookButton.prototype = Object.create(Hook.prototype);\n\nObject.assign(HookButton.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  clicked: function(e){\n    var buttonEvent = new CustomEvent('click.dl', {\n      detail: {\n        hook: this,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(buttonEvent);\n\n    this.list.toggle();\n  },\n\n  addEvents: function(){\n    this.eventWrapper.clicked = this.clicked.bind(this);\n    this.trigger.addEventListener('click', this.eventWrapper.clicked);\n  },\n\n  removeEvents: function(){\n    this.trigger.removeEventListener('click', this.eventWrapper.clicked);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n  },\n\n  constructor: HookButton,\n});\n\n\nexport default HookButton;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_button.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookInput = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'input';\n  this.event = 'input';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nObject.assign(HookInput.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  addEvents: function(){\n    this.eventWrapper.mousedown = this.mousedown.bind(this);\n    this.eventWrapper.input = this.input.bind(this);\n    this.eventWrapper.keyup = this.keyup.bind(this);\n    this.eventWrapper.keydown = this.keydown.bind(this);\n\n    this.trigger.addEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.addEventListener('input', this.eventWrapper.input);\n    this.trigger.addEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.addEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  removeEvents: function() {\n    this.hasRemovedEvents = true;\n\n    this.trigger.removeEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.removeEventListener('input', this.eventWrapper.input);\n    this.trigger.removeEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.removeEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  input: function(e) {\n    if(this.hasRemovedEvents) return;\n\n    this.list.show();\n\n    const inputEvent = new CustomEvent('input.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(inputEvent);\n  },\n\n  mousedown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    const mouseEvent = new CustomEvent('mousedown.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(mouseEvent);\n  },\n\n  keyup: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keyup.dl');\n  },\n\n  keydown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keydown.dl');\n  },\n\n  keyEvent: function(e, eventName) {\n    this.list.show();\n\n    const keyEvent = new CustomEvent(eventName, {\n      detail: {\n        hook: this,\n        text: e.target.value,\n        which: e.which,\n        key: e.key,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(keyEvent);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n\n    this.list.destroy();\n  }\n});\n\nexport default HookInput;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_input.js","import { ACTIVE_CLASS } from './constants';\n\nconst Keyboard = function () {\n  var currentKey;\n  var currentFocus;\n  var isUpArrow = false;\n  var isDownArrow = false;\n  var removeHighlight = function removeHighlight(list) {\n    var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0);\n    var listItems = [];\n    for(var i = 0; i < itemElements.length; i++) {\n      var listItem = itemElements[i];\n      listItem.classList.remove(ACTIVE_CLASS);\n\n      if (listItem.style.display !== 'none') {\n        listItems.push(listItem);\n      }\n    }\n    return listItems;\n  };\n\n  var setMenuForArrows = function setMenuForArrows(list) {\n    var listItems = removeHighlight(list);\n    if(list.currentIndex>0){\n      if(!listItems[list.currentIndex-1]){\n        list.currentIndex = list.currentIndex-1;\n      }\n\n      if (listItems[list.currentIndex-1]) {\n        var el = listItems[list.currentIndex-1];\n        var filterDropdownEl = el.closest('.filter-dropdown');\n        el.classList.add(ACTIVE_CLASS);\n\n        if (filterDropdownEl) {\n          var filterDropdownBottom = filterDropdownEl.offsetHeight;\n          var elOffsetTop = el.offsetTop - 30;\n\n          if (elOffsetTop > filterDropdownBottom) {\n            filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom;\n          }\n        }\n      }\n    }\n  };\n\n  var mousedown = function mousedown(e) {\n    var list = e.detail.hook.list;\n    removeHighlight(list);\n    list.show();\n    list.currentIndex = 0;\n    isUpArrow = false;\n    isDownArrow = false;\n  };\n  var selectItem = function selectItem(list) {\n    var listItems = removeHighlight(list);\n    var currentItem = listItems[list.currentIndex-1];\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: list,\n        selected: currentItem,\n        data: currentItem.dataset,\n      },\n    });\n    list.list.dispatchEvent(listEvent);\n    list.hide();\n  }\n\n  var keydown = function keydown(e){\n    var typedOn = e.target;\n    var list = e.detail.hook.list;\n    var currentIndex = list.currentIndex;\n    isUpArrow = false;\n    isDownArrow = false;\n\n    if(e.detail.which){\n      currentKey = e.detail.which;\n      if(currentKey === 13){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 38) {\n        isUpArrow = true;\n      }\n      if(currentKey === 40) {\n        isDownArrow = true;\n      }\n    } else if(e.detail.key) {\n      currentKey = e.detail.key;\n      if(currentKey === 'Enter'){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 'ArrowUp') {\n        isUpArrow = true;\n      }\n      if(currentKey === 'ArrowDown') {\n        isDownArrow = true;\n      }\n    }\n    if(isUpArrow){ currentIndex--; }\n    if(isDownArrow){ currentIndex++; }\n    if(currentIndex < 0){ currentIndex = 0; }\n    list.currentIndex = currentIndex;\n    setMenuForArrows(e.detail.hook.list);\n  };\n\n  document.addEventListener('mousedown.dl', mousedown);\n  document.addEventListener('keydown.dl', keydown);\n};\n\nexport default Keyboard;\n\n\n\n// WEBPACK FOOTER //\n// ./src/keyboard.js","export * from './droplab';\n\n\n\n// WEBPACK FOOTER //\n// ./src/index.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/ajax.js b/app/assets/javascripts/droplab/plugins/ajax.js deleted file mode 100644 index afc423b7f0e..00000000000 --- a/app/assets/javascripts/droplab/plugins/ajax.js +++ /dev/null @@ -1,157 +0,0 @@ -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) -/******/ return installedModules[moduleId].exports; -/******/ -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // identity function for calling harmony imports with the correct context -/******/ __webpack_require__.i = function(value) { return value; }; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { -/******/ configurable: false, -/******/ enumerable: true, -/******/ get: getter -/******/ }); -/******/ } -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 5); -/******/ }) -/************************************************************************/ -/******/ ({ - -/***/ 5: -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -function droplabAjaxException(message) { - this.message = message; -} - -var droplabAjax = { - _loadUrlData: function _loadUrlData(url) { - var self = this; - return new Promise(function (resolve, reject) { - var xhr = new XMLHttpRequest(); - xhr.open('GET', url, true); - xhr.onreadystatechange = function () { - if (xhr.readyState === XMLHttpRequest.DONE) { - if (xhr.status === 200) { - var data = JSON.parse(xhr.responseText); - self.cache[url] = data; - return resolve(data); - } else { - return reject([xhr.responseText, xhr.status]); - } - } - }; - xhr.send(); - }); - }, - _loadData: function _loadData(data, config, self) { - if (config.loadingTemplate) { - var dataLoadingTemplate = self.hook.list.list.querySelector('[data-loading-template]'); - if (dataLoadingTemplate) dataLoadingTemplate.outerHTML = self.listTemplate; - } - - if (!self.destroyed) self.hook.list[config.method].call(self.hook.list, data); - }, - init: function init(hook) { - var self = this; - self.destroyed = false; - self.cache = self.cache || {}; - var config = hook.config.droplabAjax; - this.hook = hook; - if (!config || !config.endpoint || !config.method) { - return; - } - if (config.method !== 'setData' && config.method !== 'addData') { - return; - } - if (config.loadingTemplate) { - var dynamicList = hook.list.list.querySelector('[data-dynamic]'); - var loadingTemplate = document.createElement('div'); - loadingTemplate.innerHTML = config.loadingTemplate; - loadingTemplate.setAttribute('data-loading-template', ''); - this.listTemplate = dynamicList.outerHTML; - dynamicList.outerHTML = loadingTemplate.outerHTML; - } - if (self.cache[config.endpoint]) { - self._loadData(self.cache[config.endpoint], config, self); - } else { - this._loadUrlData(config.endpoint).then(function (d) { - self._loadData(d, config, self); - }).catch(function (e) { - throw new droplabAjaxException(e.message || e); - }); - } - }, - destroy: function destroy() { - this.destroyed = true; - - var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); - if (this.listTemplate && dynamicList) { - dynamicList.outerHTML = this.listTemplate; - } - } -}; - -exports.default = droplabAjax; - -/***/ }) - -/******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca?0abf********","webpack:///./src/plugins/ajax/ajax.js?2178"],"names":["droplabAjaxException","message","droplabAjax","_loadUrlData","url","self","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","data","JSON","parse","responseText","cache","send","_loadData","config","loadingTemplate","dataLoadingTemplate","hook","list","querySelector","outerHTML","listTemplate","destroyed","method","call","init","endpoint","dynamicList","document","createElement","innerHTML","setAttribute","then","d","catch","e","destroy"],"mappings":"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","file":"./dist/plugins/ajax.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 5);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","function droplabAjaxException(message) {\n  this.message = message;\n}\n\nconst droplabAjax = {\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n  _loadData: function _loadData(data, config, self) {\n    if (config.loadingTemplate) {\n      var dataLoadingTemplate = self.hook.list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) dataLoadingTemplate.outerHTML = self.listTemplate;\n    }\n\n    if (!self.destroyed) self.hook.list[config.method].call(self.hook.list, data);\n  },\n  init: function init(hook) {\n    var self = this;\n    self.destroyed = false;\n    self.cache = self.cache || {};\n    var config = hook.config.droplabAjax;\n    this.hook = hook;\n    if (!config || !config.endpoint || !config.method) {\n      return;\n    }\n    if (config.method !== 'setData' && config.method !== 'addData') {\n      return;\n    }\n    if (config.loadingTemplate) {\n      var dynamicList = hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', '');\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (self.cache[config.endpoint]) {\n      self._loadData(self.cache[config.endpoint], config, self);\n    } else {\n      this._loadUrlData(config.endpoint)\n        .then(function(d) {\n          self._loadData(d, config, self);\n        }).catch(function(e) {\n          throw new droplabAjaxException(e.message || e);\n        });\n    }\n  },\n  destroy: function() {\n    this.destroyed = true;\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nexport default droplabAjax;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax/ajax.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/ajax_filter.js b/app/assets/javascripts/droplab/plugins/ajax_filter.js deleted file mode 100644 index 3e6532c7709..00000000000 --- a/app/assets/javascripts/droplab/plugins/ajax_filter.js +++ /dev/null @@ -1,214 +0,0 @@ -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) -/******/ return installedModules[moduleId].exports; -/******/ -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // identity function for calling harmony imports with the correct context -/******/ __webpack_require__.i = function(value) { return value; }; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { -/******/ configurable: false, -/******/ enumerable: true, -/******/ get: getter -/******/ }); -/******/ } -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 6); -/******/ }) -/************************************************************************/ -/******/ ({ - -/***/ 6: -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -var droplabAjaxFilter = { - init: function init(hook) { - this.destroyed = false; - this.hook = hook; - this.notLoading(); - - this.eventWrapper = {}; - this.eventWrapper.debounceTrigger = this.debounceTrigger.bind(this); - this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceTrigger); - this.hook.trigger.addEventListener('focus', this.eventWrapper.debounceTrigger); - - this.trigger(true); - }, - - notLoading: function notLoading() { - this.loading = false; - }, - - debounceTrigger: function debounceTrigger(e) { - var NON_CHARACTER_KEYS = [16, 17, 18, 20, 37, 38, 39, 40, 91, 93]; - var invalidKeyPressed = NON_CHARACTER_KEYS.indexOf(e.detail.which || e.detail.keyCode) > -1; - var focusEvent = e.type === 'focus'; - if (invalidKeyPressed || this.loading) { - return; - } - if (this.timeout) { - clearTimeout(this.timeout); - } - this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200); - }, - - trigger: function trigger(getEntireList) { - var config = this.hook.config.droplabAjaxFilter; - var searchValue = this.trigger.value; - if (!config || !config.endpoint || !config.searchKey) { - return; - } - if (config.searchValueFunction) { - searchValue = config.searchValueFunction(); - } - if (config.loadingTemplate && this.hook.list.data === undefined || this.hook.list.data.length === 0) { - var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); - var loadingTemplate = document.createElement('div'); - loadingTemplate.innerHTML = config.loadingTemplate; - loadingTemplate.setAttribute('data-loading-template', true); - this.listTemplate = dynamicList.outerHTML; - dynamicList.outerHTML = loadingTemplate.outerHTML; - } - if (getEntireList) { - searchValue = ''; - } - if (config.searchKey === searchValue) { - return this.list.show(); - } - this.loading = true; - var params = config.params || {}; - params[config.searchKey] = searchValue; - var self = this; - self.cache = self.cache || {}; - var url = config.endpoint + this.buildParams(params); - var urlCachedData = self.cache[url]; - if (urlCachedData) { - self._loadData(urlCachedData, config, self); - } else { - this._loadUrlData(url).then(function (data) { - self._loadData(data, config, self); - }); - } - }, - - _loadUrlData: function _loadUrlData(url) { - var self = this; - return new Promise(function (resolve, reject) { - var xhr = new XMLHttpRequest(); - xhr.open('GET', url, true); - xhr.onreadystatechange = function () { - if (xhr.readyState === XMLHttpRequest.DONE) { - if (xhr.status === 200) { - var data = JSON.parse(xhr.responseText); - self.cache[url] = data; - return resolve(data); - } else { - return reject([xhr.responseText, xhr.status]); - } - } - }; - xhr.send(); - }); - }, - - _loadData: function _loadData(data, config, self) { - var list = self.hook.list; - if (config.loadingTemplate && list.data === undefined || list.data.length === 0) { - var dataLoadingTemplate = list.list.querySelector('[data-loading-template]'); - if (dataLoadingTemplate) { - dataLoadingTemplate.outerHTML = self.listTemplate; - } - } - if (!self.destroyed) { - var hookListChildren = list.list.children; - var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic'); - if (onlyDynamicList && data.length === 0) { - list.hide(); - } - list.setData.call(list, data); - } - self.notLoading(); - list.currentIndex = 0; - }, - - buildParams: function buildParams(params) { - if (!params) return ''; - var paramsArray = Object.keys(params).map(function (param) { - return param + '=' + (params[param] || ''); - }); - return '?' + paramsArray.join('&'); - }, - - destroy: function destroy() { - if (this.timeout) { - clearTimeout(this.timeout); - } - - this.destroyed = true; - this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceTrigger); - this.hook.trigger.removeEventListener('focus', this.eventWrapper.debounceTrigger); - } -}; - -exports.default = droplabAjaxFilter; - -/***/ }) - -/******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca?0abf*******","webpack:///./src/plugins/ajax_filter/ajax_filter.js?c3e5"],"names":["droplabAjaxFilter","init","hook","destroyed","notLoading","eventWrapper","debounceTrigger","bind","trigger","addEventListener","loading","e","NON_CHARACTER_KEYS","invalidKeyPressed","indexOf","detail","which","keyCode","focusEvent","type","timeout","clearTimeout","setTimeout","getEntireList","config","searchValue","value","endpoint","searchKey","searchValueFunction","loadingTemplate","list","data","undefined","length","dynamicList","querySelector","document","createElement","innerHTML","setAttribute","listTemplate","outerHTML","show","params","self","cache","url","buildParams","urlCachedData","_loadData","_loadUrlData","then","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","JSON","parse","responseText","send","dataLoadingTemplate","hookListChildren","children","onlyDynamicList","hasAttribute","hide","setData","call","currentIndex","paramsArray","Object","keys","map","param","join","destroy","removeEventListener"],"mappings":"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","file":"./dist/plugins/ajax_filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 6);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","const droplabAjaxFilter = {\n  init: function(hook) {\n    this.destroyed = false;\n    this.hook = hook;\n    this.notLoading();\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceTrigger = this.debounceTrigger.bind(this);\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.addEventListener('focus', this.eventWrapper.debounceTrigger);\n\n    this.trigger(true);\n  },\n\n  notLoading: function notLoading() {\n    this.loading = false;\n  },\n\n  debounceTrigger: function debounceTrigger(e) {\n    var NON_CHARACTER_KEYS = [16, 17, 18, 20, 37, 38, 39, 40, 91, 93];\n    var invalidKeyPressed = NON_CHARACTER_KEYS.indexOf(e.detail.which || e.detail.keyCode) > -1;\n    var focusEvent = e.type === 'focus';\n    if (invalidKeyPressed || this.loading) {\n      return;\n    }\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n    this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200);\n  },\n\n  trigger: function trigger(getEntireList) {\n    var config = this.hook.config.droplabAjaxFilter;\n    var searchValue = this.trigger.value;\n    if (!config || !config.endpoint || !config.searchKey) {\n      return;\n    }\n    if (config.searchValueFunction) {\n      searchValue = config.searchValueFunction();\n    }\n    if (config.loadingTemplate && this.hook.list.data === undefined ||\n      this.hook.list.data.length === 0) {\n      var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', true);\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (getEntireList) {\n      searchValue = '';\n    }\n    if (config.searchKey === searchValue) {\n      return this.list.show();\n    }\n    this.loading = true;\n    var params = config.params || {};\n    params[config.searchKey] = searchValue;\n    var self = this;\n    self.cache = self.cache || {};\n    var url = config.endpoint + this.buildParams(params);\n    var urlCachedData = self.cache[url];\n    if (urlCachedData) {\n      self._loadData(urlCachedData, config, self);\n    } else {\n      this._loadUrlData(url)\n        .then(function(data) {\n          self._loadData(data, config, self);\n        });\n    }\n  },\n\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n\n  _loadData: function _loadData(data, config, self) {\n    const list = self.hook.list;\n    if (config.loadingTemplate && list.data === undefined ||\n      list.data.length === 0) {\n      const dataLoadingTemplate = list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) {\n        dataLoadingTemplate.outerHTML = self.listTemplate;\n      }\n    }\n    if (!self.destroyed) {\n      var hookListChildren = list.list.children;\n      var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic');\n      if (onlyDynamicList && data.length === 0) {\n        list.hide();\n      }\n      list.setData.call(list, data);\n    }\n    self.notLoading();\n    list.currentIndex = 0;\n  },\n\n  buildParams: function(params) {\n    if (!params) return '';\n    var paramsArray = Object.keys(params).map(function(param) {\n      return param + '=' + (params[param] || '');\n    });\n    return '?' + paramsArray.join('&');\n  },\n\n  destroy: function destroy() {\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n\n    this.destroyed = true;\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.removeEventListener('focus', this.eventWrapper.debounceTrigger);\n  }\n};\n\nexport default droplabAjaxFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax_filter/ajax_filter.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/filter.js b/app/assets/javascripts/droplab/plugins/filter.js deleted file mode 100644 index 3d81fbd7d2f..00000000000 --- a/app/assets/javascripts/droplab/plugins/filter.js +++ /dev/null @@ -1,172 +0,0 @@ -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) -/******/ return installedModules[moduleId].exports; -/******/ -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // identity function for calling harmony imports with the correct context -/******/ __webpack_require__.i = function(value) { return value; }; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { -/******/ configurable: false, -/******/ enumerable: true, -/******/ get: getter -/******/ }); -/******/ } -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 7); -/******/ }) -/************************************************************************/ -/******/ ({ - -/***/ 7: -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -var droplabFilter = { - keydown: function keydown(e) { - var hiddenCount = 0; - var dataHiddenCount = 0; - - var list = e.detail.hook.list; - var data = list.data; - var value = e.detail.hook.trigger.value.toLowerCase(); - var config = e.detail.hook.config.droplabFilter; - var matches = []; - var filterFunction; - // will only work on dynamically set data - if (!data) { - return; - } - - if (config && config.filterFunction && typeof config.filterFunction === 'function') { - filterFunction = config.filterFunction; - } else { - filterFunction = function filterFunction(o) { - // cheap string search - o.droplab_hidden = o[config.template].toLowerCase().indexOf(value) === -1; - return o; - }; - } - - dataHiddenCount = data.filter(function (o) { - return !o.droplab_hidden; - }).length; - - matches = data.map(function (o) { - return filterFunction(o, value); - }); - - hiddenCount = matches.filter(function (o) { - return !o.droplab_hidden; - }).length; - - if (dataHiddenCount !== hiddenCount) { - list.render(matches); - list.currentIndex = 0; - } - }, - - debounceKeydown: function debounceKeydown(e) { - if ([13, // enter - 16, // shift - 17, // ctrl - 18, // alt - 20, // caps lock - 37, // left arrow - 38, // up arrow - 39, // right arrow - 40, // down arrow - 91, // left window - 92, // right window - 93].indexOf(e.detail.which || e.detail.keyCode) > -1) return; - - if (this.timeout) clearTimeout(this.timeout); - this.timeout = setTimeout(this.keydown.bind(this, e), 200); - }, - - init: function init(hook) { - var config = hook.config.droplabFilter; - - if (!config || !config.template) return; - - this.hook = hook; - - this.eventWrapper = {}; - this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this); - - this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown); - this.hook.trigger.addEventListener('mousedown.dl', this.eventWrapper.debounceKeydown); - }, - - destroy: function destroy() { - this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown); - this.hook.trigger.removeEventListener('mousedown.dl', this.eventWrapper.debounceKeydown); - - var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); - if (this.listTemplate && dynamicList) { - dynamicList.outerHTML = this.listTemplate; - } - } -}; - -exports.default = droplabFilter; - -/***/ }) - -/******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca?0abf******","webpack:///./src/plugins/filter/filter.js?f41a"],"names":["droplabFilter","keydown","e","hiddenCount","dataHiddenCount","list","detail","hook","data","value","trigger","toLowerCase","config","matches","filterFunction","o","droplab_hidden","template","indexOf","filter","length","map","render","currentIndex","debounceKeydown","which","keyCode","timeout","clearTimeout","setTimeout","bind","init","eventWrapper","addEventListener","destroy","removeEventListener","dynamicList","querySelector","listTemplate","outerHTML"],"mappings":"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","file":"./dist/plugins/filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 7);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","const droplabFilter = {\n  keydown: function(e){\n    var hiddenCount = 0;\n    var dataHiddenCount = 0;\n\n    var list = e.detail.hook.list;\n    var data = list.data;\n    var value = e.detail.hook.trigger.value.toLowerCase();\n    var config = e.detail.hook.config.droplabFilter;\n    var matches = [];\n    var filterFunction;\n    // will only work on dynamically set data\n    if(!data){\n      return;\n    }\n\n    if (config && config.filterFunction && typeof config.filterFunction === 'function') {\n      filterFunction = config.filterFunction;\n    } else {\n      filterFunction = function(o){\n        // cheap string search\n        o.droplab_hidden = o[config.template].toLowerCase().indexOf(value) === -1;\n        return o;\n      };\n    }\n\n    dataHiddenCount = data.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    matches = data.map(function(o) {\n      return filterFunction(o, value);\n    });\n\n    hiddenCount = matches.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    if (dataHiddenCount !== hiddenCount) {\n      list.render(matches);\n      list.currentIndex = 0;\n    }\n  },\n\n  debounceKeydown: function debounceKeydown(e) {\n    if ([\n      13, // enter\n      16, // shift\n      17, // ctrl\n      18, // alt\n      20, // caps lock\n      37, // left arrow\n      38, // up arrow\n      39, // right arrow\n      40, // down arrow\n      91, // left window\n      92, // right window\n      93, // select\n    ].indexOf(e.detail.which || e.detail.keyCode) > -1) return;\n\n    if (this.timeout) clearTimeout(this.timeout);\n    this.timeout = setTimeout(this.keydown.bind(this, e), 200);\n  },\n\n  init: function init(hook) {\n    var config = hook.config.droplabFilter;\n\n    if (!config || !config.template) return;\n\n    this.hook = hook;\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this);\n\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n    this.hook.trigger.addEventListener('mousedown.dl', this.eventWrapper.debounceKeydown);\n  },\n\n  destroy: function destroy() {\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n    this.hook.trigger.removeEventListener('mousedown.dl', this.eventWrapper.debounceKeydown);\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nexport default droplabFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/filter/filter.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/input_setter.js b/app/assets/javascripts/droplab/plugins/input_setter.js deleted file mode 100644 index 2ee9a796634..00000000000 --- a/app/assets/javascripts/droplab/plugins/input_setter.js +++ /dev/null @@ -1,127 +0,0 @@ -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) -/******/ return installedModules[moduleId].exports; -/******/ -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // identity function for calling harmony imports with the correct context -/******/ __webpack_require__.i = function(value) { return value; }; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { -/******/ configurable: false, -/******/ enumerable: true, -/******/ get: getter -/******/ }); -/******/ } -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 8); -/******/ }) -/************************************************************************/ -/******/ ({ - -/***/ 8: -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -var droplabInputSetter = { - init: function init(hook) { - this.hook = hook; - this.config = hook.config.droplabInputSetter || (this.hook.config.droplabInputSetter = {}); - - this.eventWrapper = {}; - - this.addEvents(); - }, - addEvents: function addEvents() { - this.eventWrapper.setInputs = this.setInputs.bind(this); - this.hook.list.list.addEventListener('click.dl', this.eventWrapper.setInputs); - }, - removeEvents: function removeEvents() { - this.hook.list.list.removeEventListener('click.dl', this.eventWrapper.setInputs); - }, - setInputs: function setInputs(e) { - var _this = this; - - var selectedItem = e.detail.selected; - - if (!Array.isArray(this.config)) this.config = [this.config]; - - this.config.forEach(function (config) { - return _this.setInput(config, selectedItem); - }); - }, - setInput: function setInput(config, selectedItem) { - var input = config.input || this.hook.trigger; - var newValue = selectedItem.getAttribute(config.valueAttribute); - - if (input.tagName === 'INPUT') { - input.value = newValue; - } else { - input.textContent = newValue; - } - }, - destroy: function destroy() { - this.removeEvents(); - } -}; - -exports.default = droplabInputSetter; - -/***/ }) - -/******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vd2VicGFjay9ib290c3RyYXAgOTMzZmY3ZDVlZDM5M2RjNjNiY2E/MGFiZioqKioqIiwid2VicGFjazovLy8uL3NyYy9wbHVnaW5zL2lucHV0X3NldHRlci9pbnB1dF9zZXR0ZXIuanM/NTY5NyJdLCJuYW1lcyI6WyJkcm9wbGFiSW5wdXRTZXR0ZXIiLCJpbml0IiwiaG9vayIsImNvbmZpZyIsImV2ZW50V3JhcHBlciIsImFkZEV2ZW50cyIsInNldElucHV0cyIsImJpbmQiLCJsaXN0IiwiYWRkRXZlbnRMaXN0ZW5lciIsInJlbW92ZUV2ZW50cyIsInJlbW92ZUV2ZW50TGlzdGVuZXIiLCJlIiwic2VsZWN0ZWRJdGVtIiwiZGV0YWlsIiwic2VsZWN0ZWQiLCJBcnJheSIsImlzQXJyYXkiLCJmb3JFYWNoIiwic2V0SW5wdXQiLCJpbnB1dCIsInRyaWdnZXIiLCJuZXdWYWx1ZSIsImdldEF0dHJpYnV0ZSIsInZhbHVlQXR0cmlidXRlIiwidGFnTmFtZSIsInZhbHVlIiwidGV4dENvbnRlbnQiLCJkZXN0cm95Il0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTs7QUFFQTtBQUNBOztBQUVBO0FBQ0E7QUFDQTs7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBOztBQUVBO0FBQ0E7QUFDQTs7O0FBR0E7QUFDQTs7QUFFQTtBQUNBOztBQUVBO0FBQ0EsbURBQTJDLGNBQWM7O0FBRXpEO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EsYUFBSztBQUNMO0FBQ0E7O0FBRUE7QUFDQTtBQUNBO0FBQ0EsbUNBQTJCLDBCQUEwQixFQUFFO0FBQ3ZELHlDQUFpQyxlQUFlO0FBQ2hEO0FBQ0E7QUFDQTs7QUFFQTtBQUNBLDhEQUFzRCwrREFBK0Q7O0FBRXJIO0FBQ0E7O0FBRUE7QUFDQTs7Ozs7Ozs7Ozs7Ozs7QUNoRUEsSUFBTUEscUJBQXFCO0FBQ3pCQyxNQUR5QixnQkFDcEJDLElBRG9CLEVBQ2Q7QUFDVCxTQUFLQSxJQUFMLEdBQVlBLElBQVo7QUFDQSxTQUFLQyxNQUFMLEdBQWNELEtBQUtDLE1BQUwsQ0FBWUgsa0JBQVosS0FBbUMsS0FBS0UsSUFBTCxDQUFVQyxNQUFWLENBQWlCSCxrQkFBakIsR0FBc0MsRUFBekUsQ0FBZDs7QUFFQSxTQUFLSSxZQUFMLEdBQW9CLEVBQXBCOztBQUVBLFNBQUtDLFNBQUw7QUFDRCxHQVJ3QjtBQVV6QkEsV0FWeUIsdUJBVWI7QUFDVixTQUFLRCxZQUFMLENBQWtCRSxTQUFsQixHQUE4QixLQUFLQSxTQUFMLENBQWVDLElBQWYsQ0FBb0IsSUFBcEIsQ0FBOUI7QUFDQSxTQUFLTCxJQUFMLENBQVVNLElBQVYsQ0FBZUEsSUFBZixDQUFvQkMsZ0JBQXBCLENBQXFDLFVBQXJDLEVBQWlELEtBQUtMLFlBQUwsQ0FBa0JFLFNBQW5FO0FBQ0QsR0Fid0I7QUFlekJJLGNBZnlCLDBCQWVWO0FBQ2IsU0FBS1IsSUFBTCxDQUFVTSxJQUFWLENBQWVBLElBQWYsQ0FBb0JHLG1CQUFwQixDQUF3QyxVQUF4QyxFQUFvRCxLQUFLUCxZQUFMLENBQWtCRSxTQUF0RTtBQUNELEdBakJ3QjtBQW1CekJBLFdBbkJ5QixxQkFtQmZNLENBbkJlLEVBbUJaO0FBQUE7O0FBQ1gsUUFBTUMsZUFBZUQsRUFBRUUsTUFBRixDQUFTQyxRQUE5Qjs7QUFFQSxRQUFJLENBQUNDLE1BQU1DLE9BQU4sQ0FBYyxLQUFLZCxNQUFuQixDQUFMLEVBQWlDLEtBQUtBLE1BQUwsR0FBYyxDQUFDLEtBQUtBLE1BQU4sQ0FBZDs7QUFFakMsU0FBS0EsTUFBTCxDQUFZZSxPQUFaLENBQW9CO0FBQUEsYUFBVSxNQUFLQyxRQUFMLENBQWNoQixNQUFkLEVBQXNCVSxZQUF0QixDQUFWO0FBQUEsS0FBcEI7QUFDRCxHQXpCd0I7QUEyQnpCTSxVQTNCeUIsb0JBMkJoQmhCLE1BM0JnQixFQTJCUlUsWUEzQlEsRUEyQk07QUFDN0IsUUFBTU8sUUFBUWpCLE9BQU9pQixLQUFQLElBQWdCLEtBQUtsQixJQUFMLENBQVVtQixPQUF4QztBQUNBLFFBQU1DLFdBQVdULGFBQWFVLFlBQWIsQ0FBMEJwQixPQUFPcUIsY0FBakMsQ0FBakI7O0FBRUEsUUFBSUosTUFBTUssT0FBTixLQUFrQixPQUF0QixFQUErQjtBQUM3QkwsWUFBTU0sS0FBTixHQUFjSixRQUFkO0FBQ0QsS0FGRCxNQUVPO0FBQ0xGLFlBQU1PLFdBQU4sR0FBb0JMLFFBQXBCO0FBQ0Q7QUFDRixHQXBDd0I7QUFzQ3pCTSxTQXRDeUIscUJBc0NmO0FBQ1IsU0FBS2xCLFlBQUw7QUFDRDtBQXhDd0IsQ0FBM0I7O2tCQTJDZVYsa0IiLCJmaWxlIjoiLi9kaXN0L3BsdWdpbnMvaW5wdXRfc2V0dGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiIFx0Ly8gVGhlIG1vZHVsZSBjYWNoZVxuIFx0dmFyIGluc3RhbGxlZE1vZHVsZXMgPSB7fTtcblxuIFx0Ly8gVGhlIHJlcXVpcmUgZnVuY3Rpb25cbiBcdGZ1bmN0aW9uIF9fd2VicGFja19yZXF1aXJlX18obW9kdWxlSWQpIHtcblxuIFx0XHQvLyBDaGVjayBpZiBtb2R1bGUgaXMgaW4gY2FjaGVcbiBcdFx0aWYoaW5zdGFsbGVkTW9kdWxlc1ttb2R1bGVJZF0pXG4gXHRcdFx0cmV0dXJuIGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdLmV4cG9ydHM7XG5cbiBcdFx0Ly8gQ3JlYXRlIGEgbmV3IG1vZHVsZSAoYW5kIHB1dCBpdCBpbnRvIHRoZSBjYWNoZSlcbiBcdFx0dmFyIG1vZHVsZSA9IGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdID0ge1xuIFx0XHRcdGk6IG1vZHVsZUlkLFxuIFx0XHRcdGw6IGZhbHNlLFxuIFx0XHRcdGV4cG9ydHM6IHt9XG4gXHRcdH07XG5cbiBcdFx0Ly8gRXhlY3V0ZSB0aGUgbW9kdWxlIGZ1bmN0aW9uXG4gXHRcdG1vZHVsZXNbbW9kdWxlSWRdLmNhbGwobW9kdWxlLmV4cG9ydHMsIG1vZHVsZSwgbW9kdWxlLmV4cG9ydHMsIF9fd2VicGFja19yZXF1aXJlX18pO1xuXG4gXHRcdC8vIEZsYWcgdGhlIG1vZHVsZSBhcyBsb2FkZWRcbiBcdFx0bW9kdWxlLmwgPSB0cnVlO1xuXG4gXHRcdC8vIFJldHVybiB0aGUgZXhwb3J0cyBvZiB0aGUgbW9kdWxlXG4gXHRcdHJldHVybiBtb2R1bGUuZXhwb3J0cztcbiBcdH1cblxuXG4gXHQvLyBleHBvc2UgdGhlIG1vZHVsZXMgb2JqZWN0IChfX3dlYnBhY2tfbW9kdWxlc19fKVxuIFx0X193ZWJwYWNrX3JlcXVpcmVfXy5tID0gbW9kdWxlcztcblxuIFx0Ly8gZXhwb3NlIHRoZSBtb2R1bGUgY2FjaGVcbiBcdF9fd2VicGFja19yZXF1aXJlX18uYyA9IGluc3RhbGxlZE1vZHVsZXM7XG5cbiBcdC8vIGlkZW50aXR5IGZ1bmN0aW9uIGZvciBjYWxsaW5nIGhhcm1vbnkgaW1wb3J0cyB3aXRoIHRoZSBjb3JyZWN0IGNvbnRleHRcbiBcdF9fd2VicGFja19yZXF1aXJlX18uaSA9IGZ1bmN0aW9uKHZhbHVlKSB7IHJldHVybiB2YWx1ZTsgfTtcblxuIFx0Ly8gZGVmaW5lIGdldHRlciBmdW5jdGlvbiBmb3IgaGFybW9ueSBleHBvcnRzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQgPSBmdW5jdGlvbihleHBvcnRzLCBuYW1lLCBnZXR0ZXIpIHtcbiBcdFx0aWYoIV9fd2VicGFja19yZXF1aXJlX18ubyhleHBvcnRzLCBuYW1lKSkge1xuIFx0XHRcdE9iamVjdC5kZWZpbmVQcm9wZXJ0eShleHBvcnRzLCBuYW1lLCB7XG4gXHRcdFx0XHRjb25maWd1cmFibGU6IGZhbHNlLFxuIFx0XHRcdFx0ZW51bWVyYWJsZTogdHJ1ZSxcbiBcdFx0XHRcdGdldDogZ2V0dGVyXG4gXHRcdFx0fSk7XG4gXHRcdH1cbiBcdH07XG5cbiBcdC8vIGdldERlZmF1bHRFeHBvcnQgZnVuY3Rpb24gZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBub24taGFybW9ueSBtb2R1bGVzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLm4gPSBmdW5jdGlvbihtb2R1bGUpIHtcbiBcdFx0dmFyIGdldHRlciA9IG1vZHVsZSAmJiBtb2R1bGUuX19lc01vZHVsZSA/XG4gXHRcdFx0ZnVuY3Rpb24gZ2V0RGVmYXVsdCgpIHsgcmV0dXJuIG1vZHVsZVsnZGVmYXVsdCddOyB9IDpcbiBcdFx0XHRmdW5jdGlvbiBnZXRNb2R1bGVFeHBvcnRzKCkgeyByZXR1cm4gbW9kdWxlOyB9O1xuIFx0XHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQoZ2V0dGVyLCAnYScsIGdldHRlcik7XG4gXHRcdHJldHVybiBnZXR0ZXI7XG4gXHR9O1xuXG4gXHQvLyBPYmplY3QucHJvdG90eXBlLmhhc093blByb3BlcnR5LmNhbGxcbiBcdF9fd2VicGFja19yZXF1aXJlX18ubyA9IGZ1bmN0aW9uKG9iamVjdCwgcHJvcGVydHkpIHsgcmV0dXJuIE9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbChvYmplY3QsIHByb3BlcnR5KTsgfTtcblxuIFx0Ly8gX193ZWJwYWNrX3B1YmxpY19wYXRoX19cbiBcdF9fd2VicGFja19yZXF1aXJlX18ucCA9IFwiXCI7XG5cbiBcdC8vIExvYWQgZW50cnkgbW9kdWxlIGFuZCByZXR1cm4gZXhwb3J0c1xuIFx0cmV0dXJuIF9fd2VicGFja19yZXF1aXJlX18oX193ZWJwYWNrX3JlcXVpcmVfXy5zID0gOCk7XG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gd2VicGFjay9ib290c3RyYXAgOTMzZmY3ZDVlZDM5M2RjNjNiY2EiLCJjb25zdCBkcm9wbGFiSW5wdXRTZXR0ZXIgPSB7XG4gIGluaXQoaG9vaykge1xuICAgIHRoaXMuaG9vayA9IGhvb2s7XG4gICAgdGhpcy5jb25maWcgPSBob29rLmNvbmZpZy5kcm9wbGFiSW5wdXRTZXR0ZXIgfHwgKHRoaXMuaG9vay5jb25maWcuZHJvcGxhYklucHV0U2V0dGVyID0ge30pO1xuXG4gICAgdGhpcy5ldmVudFdyYXBwZXIgPSB7fTtcblxuICAgIHRoaXMuYWRkRXZlbnRzKCk7XG4gIH0sXG5cbiAgYWRkRXZlbnRzKCkge1xuICAgIHRoaXMuZXZlbnRXcmFwcGVyLnNldElucHV0cyA9IHRoaXMuc2V0SW5wdXRzLmJpbmQodGhpcyk7XG4gICAgdGhpcy5ob29rLmxpc3QubGlzdC5hZGRFdmVudExpc3RlbmVyKCdjbGljay5kbCcsIHRoaXMuZXZlbnRXcmFwcGVyLnNldElucHV0cyk7XG4gIH0sXG5cbiAgcmVtb3ZlRXZlbnRzKCkge1xuICAgIHRoaXMuaG9vay5saXN0Lmxpc3QucmVtb3ZlRXZlbnRMaXN0ZW5lcignY2xpY2suZGwnLCB0aGlzLmV2ZW50V3JhcHBlci5zZXRJbnB1dHMpO1xuICB9LFxuXG4gIHNldElucHV0cyhlKSB7XG4gICAgY29uc3Qgc2VsZWN0ZWRJdGVtID0gZS5kZXRhaWwuc2VsZWN0ZWQ7XG5cbiAgICBpZiAoIUFycmF5LmlzQXJyYXkodGhpcy5jb25maWcpKSB0aGlzLmNvbmZpZyA9IFt0aGlzLmNvbmZpZ107XG5cbiAgICB0aGlzLmNvbmZpZy5mb3JFYWNoKGNvbmZpZyA9PiB0aGlzLnNldElucHV0KGNvbmZpZywgc2VsZWN0ZWRJdGVtKSk7XG4gIH0sXG5cbiAgc2V0SW5wdXQoY29uZmlnLCBzZWxlY3RlZEl0ZW0pIHtcbiAgICBjb25zdCBpbnB1dCA9IGNvbmZpZy5pbnB1dCB8fCB0aGlzLmhvb2sudHJpZ2dlcjtcbiAgICBjb25zdCBuZXdWYWx1ZSA9IHNlbGVjdGVkSXRlbS5nZXRBdHRyaWJ1dGUoY29uZmlnLnZhbHVlQXR0cmlidXRlKTtcblxuICAgIGlmIChpbnB1dC50YWdOYW1lID09PSAnSU5QVVQnKSB7XG4gICAgICBpbnB1dC52YWx1ZSA9IG5ld1ZhbHVlO1xuICAgIH0gZWxzZSB7XG4gICAgICBpbnB1dC50ZXh0Q29udGVudCA9IG5ld1ZhbHVlO1xuICAgIH1cbiAgfSxcblxuICBkZXN0cm95KCkge1xuICAgIHRoaXMucmVtb3ZlRXZlbnRzKCk7XG4gIH0sXG59O1xuXG5leHBvcnQgZGVmYXVsdCBkcm9wbGFiSW5wdXRTZXR0ZXI7XG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gLi9zcmMvcGx1Z2lucy9pbnB1dF9zZXR0ZXIvaW5wdXRfc2V0dGVyLmpzIl0sInNvdXJjZVJvb3QiOiIifQ== \ No newline at end of file diff --git a/app/assets/javascripts/filtered_search/dropdown_hint.js b/app/assets/javascripts/filtered_search/dropdown_hint.js index d3401dd0838..527037c08eb 100644 --- a/app/assets/javascripts/filtered_search/dropdown_hint.js +++ b/app/assets/javascripts/filtered_search/dropdown_hint.js @@ -1,4 +1,4 @@ -import droplabFilter from '../droplab/plugins/filter'; +import Filter from '@gitlab-org/droplab/dist/plugins/Filter'; require('./filtered_search_dropdown'); @@ -7,7 +7,7 @@ require('./filtered_search_dropdown'); constructor(droplab, dropdown, input, filter) { super(droplab, dropdown, input, filter); this.config = { - droplabFilter: { + Filter: { template: 'hint', filterFunction: gl.DropdownUtils.filterHint.bind(null, input), }, @@ -68,12 +68,12 @@ require('./filtered_search_dropdown'); } }); - this.droplab.changeHookList(this.hookId, this.dropdown, [droplabFilter], this.config); + this.droplab.changeHookList(this.hookId, this.dropdown, [Filter], this.config); this.droplab.setData(this.hookId, dropdownData); } init() { - this.droplab.addHook(this.input, this.dropdown, [droplabFilter], this.config).init(); + this.droplab.addHook(this.input, this.dropdown, [Filter], this.config).init(); } } diff --git a/app/assets/javascripts/filtered_search/dropdown_non_user.js b/app/assets/javascripts/filtered_search/dropdown_non_user.js index c30e673f8ba..48c2135aca3 100644 --- a/app/assets/javascripts/filtered_search/dropdown_non_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_non_user.js @@ -1,5 +1,5 @@ -import droplabAjax from '../droplab/plugins/ajax'; -import droplabFilter from '../droplab/plugins/filter'; +import Ajax from '@gitlab-org/droplab/dist/plugins/Ajax'; +import Filter from '@gitlab-org/droplab/dist/plugins/Filter'; require('./filtered_search_dropdown'); @@ -9,12 +9,12 @@ require('./filtered_search_dropdown'); super(droplab, dropdown, input, filter); this.symbol = symbol; this.config = { - droplabAjax: { + Ajax: { endpoint, method: 'setData', loadingTemplate: this.loadingTemplate, }, - droplabFilter: { + Filter: { filterFunction: gl.DropdownUtils.filterWithSymbol.bind(null, this.symbol, input), template: 'title', }, @@ -30,13 +30,13 @@ require('./filtered_search_dropdown'); renderContent(forceShowList = false) { this.droplab - .changeHookList(this.hookId, this.dropdown, [droplabAjax, droplabFilter], this.config); + .changeHookList(this.hookId, this.dropdown, [Ajax, Filter], this.config); super.renderContent(forceShowList); } init() { this.droplab - .addHook(this.input, this.dropdown, [droplabAjax, droplabFilter], this.config).init(); + .addHook(this.input, this.dropdown, [Ajax, Filter], this.config).init(); } } diff --git a/app/assets/javascripts/filtered_search/dropdown_user.js b/app/assets/javascripts/filtered_search/dropdown_user.js index fe95ccb41f8..1661a4c5da2 100644 --- a/app/assets/javascripts/filtered_search/dropdown_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_user.js @@ -1,4 +1,4 @@ -import droplabAjaxFilter from '../droplab/plugins/ajax_filter'; +import AjaxFilter from '@gitlab-org/droplab/dist/plugins/AjaxFilter'; require('./filtered_search_dropdown'); @@ -7,7 +7,7 @@ require('./filtered_search_dropdown'); constructor(droplab, dropdown, input, filter) { super(droplab, dropdown, input, filter); this.config = { - droplabAjaxFilter: { + AjaxFilter: { endpoint: `${gon.relative_url_root || ''}/autocomplete/users.json`, searchKey: 'search', params: { @@ -28,7 +28,7 @@ require('./filtered_search_dropdown'); } renderContent(forceShowList = false) { - this.droplab.changeHookList(this.hookId, this.dropdown, [droplabAjaxFilter], this.config); + this.droplab.changeHookList(this.hookId, this.dropdown, [AjaxFilter], this.config); super.renderContent(forceShowList); } @@ -56,7 +56,7 @@ require('./filtered_search_dropdown'); } init() { - this.droplab.addHook(this.input, this.dropdown, [droplabAjaxFilter], this.config).init(); + this.droplab.addHook(this.input, this.dropdown, [AjaxFilter], this.config).init(); } } diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js index 29aa4c1bb44..f5d6a85a4da 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js +++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js @@ -1,4 +1,4 @@ -import DropLab from '../droplab/droplab'; +import DropLab from '@gitlab-org/droplab'; import FilteredSearchContainer from './container'; (() => { diff --git a/yarn.lock b/yarn.lock index f254668646c..b6f818dabca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14,8 +14,8 @@ accepts@1.3.3, accepts@~1.3.3: negotiator "0.6.1" acorn-dynamic-import@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz#23f671eb6e650dab277fef477c321b1178a8cca2" + version "2.0.2" + resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4" dependencies: acorn "^4.0.3" @@ -25,7 +25,7 @@ acorn-jsx@^3.0.0: dependencies: acorn "^3.0.4" -acorn@4.0.4, acorn@^4.0.4: +acorn@4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a" @@ -33,7 +33,7 @@ acorn@^3.0.4: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" -acorn@^4.0.11, acorn@^4.0.3: +acorn@^4.0.11, acorn@^4.0.3, acorn@^4.0.4: version "4.0.11" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0" @@ -45,9 +45,9 @@ ajv-keywords@^1.0.0, ajv-keywords@^1.1.1: version "1.5.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c" -ajv@^4.7.0: - version "4.11.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.2.tgz#f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6" +ajv@^4.7.0, ajv@^4.9.1: + version "4.11.5" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd" dependencies: co "^4.6.0" json-stable-stringify "^1.0.1" @@ -94,8 +94,8 @@ append-transform@^0.4.0: default-require-extensions "^1.0.0" aproba@^1.0.3: - version "1.1.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.0.tgz#4d8f047a318604e18e3c06a0e52230d3d19f147b" + version "1.1.1" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab" are-we-there-yet@~1.1.2: version "1.1.2" @@ -166,14 +166,14 @@ asn1@~0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + assert-plus@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" -assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - assert@^1.1.1: version "1.4.1" resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" @@ -184,7 +184,7 @@ async-each@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" -async@0.2.x, async@~0.2.6: +async@0.2.x: version "0.2.10" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" @@ -193,8 +193,8 @@ async@1.x, async@^1.4.0, async@^1.4.2, async@^1.5.2: resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" async@^2.1.2, async@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4" + version "2.2.0" + resolved "https://registry.yarnpkg.com/async/-/async-2.2.0.tgz#c324eba010a237e4fbd55a12dee86367d5c0ef32" dependencies: lodash "^4.14.0" @@ -222,15 +222,15 @@ babel-code-frame@^6.16.0, babel-code-frame@^6.22.0: esutils "^2.0.2" js-tokens "^3.0.0" -babel-core@^6.22.1, babel-core@^6.23.0: - version "6.23.1" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.23.1.tgz#c143cb621bb2f621710c220c5d579d15b8a442df" +babel-core@^6.22.1, babel-core@^6.24.0: + version "6.24.0" + resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.0.tgz#8f36a0a77f5c155aed6f920b844d23ba56742a02" dependencies: babel-code-frame "^6.22.0" - babel-generator "^6.23.0" + babel-generator "^6.24.0" babel-helpers "^6.23.0" babel-messages "^6.23.0" - babel-register "^6.23.0" + babel-register "^6.24.0" babel-runtime "^6.22.0" babel-template "^6.23.0" babel-traverse "^6.23.1" @@ -246,9 +246,9 @@ babel-core@^6.22.1, babel-core@^6.23.0: slash "^1.0.0" source-map "^0.5.0" -babel-generator@^6.18.0, babel-generator@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.23.0.tgz#6b8edab956ef3116f79d8c84c5a3c05f32a74bc5" +babel-generator@^6.18.0, babel-generator@^6.24.0: + version "6.24.0" + resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56" dependencies: babel-messages "^6.23.0" babel-runtime "^6.22.0" @@ -378,11 +378,11 @@ babel-helpers@^6.23.0: babel-template "^6.23.0" babel-loader@^6.2.10: - version "6.2.10" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.2.10.tgz#adefc2b242320cd5d15e65b31cea0e8b1b02d4b0" + version "6.4.1" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca" dependencies: find-cache-dir "^0.1.1" - loader-utils "^0.2.11" + loader-utils "^0.2.16" mkdirp "^0.5.1" object-assign "^4.0.1" @@ -399,12 +399,12 @@ babel-plugin-check-es2015-constants@^6.22.0: babel-runtime "^6.22.0" babel-plugin-istanbul@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.0.0.tgz#36bde8fbef4837e5ff0366531a2beabd7b1ffa10" + version "4.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.1.tgz#c12de0fc6fe42adfb16be56f1ad11e4a9782eca9" dependencies: find-up "^2.1.0" - istanbul-lib-instrument "^1.4.2" - test-exclude "^4.0.0" + istanbul-lib-instrument "^1.6.2" + test-exclude "^4.0.3" babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" @@ -745,11 +745,11 @@ babel-preset-stage-3@^6.22.0: babel-plugin-transform-exponentiation-operator "^6.22.0" babel-plugin-transform-object-rest-spread "^6.22.0" -babel-register@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.23.0.tgz#c9aa3d4cca94b51da34826c4a0f9e08145d74ff3" +babel-register@^6.24.0: + version "6.24.0" + resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.0.tgz#5e89f8463ba9970356d02eb07dabe3308b080cfd" dependencies: - babel-core "^6.23.0" + babel-core "^6.24.0" babel-runtime "^6.22.0" core-js "^2.4.0" home-or-tmp "^2.0.0" @@ -758,8 +758,8 @@ babel-register@^6.23.0: source-map-support "^0.4.2" babel-runtime@^6.18.0, babel-runtime@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611" + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b" dependencies: core-js "^2.4.0" regenerator-runtime "^0.10.0" @@ -798,8 +798,8 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23 to-fast-properties "^1.0.1" babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0: - version "6.15.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e" + version "6.16.1" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3" backo2@1.0.2: version "1.0.2" @@ -856,25 +856,25 @@ block-stream@*: inherits "~2.0.0" bluebird@^3.3.0: - version "3.4.7" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" + version "3.5.0" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.6" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215" -body-parser@^1.12.4: - version "1.16.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.16.0.tgz#924a5e472c6229fb9d69b85a20d5f2532dec788b" +body-parser@^1.16.1: + version "1.17.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.17.1.tgz#75b3bc98ddd6e7e0d8ffe750dfaca5c66993fa47" dependencies: bytes "2.4.0" content-type "~1.0.2" - debug "2.6.0" + debug "2.6.1" depd "~1.1.0" - http-errors "~1.5.1" + http-errors "~1.6.1" iconv-lite "0.4.15" on-finished "~2.3.0" - qs "6.2.1" + qs "6.4.0" raw-body "~2.2.0" type-is "~1.6.14" @@ -885,8 +885,8 @@ boom@2.x.x: hoek "2.x.x" bootstrap-sass@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.6.tgz#363b0d300e868d3e70134c1a742bb17288444fd1" + version "3.3.7" + resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz#6596c7ab40f6637393323ab0bc80d064fc630498" brace-expansion@^1.0.0: version "1.1.6" @@ -910,8 +910,8 @@ braces@^1.8.2: repeat-element "^1.1.2" brorand@^1.0.1: - version "1.0.7" - resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.0.7.tgz#6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc" + version "1.1.0" + resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.0.6" @@ -1022,6 +1022,10 @@ caseless@~0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7" +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + center-align@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" @@ -1145,10 +1149,10 @@ component-inherit@0.0.3: resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" compressible@~2.0.8: - version "2.0.9" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.9.tgz#6daab4e2b599c2770dd9e21e7a891b1c5a755425" + version "2.0.10" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd" dependencies: - mime-db ">= 1.24.0 < 2" + mime-db ">= 1.27.0 < 2" compression-webpack-plugin@^0.3.2: version "0.3.2" @@ -1182,7 +1186,7 @@ concat-stream@1.5.0: readable-stream "~2.0.0" typedarray "~0.0.5" -concat-stream@^1.4.6: +concat-stream@^1.5.2: version "1.6.0" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" dependencies: @@ -1194,12 +1198,12 @@ connect-history-api-fallback@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169" -connect@^3.3.5: - version "3.5.0" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.5.0.tgz#b357525a0b4c1f50599cd983e1d9efeea9677198" +connect@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.0.tgz#f09a4f7dcd17324b663b725c815bdb1c4158a46e" dependencies: - debug "~2.2.0" - finalhandler "0.5.0" + debug "2.6.1" + finalhandler "1.0.0" parseurl "~1.3.1" utils-merge "1.0.0" @@ -1230,8 +1234,8 @@ content-type@~1.0.2: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed" convert-source-map@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.3.0.tgz#e9f3e9c6e2728efc2676696a70eb382f73106a67" + version "1.4.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.4.0.tgz#e3dad195bf61bfe13a7a3c73e9876ec14a0268f3" cookie-signature@1.0.6: version "1.0.6" @@ -1293,19 +1297,23 @@ crypto-browserify@^3.11.0: public-encrypt "^4.0.0" randombytes "^2.0.0" +custom-event-polyfill@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/custom-event-polyfill/-/custom-event-polyfill-0.3.0.tgz#99807839be62edb446b645832e0d80ead6fa1888" + custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" d3@^3.5.11: - version "3.5.11" - resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.11.tgz#d130750eed0554db70e8432102f920a12407b69c" + version "3.5.17" + resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8" -d@^0.1.1, d@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309" +d@1: + version "1.0.0" + resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" dependencies: - es5-ext "~0.10.2" + es5-ext "^0.10.9" dashdash@^1.12.0: version "1.14.1" @@ -1333,9 +1341,15 @@ debug@2.3.3: dependencies: ms "0.7.2" -debug@2.6.0, debug@^2.1.1, debug@^2.2.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b" +debug@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351" + dependencies: + ms "0.7.2" + +debug@2.6.3, debug@^2.1.1, debug@^2.2.0: + version "2.6.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d" dependencies: ms "0.7.2" @@ -1383,7 +1397,7 @@ delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" -depd@~1.1.0: +depd@1.1.0, depd@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3" @@ -1416,16 +1430,23 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -doctrine@1.5.0, doctrine@^1.2.2: +doctrine@1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" dependencies: esutils "^2.0.2" isarray "^1.0.0" +doctrine@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63" + dependencies: + esutils "^2.0.2" + isarray "^1.0.0" + document-register-element@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.3.0.tgz#fb3babb523c74662be47be19c6bc33e71990d940" + version "1.4.1" + resolved "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.4.1.tgz#22b41e96fb86cccab2fa30f7d2a8d62ac7be8c57" dom-serialize@^2.2.0: version "2.2.1" @@ -1440,9 +1461,14 @@ domain-browser@^1.1.1: version "1.1.7" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" +"droplab@file:../../../DropLab": + version "0.1.1" + dependencies: + custom-event-polyfill "^0.3.0" + dropzone@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-4.2.0.tgz#fbe7acbb9918e0706489072ef663effeef8a79f3" + version "4.3.0" + resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-4.3.0.tgz#48b0b8f2ad092872e4b535b672a7c3f1a1d67c91" duplexer@^0.1.1: version "0.1.1" @@ -1463,13 +1489,16 @@ ejs@^2.5.5: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88" elliptic@^6.0.0: - version "6.3.3" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.3.tgz#5482d9646d54bcb89fd7d994fc9e2e9568876e3f" + version "6.4.0" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df" dependencies: bn.js "^4.4.0" brorand "^1.0.1" hash.js "^1.0.0" + hmac-drbg "^1.0.0" inherits "^2.0.1" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.0" emoji-unicode-version@^0.2.1: version "0.2.1" @@ -1483,9 +1512,9 @@ encodeurl@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20" -engine.io-client@1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.2.tgz#c38767547f2a7d184f5752f6f0ad501006703766" +engine.io-client@1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.3.tgz#1798ed93451246453d4c6f635d7a201fe940d5ab" dependencies: component-emitter "1.2.1" component-inherit "0.0.3" @@ -1496,7 +1525,7 @@ engine.io-client@1.8.2: parsejson "0.0.3" parseqs "0.0.5" parseuri "0.0.5" - ws "1.1.1" + ws "1.1.2" xmlhttprequest-ssl "1.5.3" yeast "0.1.2" @@ -1511,16 +1540,16 @@ engine.io-parser@1.3.2: has-binary "0.1.7" wtf-8 "1.0.0" -engine.io@1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.2.tgz#6b59be730b348c0125b0a4589de1c355abcf7a7e" +engine.io@1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.3.tgz#8de7f97895d20d39b85f88eeee777b2bd42b13d4" dependencies: accepts "1.3.3" base64id "1.0.0" cookie "0.3.1" debug "2.3.3" engine.io-parser "1.3.2" - ws "1.1.1" + ws "1.1.2" enhanced-resolve@^3.0.0: version "3.1.0" @@ -1550,66 +1579,66 @@ errno@^0.1.3: prr "~0.0.0" error-ex@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.0.tgz#e67b43f3e82c96ea3a584ffee0b9fc3325d802d9" + version "1.3.1" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" dependencies: is-arrayish "^0.2.1" -es5-ext@^0.10.7, es5-ext@^0.10.8, es5-ext@~0.10.11, es5-ext@~0.10.2, es5-ext@~0.10.7: - version "0.10.12" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.12.tgz#aa84641d4db76b62abba5e45fd805ecbab140047" +es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14: + version "0.10.15" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.15.tgz#c330a5934c1ee21284a7c081a86e5fd937c91ea6" dependencies: es6-iterator "2" es6-symbol "~3.1" -es6-iterator@2: - version "2.0.0" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.0.tgz#bd968567d61635e33c0b80727613c9cb4b096bac" +es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512" dependencies: - d "^0.1.1" - es5-ext "^0.10.7" - es6-symbol "3" + d "1" + es5-ext "^0.10.14" + es6-symbol "^3.1" es6-map@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.4.tgz#a34b147be224773a4d7da8072794cefa3632b897" + version "0.1.5" + resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0" dependencies: - d "~0.1.1" - es5-ext "~0.10.11" - es6-iterator "2" - es6-set "~0.1.3" - es6-symbol "~3.1.0" - event-emitter "~0.3.4" + d "1" + es5-ext "~0.10.14" + es6-iterator "~2.0.1" + es6-set "~0.1.5" + es6-symbol "~3.1.1" + event-emitter "~0.3.5" es6-promise@~4.0.3: version "4.0.5" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42" -es6-set@~0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.4.tgz#9516b6761c2964b92ff479456233a247dc707ce8" +es6-set@~0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1" dependencies: - d "~0.1.1" - es5-ext "~0.10.11" - es6-iterator "2" - es6-symbol "3" - event-emitter "~0.3.4" + d "1" + es5-ext "~0.10.14" + es6-iterator "~2.0.1" + es6-symbol "3.1.1" + event-emitter "~0.3.5" -es6-symbol@3, es6-symbol@~3.1, es6-symbol@~3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa" +es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" dependencies: - d "~0.1.1" - es5-ext "~0.10.11" + d "1" + es5-ext "~0.10.14" es6-weak-map@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.1.tgz#0d2bbd8827eb5fb4ba8f97fbfea50d43db21ea81" + version "2.0.2" + resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f" dependencies: - d "^0.1.1" - es5-ext "^0.10.8" - es6-iterator "2" - es6-symbol "3" + d "1" + es5-ext "^0.10.14" + es6-iterator "^2.0.1" + es6-symbol "^3.1.1" escape-html@~1.0.3: version "1.0.3" @@ -1702,16 +1731,17 @@ eslint-plugin-jasmine@^2.1.0: resolved "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.2.0.tgz#7135879383c39a667c721d302b9f20f0389543de" eslint@^3.10.1: - version "3.15.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.15.0.tgz#bdcc6a6c5ffe08160e7b93c066695362a91e30f2" + version "3.18.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.18.0.tgz#647e985c4ae71502d20ac62c109f66d5104c8a4b" dependencies: babel-code-frame "^6.16.0" chalk "^1.1.3" - concat-stream "^1.4.6" + concat-stream "^1.5.2" debug "^2.1.1" - doctrine "^1.2.2" + doctrine "^2.0.0" escope "^3.6.0" espree "^3.4.0" + esquery "^1.0.0" estraverse "^4.2.0" esutils "^2.0.2" file-entry-cache "^2.0.0" @@ -1755,6 +1785,12 @@ esprima@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" +esquery@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa" + dependencies: + estraverse "^4.0.0" + esrecurse@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220" @@ -1766,7 +1802,7 @@ estraverse@^1.9.1: version "1.9.3" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44" -estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -1778,20 +1814,20 @@ esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" -etag@~1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.7.0.tgz#03d30b5f67dd6e632d2945d30d6652731a34d5d8" +etag@~1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.0.tgz#6f631aef336d6c46362b51764044ce216be3c051" eve-raphael@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz#17c754b792beef3fa6684d79cf5a47c63c4cda30" -event-emitter@~0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.4.tgz#8d63ddfb4cfe1fae3b32ca265c4c720222080bb5" +event-emitter@~0.3.5: + version "0.3.5" + resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" dependencies: - d "~0.1.1" - es5-ext "~0.10.7" + d "1" + es5-ext "~0.10.14" eventemitter3@1.x.x: version "1.2.0" @@ -1801,7 +1837,7 @@ events@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" -eventsource@~0.1.6: +eventsource@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232" dependencies: @@ -1845,8 +1881,8 @@ expand-range@^1.8.1: fill-range "^2.1.0" express@^4.13.3, express@^4.14.1: - version "4.14.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.14.1.tgz#646c237f766f148c2120aff073817b9e4d7e0d33" + version "4.15.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.15.2.tgz#af107fc148504457f2dca9a6f2571d7129b97b35" dependencies: accepts "~1.3.3" array-flatten "1.1.1" @@ -1854,23 +1890,25 @@ express@^4.13.3, express@^4.14.1: content-type "~1.0.2" cookie "0.3.1" cookie-signature "1.0.6" - debug "~2.2.0" + debug "2.6.1" depd "~1.1.0" encodeurl "~1.0.1" escape-html "~1.0.3" - etag "~1.7.0" - finalhandler "0.5.1" - fresh "0.3.0" + etag "~1.8.0" + finalhandler "~1.0.0" + fresh "0.5.0" merge-descriptors "1.0.1" methods "~1.1.2" on-finished "~2.3.0" parseurl "~1.3.1" path-to-regexp "0.1.7" proxy-addr "~1.1.3" - qs "6.2.0" + qs "6.4.0" range-parser "~1.2.0" - send "0.14.2" - serve-static "~1.11.2" + send "0.15.1" + serve-static "1.12.1" + setprototypeof "1.0.3" + statuses "~1.3.1" type-is "~1.6.14" utils-merge "1.0.0" vary "~1.1.0" @@ -1946,8 +1984,8 @@ fileset@^2.0.2: minimatch "^3.0.3" filesize@^3.5.4: - version "3.5.4" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.4.tgz#742fc7fb6aef4ee3878682600c22f840731e1fda" + version "3.5.6" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a" fill-range@^2.1.0: version "2.2.3" @@ -1959,23 +1997,27 @@ fill-range@^2.1.0: repeat-element "^1.1.2" repeat-string "^1.5.2" -finalhandler@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.0.tgz#e9508abece9b6dba871a6942a1d7911b91911ac7" +finalhandler@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.0.tgz#b5691c2c0912092f18ac23e9416bde5cd7dc6755" dependencies: - debug "~2.2.0" + debug "2.6.1" + encodeurl "~1.0.1" escape-html "~1.0.3" on-finished "~2.3.0" - statuses "~1.3.0" + parseurl "~1.3.1" + statuses "~1.3.1" unpipe "~1.0.0" -finalhandler@0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.1.tgz#2c400d8d4530935bc232549c5fa385ec07de6fcd" +finalhandler@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.1.tgz#bcd15d1689c0e5ed729b6f7f541a6df984117db8" dependencies: - debug "~2.2.0" + debug "2.6.3" + encodeurl "~1.0.1" escape-html "~1.0.3" on-finished "~2.3.0" + parseurl "~1.3.1" statuses "~1.3.1" unpipe "~1.0.0" @@ -2013,15 +2055,15 @@ flat-cache@^1.2.1: graceful-fs "^4.1.2" write "^0.2.1" -for-in@^0.1.5: - version "0.1.6" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.6.tgz#c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8" +for-in@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" for-own@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.4.tgz#0149b41a39088c7515f51ebe1c1386d45f935072" + version "0.1.5" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" dependencies: - for-in "^0.1.5" + for-in "^1.0.1" forever-agent@~0.6.1: version "0.6.1" @@ -2039,9 +2081,9 @@ forwarded@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363" -fresh@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f" +fresh@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e" fs-extra@~1.0.0: version "1.0.0" @@ -2056,13 +2098,13 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.0.0: - version "1.0.17" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.17.tgz#8537f3f12272678765b4fd6528c0f1f66f8f4558" + version "1.1.1" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff" dependencies: nan "^2.3.0" node-pre-gyp "^0.6.29" -fstream-ignore@~1.0.5: +fstream-ignore@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" dependencies: @@ -2070,9 +2112,9 @@ fstream-ignore@~1.0.5: inherits "2" minimatch "^3.0.0" -fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.10.tgz#604e8a92fe26ffd9f6fae30399d4984e1ab22822" +fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: + version "1.0.11" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" dependencies: graceful-fs "^4.1.2" inherits "~2.0.0" @@ -2084,8 +2126,8 @@ function-bind@^1.0.2: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771" gauge@~2.7.1: - version "2.7.2" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.2.tgz#15cecc31b02d05345a5d6b0e171cdb3ad2307774" + version "2.7.3" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.3.tgz#1c23855f962f17b3ad3d0dc7443f304542edfe09" dependencies: aproba "^1.0.3" console-control-strings "^1.0.0" @@ -2094,7 +2136,6 @@ gauge@~2.7.1: signal-exit "^3.0.0" string-width "^1.0.1" strip-ansi "^3.0.1" - supports-color "^0.2.0" wide-align "^1.1.0" generate-function@^2.0.0: @@ -2152,8 +2193,8 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1: path-is-absolute "^1.0.0" globals@^9.0.0, globals@^9.14.0: - version "9.14.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034" + version "9.17.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286" globby@^5.0.0: version "5.0.0" @@ -2194,6 +2235,10 @@ handlebars@^4.0.1, handlebars@^4.0.3: optionalDependencies: uglify-js "^2.6" +har-schema@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" + har-validator@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d" @@ -2203,6 +2248,13 @@ har-validator@~2.0.6: is-my-json-valid "^2.12.4" pinkie-promise "^2.0.0" +har-validator@~4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" + dependencies: + ajv "^4.9.1" + har-schema "^1.0.5" + has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" @@ -2233,7 +2285,7 @@ has@^1.0.1: dependencies: function-bind "^1.0.2" -hash.js@^1.0.0: +hash.js@^1.0.0, hash.js@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573" dependencies: @@ -2255,6 +2307,14 @@ hawk@~3.1.3: hoek "2.x.x" sntp "1.x.x" +hmac-drbg@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.0.tgz#3db471f45aae4a994a0688322171f51b8b91bee5" + dependencies: + hash.js "^1.0.3" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.1" + hoek@2.x.x: version "2.16.3" resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" @@ -2267,8 +2327,8 @@ home-or-tmp@^2.0.0: os-tmpdir "^1.0.1" hosted-git-info@^2.1.4: - version "2.2.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.2.0.tgz#7a0d097863d886c0fabbdcd37bf1758d8becf8a5" + version "2.4.1" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.1.tgz#4b0445e41c004a8bd1337773a4ff790ca40318c8" hpack.js@^2.1.6: version "2.1.6" @@ -2287,7 +2347,7 @@ http-deceiver@^1.2.4: version "1.2.7" resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" -http-errors@~1.5.0, http-errors@~1.5.1: +http-errors@~1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750" dependencies: @@ -2295,9 +2355,18 @@ http-errors@~1.5.0, http-errors@~1.5.1: setprototypeof "1.0.2" statuses ">= 1.3.1 < 2" -http-proxy-middleware@~0.17.1: - version "0.17.3" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz#940382147149b856084f5534752d5b5a8168cd1d" +http-errors@~1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.1.tgz#5f8b8ed98aca545656bf572997387f904a722257" + dependencies: + depd "1.1.0" + inherits "2.0.3" + setprototypeof "1.0.3" + statuses ">= 1.3.1 < 2" + +http-proxy-middleware@~0.17.4: + version "0.17.4" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833" dependencies: http-proxy "^1.16.2" is-glob "^3.1.0" @@ -2332,8 +2401,8 @@ ieee754@^1.1.4: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" ignore@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.2.tgz#1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410" + version "3.2.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.6.tgz#26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c" imurmurhash@^0.1.4: version "0.1.4" @@ -2394,9 +2463,9 @@ invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" -ipaddr.js@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.2.0.tgz#8aba49c9192799585bdd643e0ccb50e8ae777ba4" +ipaddr.js@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec" is-absolute@^0.2.3: version "0.2.6" @@ -2416,8 +2485,8 @@ is-binary-path@^1.0.0: binary-extensions "^1.0.0" is-buffer@^1.0.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b" + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc" is-builtin-module@^1.0.0: version "1.0.0" @@ -2476,8 +2545,8 @@ is-glob@^3.1.0: is-extglob "^2.1.0" is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4: - version "2.15.0" - resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz#936edda3ca3c211fd98f3b2d3e08da43f7b2915b" + version "2.16.0" + resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693" dependencies: generate-function "^2.0.0" generate-object-property "^1.1.0" @@ -2568,9 +2637,9 @@ isbinaryfile@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621" -isexe@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0" +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" isobject@^2.0.0: version "2.1.0" @@ -2583,14 +2652,14 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" istanbul-api@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.1.tgz#d36e2f1560d1a43ce304c4ff7338182de61c8f73" + version "1.1.6" + resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.6.tgz#23aa5b5b9b1b3bdbb786f039160e91acbe495433" dependencies: async "^2.1.4" fileset "^2.0.2" istanbul-lib-coverage "^1.0.0" - istanbul-lib-hook "^1.0.0" - istanbul-lib-instrument "^1.3.0" + istanbul-lib-hook "^1.0.4" + istanbul-lib-instrument "^1.6.2" istanbul-lib-report "^1.0.0-alpha.3" istanbul-lib-source-maps "^1.1.0" istanbul-reports "^1.0.0" @@ -2602,15 +2671,15 @@ istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.0-alpha, istanbul-lib-c version "1.0.1" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.1.tgz#f263efb519c051c5f1f3343034fc40e7b43ff212" -istanbul-lib-hook@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.0.tgz#fc5367ee27f59268e8f060b0c7aaf051d9c425c5" +istanbul-lib-hook@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.4.tgz#1919debbc195807880041971caf9c7e2be2144d6" dependencies: append-transform "^0.4.0" -istanbul-lib-instrument@^1.3.0, istanbul-lib-instrument@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.4.2.tgz#0e2fdfac93c1dabf2e31578637dc78a19089f43e" +istanbul-lib-instrument@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.6.2.tgz#dac644f358f51efd6113536d7070959a0111f73b" dependencies: babel-generator "^6.18.0" babel-template "^6.16.0" @@ -2680,14 +2749,14 @@ jodid25519@^1.0.0: jsbn "~0.1.0" jquery-ujs@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.1.tgz#6ee75b1ef4e9ac95e7124f8d71f7d351f5548e92" + version "1.2.2" + resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.2.tgz#6a8ef1020e6b6dda385b90a4bddc128c21c56397" dependencies: jquery ">=1.8.0" jquery@>=1.8.0, jquery@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.1.tgz#3c3e16854ad3d2ac44ac65021b17426d22ad803f" + version "2.2.4" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02" js-cookie@^2.1.3: version "2.1.3" @@ -2698,15 +2767,15 @@ js-tokens@^3.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7" js-yaml@3.x, js-yaml@^3.5.1, js-yaml@^3.7.0: - version "3.8.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.1.tgz#782ba50200be7b9e5a8537001b7804db3ad02628" + version "3.8.2" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721" dependencies: argparse "^1.0.7" esprima "^3.1.1" jsbn@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd" + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" jsesc@^1.3.0: version "1.3.0" @@ -2757,16 +2826,17 @@ jsonpointer@^4.0.0: resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" jsprim@^1.2.2: - version "1.3.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.3.1.tgz#2a7256f70412a29ee3670aaca625994c4dcff252" + version "1.4.0" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918" dependencies: + assert-plus "1.0.0" extsprintf "1.0.2" json-schema "0.2.3" verror "1.3.6" karma-coverage-istanbul-reporter@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-0.2.0.tgz#5766263338adeb0026f7e4ac7a89a5f056c5642c" + version "0.2.3" + resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-0.2.3.tgz#11f1be9cfa93755a77bac39ab16e315a7100b5c5" dependencies: istanbul-api "^1.1.1" @@ -2775,14 +2845,14 @@ karma-jasmine@^1.1.0: resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf" karma-mocha-reporter@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.2.tgz#876de9a287244e54a608591732a98e66611f6abe" + version "2.2.3" + resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.3.tgz#04fdda45a1d9697a73871c7472223c581701ab20" dependencies: chalk "1.1.3" karma-phantomjs-launcher@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.2.tgz#19e1041498fd75563ed86730a22c1fe579fa8fb1" + version "1.0.4" + resolved "https://registry.yarnpkg.com/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz#d23ca34801bda9863ad318e3bb4bd4062b13acd2" dependencies: lodash "^4.0.1" phantomjs-prebuilt "^2.1.7" @@ -2794,8 +2864,8 @@ karma-sourcemap-loader@^0.3.7: graceful-fs "^4.1.2" karma-webpack@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.2.tgz#bd38350af5645c9644090770939ebe7ce726f864" + version "2.0.3" + resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.3.tgz#39cebf5ca2580139b27f9ae69b78816b9c82fae6" dependencies: async "~0.9.0" loader-utils "^0.2.5" @@ -2804,15 +2874,15 @@ karma-webpack@^2.0.2: webpack-dev-middleware "^1.0.11" karma@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/karma/-/karma-1.4.1.tgz#41981a71d54237606b0a3ea8c58c90773f41650e" + version "1.5.0" + resolved "https://registry.yarnpkg.com/karma/-/karma-1.5.0.tgz#9c4c14f0400bef2c04c8e8e6bff59371025cc009" dependencies: bluebird "^3.3.0" - body-parser "^1.12.4" + body-parser "^1.16.1" chokidar "^1.4.1" colors "^1.1.0" combine-lists "^1.0.0" - connect "^3.3.5" + connect "^3.6.0" core-js "^2.2.0" di "^0.0.1" dom-serialize "^2.2.0" @@ -2828,12 +2898,12 @@ karma@^1.4.1: optimist "^0.6.1" qjobs "^1.1.4" range-parser "^1.2.0" - rimraf "^2.3.3" + rimraf "^2.6.0" safe-buffer "^5.0.1" - socket.io "1.7.2" + socket.io "1.7.3" source-map "^0.5.3" - tmp "0.0.28" - useragent "^2.1.10" + tmp "0.0.31" + useragent "^2.1.12" kew@~0.7.0: version "0.7.0" @@ -2882,9 +2952,9 @@ loader-runner@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" -loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.5: - version "0.2.16" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d" +loader-utils@^0.2.16, loader-utils@^0.2.5: + version "0.2.17" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" dependencies: big.js "^3.1.3" emojis-list "^2.0.0" @@ -3038,15 +3108,15 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -"mime-db@>= 1.24.0 < 2", mime-db@~1.26.0: - version "1.26.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.26.0.tgz#eaffcd0e4fc6935cf8134da246e2e6c35305adff" +"mime-db@>= 1.27.0 < 2", mime-db@~1.27.0: + version "1.27.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1" mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7: - version "2.1.14" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.14.tgz#f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee" + version "2.1.15" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed" dependencies: - mime-db "~1.26.0" + mime-db "~1.27.0" mime@1.3.4, mime@^1.3.4: version "1.3.4" @@ -3056,6 +3126,10 @@ minimalistic-assert@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" +minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" + "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" @@ -3076,19 +3150,19 @@ mkdirp@0.5.0: dependencies: minimist "0.0.8" -mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: +mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: minimist "0.0.8" moment@2.x: - version "2.17.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82" + version "2.18.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f" mousetrap@^1.4.6: - version "1.4.6" - resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.4.6.tgz#eaca72e22e56d5b769b7555873b688c3332e390a" + version "1.6.0" + resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.0.tgz#0168fcabb11d07669e87490324c981208121ac4d" ms@0.7.1: version "0.7.1" @@ -3171,18 +3245,18 @@ node-libs-browser@^2.0.0: vm-browserify "0.0.4" node-pre-gyp@^0.6.29, node-pre-gyp@^0.6.4: - version "0.6.33" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz#640ac55198f6a925972e0c16c4ac26a034d5ecc9" + version "0.6.34" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7" dependencies: - mkdirp "~0.5.1" - nopt "~3.0.6" - npmlog "^4.0.1" - rc "~1.1.6" - request "^2.79.0" - rimraf "~2.5.4" - semver "~5.3.0" - tar "~2.2.1" - tar-pack "~3.3.0" + mkdirp "^0.5.1" + nopt "^4.0.1" + npmlog "^4.0.2" + rc "^1.1.7" + request "^2.81.0" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^2.2.1" + tar-pack "^3.4.0" node-zopfli@^2.0.0: version "2.0.2" @@ -3193,15 +3267,22 @@ node-zopfli@^2.0.0: nan "^2.0.0" node-pre-gyp "^0.6.4" -nopt@3.x, nopt@~3.0.6: +nopt@3.x: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" dependencies: abbrev "1" +nopt@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + dependencies: + abbrev "1" + osenv "^0.1.4" + normalize-package-data@^2.3.2: - version "2.3.5" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df" + version "2.3.6" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff" dependencies: hosted-git-info "^2.1.4" is-builtin-module "^1.0.0" @@ -3212,7 +3293,7 @@ normalize-path@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a" -npmlog@^4.0.1: +npmlog@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f" dependencies: @@ -3262,18 +3343,12 @@ on-headers@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7" -once@1.x, once@^1.3.0, once@^1.4.0: +once@1.x, once@^1.3.0, once@^1.3.3, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" dependencies: wrappy "1" -once@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20" - dependencies: - wrappy "1" - onetime@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" @@ -3331,10 +3406,17 @@ os-locale@^1.4.0: dependencies: lcid "^1.0.0" -os-tmpdir@^1.0.1, os-tmpdir@~1.0.1: +os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" +osenv@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644" + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + p-limit@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc" @@ -3350,8 +3432,8 @@ pako@~0.2.0: resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" parse-asn1@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.0.0.tgz#35060f6d5015d37628c770f4e091a0b5a278bc23" + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712" dependencies: asn1.js "^4.0.0" browserify-aes "^1.0.0" @@ -3444,6 +3526,10 @@ pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" +performance-now@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" + phantomjs-prebuilt@^2.1.7: version "2.1.14" resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz#d53d311fcfb7d1d08ddb24014558f1188c516da0" @@ -3527,11 +3613,11 @@ progress@^1.1.8, progress@~1.1.8: resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" proxy-addr@~1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.3.tgz#dc97502f5722e888467b3fa2297a7b1ff47df074" + version "1.1.4" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3" dependencies: forwarded "~0.1.0" - ipaddr.js "1.2.0" + ipaddr.js "1.3.0" prr@~0.0.0: version "0.0.0" @@ -3559,17 +3645,13 @@ qjobs@^1.1.4: version "1.1.5" resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73" -qs@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b" - -qs@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.1.tgz#ce03c5ff0935bc1d9d69a9f14cbd18e568d67625" +qs@6.4.0, qs@~6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" qs@~6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442" + version "6.3.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c" querystring-es3@^0.2.0: version "0.2.1" @@ -3616,14 +3698,14 @@ raw-loader@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" -rc@~1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.6.tgz#43651b76b6ae53b5c802f1151fa3fc3b059969c9" +rc@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.7.tgz#c5ea564bb07aff9fd3a5b32e906c1d3a65940fea" dependencies: deep-extend "~0.4.0" ini "~1.3.0" minimist "^1.2.0" - strip-json-comments "~1.0.4" + strip-json-comments "~2.0.1" read-pkg-up@^1.0.1: version "1.0.1" @@ -3640,9 +3722,9 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.0, readable-stream@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e" +"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.0, readable-stream@^2.1.4, readable-stream@^2.2.2: + version "2.2.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816" dependencies: buffer-shims "^1.0.0" core-util-is "~1.0.0" @@ -3672,18 +3754,6 @@ readable-stream@~2.0.0: string_decoder "~0.10.x" util-deprecate "~1.0.1" -readable-stream@~2.1.4: - version "2.1.5" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" - dependencies: - buffer-shims "^1.0.0" - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - readdirp@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" @@ -3712,8 +3782,8 @@ regenerate@^1.2.1: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260" regenerator-runtime@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz#257f41961ce44558b18f7814af48c17559f9faeb" + version "0.10.3" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e" regenerator-transform@0.9.8: version "0.9.8" @@ -3772,7 +3842,34 @@ request-progress@~2.0.1: dependencies: throttleit "^1.0.0" -request@^2.79.0, request@~2.79.0: +request@^2.81.0: + version "2.81.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" + dependencies: + aws-sign2 "~0.6.0" + aws4 "^1.2.1" + caseless "~0.12.0" + combined-stream "~1.0.5" + extend "~3.0.0" + forever-agent "~0.6.1" + form-data "~2.1.1" + har-validator "~4.2.1" + hawk "~3.1.3" + http-signature "~1.1.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.7" + oauth-sign "~0.8.1" + performance-now "^0.2.0" + qs "~6.4.0" + safe-buffer "^5.0.1" + stringstream "~0.0.4" + tough-cookie "~2.3.0" + tunnel-agent "^0.6.0" + uuid "^3.0.0" + +request@~2.79.0: version "2.79.0" resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" dependencies: @@ -3825,8 +3922,10 @@ resolve@1.1.x: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" resolve@^1.1.6, resolve@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c" + version "1.3.2" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235" + dependencies: + path-parse "^1.0.5" restore-cursor@^1.0.1: version "1.0.1" @@ -3841,9 +3940,9 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@~2.5.1, rimraf@~2.5.4: - version "2.5.4" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" +rimraf@2, rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.6.0, rimraf@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" dependencies: glob "^7.0.5" @@ -3873,7 +3972,7 @@ select2@3.5.2-browserify: version "3.5.2-browserify" resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz#dc4dafda38d67a734e8a97a46f0d3529ae05391d" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@~5.3.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -3881,18 +3980,18 @@ semver@~4.3.3: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" -send@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.14.2.tgz#39b0438b3f510be5dc6f667a11f71689368cdeef" +send@0.15.1: + version "0.15.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.15.1.tgz#8a02354c26e6f5cca700065f5f0cdeba90ec7b5f" dependencies: - debug "~2.2.0" + debug "2.6.1" depd "~1.1.0" destroy "~1.0.4" encodeurl "~1.0.1" escape-html "~1.0.3" - etag "~1.7.0" - fresh "0.3.0" - http-errors "~1.5.1" + etag "~1.8.0" + fresh "0.5.0" + http-errors "~1.6.1" mime "1.3.4" ms "0.7.2" on-finished "~2.3.0" @@ -3911,14 +4010,14 @@ serve-index@^1.7.2: mime-types "~2.1.11" parseurl "~1.3.1" -serve-static@~1.11.2: - version "1.11.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.11.2.tgz#2cf9889bd4435a320cc36895c9aa57bd662e6ac7" +serve-static@1.12.1: + version "1.12.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.1.tgz#7443a965e3ced647aceb5639fa06bf4d1bbe0039" dependencies: encodeurl "~1.0.1" escape-html "~1.0.3" parseurl "~1.3.1" - send "0.14.2" + send "0.15.1" set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" @@ -3936,6 +4035,10 @@ setprototypeof@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08" +setprototypeof@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04" + sha.js@^2.3.6: version "2.4.8" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f" @@ -3943,8 +4046,8 @@ sha.js@^2.3.6: inherits "^2.0.1" shelljs@^0.7.5: - version "0.7.6" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad" + version "0.7.7" + resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1" dependencies: glob "^7.0.0" interpret "^1.0.0" @@ -3975,15 +4078,15 @@ socket.io-adapter@0.5.0: debug "2.3.3" socket.io-parser "2.3.1" -socket.io-client@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.2.tgz#39fdb0c3dd450e321b7e40cfd83612ec533dd644" +socket.io-client@1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.3.tgz#b30e86aa10d5ef3546601c09cde4765e381da377" dependencies: backo2 "1.0.2" component-bind "1.0.0" component-emitter "1.2.1" debug "2.3.3" - engine.io-client "1.8.2" + engine.io-client "1.8.3" has-binary "0.1.7" indexof "0.0.1" object-component "0.0.3" @@ -4000,24 +4103,24 @@ socket.io-parser@2.3.1: isarray "0.0.1" json3 "3.3.2" -socket.io@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.2.tgz#83bbbdf2e79263b378900da403e7843e05dc3b71" +socket.io@1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.3.tgz#b8af9caba00949e568e369f1327ea9be9ea2461b" dependencies: debug "2.3.3" - engine.io "1.8.2" + engine.io "1.8.3" has-binary "0.1.7" object-assign "4.1.0" socket.io-adapter "0.5.0" - socket.io-client "1.7.2" + socket.io-client "1.7.3" socket.io-parser "2.3.1" -sockjs-client@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.1.tgz#284843e9a9784d7c474b1571b3240fca9dda4bb0" +sockjs-client@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.2.tgz#f0212a8550e4c9468c8cceaeefd2e3493c033ad5" dependencies: debug "^2.2.0" - eventsource "~0.1.6" + eventsource "0.1.6" faye-websocket "~0.11.0" inherits "^2.0.1" json3 "^3.3.2" @@ -4030,15 +4133,19 @@ sockjs@0.3.18: faye-websocket "^0.10.0" uuid "^2.0.2" +source-list-map@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.1.tgz#1a33ac210ca144d1e561f906ebccab5669ff4cb4" + source-list-map@~0.1.7: version "0.1.8" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106" source-map-support@^0.4.2: - version "0.4.11" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.11.tgz#647f939978b38535909530885303daf23279f322" + version "0.4.14" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef" dependencies: - source-map "^0.5.3" + source-map "^0.5.6" source-map@^0.1.41: version "0.1.43" @@ -4052,7 +4159,7 @@ source-map@^0.4.4: dependencies: amdefine ">=0.0.4" -source-map@^0.5.0, source-map@^0.5.3, source-map@~0.5.1, source-map@~0.5.3: +source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3: version "0.5.6" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" @@ -4101,8 +4208,8 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" sshpk@^1.7.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.10.2.tgz#d5a804ce22695515638e798dbe23273de070a5fa" + version "1.11.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.11.0.tgz#2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77" dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -4119,7 +4226,7 @@ stats-webpack-plugin@^0.4.3: version "0.4.3" resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.4.3.tgz#b2f618202f28dd04ab47d7ecf54ab846137b7aea" -"statuses@>= 1.3.1 < 2", statuses@~1.3.0, statuses@~1.3.1: +"statuses@>= 1.3.1 < 2", statuses@~1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" @@ -4179,18 +4286,10 @@ strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" -strip-json-comments@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91" - strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -supports-color@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a" - supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -4220,20 +4319,20 @@ tapable@^0.2.5, tapable@~0.2.5: version "0.2.6" resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d" -tar-pack@~3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.3.0.tgz#30931816418f55afc4d21775afdd6720cee45dae" +tar-pack@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984" dependencies: - debug "~2.2.0" - fstream "~1.0.10" - fstream-ignore "~1.0.5" - once "~1.3.3" - readable-stream "~2.1.4" - rimraf "~2.5.1" - tar "~2.2.1" - uid-number "~0.0.6" + debug "^2.2.0" + fstream "^1.0.10" + fstream-ignore "^1.0.5" + once "^1.3.3" + readable-stream "^2.1.4" + rimraf "^2.5.1" + tar "^2.2.1" + uid-number "^0.0.6" -tar@~2.2.1: +tar@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" dependencies: @@ -4241,9 +4340,9 @@ tar@~2.2.1: fstream "^1.0.2" inherits "2" -test-exclude@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.0.tgz#0ddc0100b8ae7e88b34eb4fd98a907e961991900" +test-exclude@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.3.tgz#86a13ce3effcc60e6c90403cf31a27a60ac6c4e7" dependencies: arrify "^1.0.1" micromatch "^2.3.11" @@ -4279,9 +4378,9 @@ timers-browserify@^2.0.2: dependencies: setimmediate "^1.0.4" -tmp@0.0.28, tmp@0.0.x: - version "0.0.28" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120" +tmp@0.0.31, tmp@0.0.x: + version "0.0.31" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7" dependencies: os-tmpdir "~1.0.1" @@ -4319,6 +4418,12 @@ tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + dependencies: + safe-buffer "^5.0.1" + tunnel-agent@~0.4.1: version "0.4.3" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" @@ -4344,20 +4449,20 @@ typedarray@^0.0.6, typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -uglify-js@^2.6, uglify-js@^2.7.5: - version "2.7.5" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8" +uglify-js@^2.6, uglify-js@^2.8.5: + version "2.8.16" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.16.tgz#d286190b6eefc6fd65eb0ecac6551e0b0e8839a4" dependencies: - async "~0.2.6" source-map "~0.5.1" - uglify-to-browserify "~1.0.0" yargs "~3.10.0" + optionalDependencies: + uglify-to-browserify "~1.0.0" uglify-to-browserify@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" -uid-number@~0.0.6: +uid-number@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" @@ -4385,8 +4490,8 @@ url-parse@1.0.x: requires-port "1.0.x" url-parse@^1.1.1: - version "1.1.7" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.7.tgz#025cff999653a459ab34232147d89514cc87d74a" + version "1.1.8" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.8.tgz#7a65b3a8d57a1e86af6b4e2276e34774167c0156" dependencies: querystringify "0.0.x" requires-port "1.0.x" @@ -4404,7 +4509,7 @@ user-home@^2.0.0: dependencies: os-homedir "^1.0.0" -useragent@^2.1.10: +useragent@^2.1.12: version "2.1.12" resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.12.tgz#aa7da6cdc48bdc37ba86790871a7321d64edbaa2" dependencies: @@ -4441,8 +4546,8 @@ validate-npm-package-license@^3.0.1: spdx-expression-parse "~1.0.0" vary@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.0.tgz#e1e5affbbd16ae768dd2674394b9ad3022653140" + version "1.1.1" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37" verror@1.3.6: version "1.3.6" @@ -4469,12 +4574,12 @@ vue-resource@^0.9.3: resolved "https://registry.yarnpkg.com/vue-resource/-/vue-resource-0.9.3.tgz#ab46e1c44ea219142dcc28ae4043b3b04c80959d" vue@^2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.4.tgz#d0a3a050a80a12356d7950ae5a7b3131048209cc" + version "2.2.5" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.5.tgz#528eba68447d7eff99f86767b31176aa656c6963" -watchpack@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.2.1.tgz#01efa80c5c29e5c56ba55d6f5470a35b6402f0b2" +watchpack@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87" dependencies: async "^2.1.2" chokidar "^1.4.3" @@ -4487,8 +4592,8 @@ wbuf@^1.1.0, wbuf@^1.4.0: minimalistic-assert "^1.0.0" webpack-bundle-analyzer@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.3.0.tgz#0d05e96a43033f7cc57f6855b725782ba61e93a4" + version "2.3.1" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.3.1.tgz#d97f8aadbcce68fc865c5787741d8549359a25cd" dependencies: acorn "^4.0.11" chalk "^1.1.3" @@ -4502,8 +4607,8 @@ webpack-bundle-analyzer@^2.3.0: opener "^1.4.2" webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.9.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.0.tgz#7d5be2651e692fddfafd8aaed177c16ff51f0eb8" + version "1.10.1" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.1.tgz#c6b4cf428139cf1aefbe06a0c00fdb4f8da2f893" dependencies: memory-fs "~0.4.1" mime "^1.3.4" @@ -4511,8 +4616,8 @@ webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.9.0: range-parser "^1.0.3" webpack-dev-server@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.3.0.tgz#0437704bbd4d941a6e4c061eb3cc232ed7d06101" + version "2.4.2" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.2.tgz#cf595d6b40878452b6d2ad7229056b686f8a16be" dependencies: ansi-html "0.0.7" chokidar "^1.6.0" @@ -4520,28 +4625,35 @@ webpack-dev-server@^2.3.0: connect-history-api-fallback "^1.3.0" express "^4.13.3" html-entities "^1.2.0" - http-proxy-middleware "~0.17.1" + http-proxy-middleware "~0.17.4" opn "4.0.2" portfinder "^1.0.9" serve-index "^1.7.2" sockjs "0.3.18" - sockjs-client "1.1.1" + sockjs-client "1.1.2" spdy "^3.4.1" strip-ansi "^3.0.0" supports-color "^3.1.1" webpack-dev-middleware "^1.9.0" yargs "^6.0.0" -webpack-sources@^0.1.0, webpack-sources@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.4.tgz#ccc2c817e08e5fa393239412690bb481821393cd" +webpack-sources@^0.1.0: + version "0.1.5" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750" dependencies: source-list-map "~0.1.7" source-map "~0.5.3" +webpack-sources@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb" + dependencies: + source-list-map "^1.1.1" + source-map "~0.5.3" + webpack@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.1.tgz#7bb1d72ae2087dd1a4af526afec15eed17dda475" + version "2.3.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.2.tgz#7d521e6f0777a3a58985c69425263fdfe977b458" dependencies: acorn "^4.0.4" acorn-dynamic-import "^2.0.0" @@ -4559,9 +4671,9 @@ webpack@^2.2.1: source-map "^0.5.3" supports-color "^3.1.0" tapable "~0.2.5" - uglify-js "^2.7.5" - watchpack "^1.2.0" - webpack-sources "^0.1.4" + uglify-js "^2.8.5" + watchpack "^1.3.1" + webpack-sources "^0.2.3" yargs "^6.0.0" websocket-driver@>=0.5.1: @@ -4579,10 +4691,10 @@ which-module@^1.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" which@^1.1.1, which@~1.2.10: - version "1.2.12" - resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192" + version "1.2.14" + resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" dependencies: - isexe "^1.1.1" + isexe "^2.0.0" wide-align@^1.1.0: version "1.1.0" @@ -4623,9 +4735,9 @@ write@^0.2.1: dependencies: mkdirp "^0.5.1" -ws@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.1.tgz#082ddb6c641e85d4bb451f03d52f06eabdb1f018" +ws@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f" dependencies: options ">=0.0.5" ultron "1.0.x" From d197347d95ba69960978ea7103f2307ade64c05e Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Wed, 5 Apr 2017 14:17:12 +0100 Subject: [PATCH 04/70] Added droplab to yarn.lock and package.json --- package.json | 1 + yarn.lock | 167 ++++++++++++++++++++++++++------------------------- 2 files changed, 87 insertions(+), 81 deletions(-) diff --git a/package.json b/package.json index 7b6c4556e2c..6bc533eaf1a 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js" }, "dependencies": { + "@gitlab-org/droplab": "^0.1.0", "babel-core": "^6.22.1", "babel-loader": "^6.2.10", "babel-plugin-transform-define": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index b6f818dabca..ac51434dbb6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,12 @@ # yarn lockfile v1 +"@gitlab-org/droplab@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@gitlab-org/droplab/-/droplab-0.1.0.tgz#934889d0f19417198e277415fdd336616b2e2c87" + dependencies: + custom-event-polyfill "^0.3.0" + abbrev@1, abbrev@1.0.x: version "1.0.9" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" @@ -25,10 +31,6 @@ acorn-jsx@^3.0.0: dependencies: acorn "^3.0.4" -acorn@4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a" - acorn@^3.0.4: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" @@ -37,6 +39,10 @@ acorn@^4.0.11, acorn@^4.0.3, acorn@^4.0.4: version "4.0.11" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0" +acorn@^5.0.1: + version "5.0.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d" + after@0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" @@ -188,13 +194,13 @@ async@0.2.x: version "0.2.10" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" -async@1.x, async@^1.4.0, async@^1.4.2, async@^1.5.2: +async@1.x, async@^1.4.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" async@^2.1.2, async@^2.1.4: - version "2.2.0" - resolved "https://registry.yarnpkg.com/async/-/async-2.2.0.tgz#c324eba010a237e4fbd55a12dee86367d5c0ef32" + version "2.3.0" + resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9" dependencies: lodash "^4.14.0" @@ -947,8 +953,8 @@ browserify-rsa@^4.0.0: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.0.tgz#10773910c3c206d5420a46aad8694f820b85968f" + version "4.0.4" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298" dependencies: bn.js "^4.1.1" browserify-rsa "^4.0.0" @@ -1234,8 +1240,8 @@ content-type@~1.0.2: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed" convert-source-map@^1.1.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.4.0.tgz#e3dad195bf61bfe13a7a3c73e9876ec14a0268f3" + version "1.5.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5" cookie-signature@1.0.6: version "1.0.6" @@ -1461,11 +1467,6 @@ domain-browser@^1.1.1: version "1.1.7" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" -"droplab@file:../../../DropLab": - version "0.1.1" - dependencies: - custom-event-polyfill "^0.3.0" - dropzone@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-4.3.0.tgz#48b0b8f2ad092872e4b535b672a7c3f1a1d67c91" @@ -1731,8 +1732,8 @@ eslint-plugin-jasmine@^2.1.0: resolved "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.2.0.tgz#7135879383c39a667c721d302b9f20f0389543de" eslint@^3.10.1: - version "3.18.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.18.0.tgz#647e985c4ae71502d20ac62c109f66d5104c8a4b" + version "3.19.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc" dependencies: babel-code-frame "^6.16.0" chalk "^1.1.3" @@ -1771,10 +1772,10 @@ eslint@^3.10.1: user-home "^2.0.0" espree@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.0.tgz#41656fa5628e042878025ef467e78f125cb86e1d" + version "3.4.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2" dependencies: - acorn "4.0.4" + acorn "^5.0.1" acorn-jsx "^3.0.0" esprima@2.7.x, esprima@^2.7.1: @@ -2450,8 +2451,8 @@ inquirer@^0.12.0: through "^2.3.6" interpret@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c" + version "1.0.2" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.2.tgz#f4f623f0bb7122f15f5717c8e254b8161b5c5b2d" invariant@^2.2.0: version "2.2.2" @@ -2652,66 +2653,64 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" istanbul-api@^1.1.1: - version "1.1.6" - resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.6.tgz#23aa5b5b9b1b3bdbb786f039160e91acbe495433" + version "1.1.7" + resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.7.tgz#f6f37f09f8002b130f891c646b70ee4a8e7345ae" dependencies: async "^2.1.4" fileset "^2.0.2" - istanbul-lib-coverage "^1.0.0" - istanbul-lib-hook "^1.0.4" - istanbul-lib-instrument "^1.6.2" - istanbul-lib-report "^1.0.0-alpha.3" - istanbul-lib-source-maps "^1.1.0" - istanbul-reports "^1.0.0" + istanbul-lib-coverage "^1.0.2" + istanbul-lib-hook "^1.0.5" + istanbul-lib-instrument "^1.7.0" + istanbul-lib-report "^1.0.0" + istanbul-lib-source-maps "^1.1.1" + istanbul-reports "^1.0.2" js-yaml "^3.7.0" mkdirp "^0.5.1" once "^1.4.0" -istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.0-alpha, istanbul-lib-coverage@^1.0.0-alpha.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.1.tgz#f263efb519c051c5f1f3343034fc40e7b43ff212" +istanbul-lib-coverage@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz#87a0c015b6910651cb3b184814dfb339337e25e1" -istanbul-lib-hook@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.4.tgz#1919debbc195807880041971caf9c7e2be2144d6" +istanbul-lib-hook@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.5.tgz#6ca3d16d60c5f4082da39f7c5cd38ea8a772b88e" dependencies: append-transform "^0.4.0" -istanbul-lib-instrument@^1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.6.2.tgz#dac644f358f51efd6113536d7070959a0111f73b" +istanbul-lib-instrument@^1.6.2, istanbul-lib-instrument@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.0.tgz#b8e0dc25709bb44e17336ab47b7bb5c97c23f659" dependencies: babel-generator "^6.18.0" babel-template "^6.16.0" babel-traverse "^6.18.0" babel-types "^6.18.0" babylon "^6.13.0" - istanbul-lib-coverage "^1.0.0" + istanbul-lib-coverage "^1.0.2" semver "^5.3.0" -istanbul-lib-report@^1.0.0-alpha.3: - version "1.0.0-alpha.3" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0-alpha.3.tgz#32d5f6ec7f33ca3a602209e278b2e6ff143498af" +istanbul-lib-report@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0.tgz#d83dac7f26566b521585569367fe84ccfc7aaecb" dependencies: - async "^1.4.2" - istanbul-lib-coverage "^1.0.0-alpha" + istanbul-lib-coverage "^1.0.2" mkdirp "^0.5.1" path-parse "^1.0.5" - rimraf "^2.4.3" supports-color "^3.1.2" -istanbul-lib-source-maps@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.0.tgz#9d429218f35b823560ea300a96ff0c3bbdab785f" +istanbul-lib-source-maps@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.1.tgz#f8c8c2e8f2160d1d91526d97e5bd63b2079af71c" dependencies: - istanbul-lib-coverage "^1.0.0-alpha.0" + istanbul-lib-coverage "^1.0.2" mkdirp "^0.5.1" rimraf "^2.4.4" source-map "^0.5.3" -istanbul-reports@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.1.tgz#9a17176bc4a6cbebdae52b2f15961d52fa623fbc" +istanbul-reports@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.2.tgz#4e8366abe6fa746cc1cd6633f108de12cc6ac6fa" dependencies: handlebars "^4.0.3" @@ -2759,16 +2758,16 @@ jquery@>=1.8.0, jquery@^2.2.1: resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02" js-cookie@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.1.3.tgz#48071625217ac9ecfab8c343a13d42ec09ff0526" + version "2.1.4" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.1.4.tgz#da4ec503866f149d164cf25f579ef31015025d8d" js-tokens@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7" js-yaml@3.x, js-yaml@^3.5.1, js-yaml@^3.7.0: - version "3.8.2" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721" + version "3.8.3" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766" dependencies: argparse "^1.0.7" esprima "^3.1.1" @@ -3112,7 +3111,7 @@ miller-rabin@^4.0.0: version "1.27.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1" -mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7: +mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7: version "2.1.15" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed" dependencies: @@ -3161,8 +3160,8 @@ moment@2.x: resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f" mousetrap@^1.4.6: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.0.tgz#0168fcabb11d07669e87490324c981208121ac4d" + version "1.6.1" + resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.1.tgz#2a085f5c751294c75e7e81f6ec2545b29cbf42d9" ms@0.7.1: version "0.7.1" @@ -3290,8 +3289,10 @@ normalize-package-data@^2.3.2: validate-npm-package-license "^3.0.1" normalize-path@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a" + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + dependencies: + remove-trailing-separator "^1.0.1" npmlog@^4.0.2: version "4.0.2" @@ -3699,8 +3700,8 @@ raw-loader@^0.5.1: resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" rc@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.7.tgz#c5ea564bb07aff9fd3a5b32e906c1d3a65940fea" + version "1.2.1" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95" dependencies: deep-extend "~0.4.0" ini "~1.3.0" @@ -3722,7 +3723,7 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.0, readable-stream@^2.1.4, readable-stream@^2.2.2: +"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6: version "2.2.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816" dependencies: @@ -3818,6 +3819,10 @@ regjsparser@^0.1.4: dependencies: jsesc "~0.5.0" +remove-trailing-separator@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4" + repeat-element@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" @@ -3940,7 +3945,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.6.0, rimraf@^2.6.1: +rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.6.0, rimraf@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" dependencies: @@ -4238,12 +4243,12 @@ stream-browserify@^2.0.1: readable-stream "^2.0.2" stream-http@^2.3.1: - version "2.6.3" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.6.3.tgz#4c3ddbf9635968ea2cfd4e48d43de5def2625ac3" + version "2.7.0" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6" dependencies: builtin-status-codes "^3.0.0" inherits "^2.0.1" - readable-stream "^2.1.0" + readable-stream "^2.2.6" to-arraybuffer "^1.0.0" xtend "^4.0.0" @@ -4439,19 +4444,19 @@ type-check@~0.3.2: prelude-ls "~1.1.2" type-is@~1.6.14: - version "1.6.14" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.14.tgz#e219639c17ded1ca0789092dd54a03826b817cb2" + version "1.6.15" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410" dependencies: media-typer "0.3.0" - mime-types "~2.1.13" + mime-types "~2.1.15" typedarray@^0.0.6, typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" uglify-js@^2.6, uglify-js@^2.8.5: - version "2.8.16" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.16.tgz#d286190b6eefc6fd65eb0ecac6551e0b0e8839a4" + version "2.8.21" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.21.tgz#1733f669ae6f82fc90c7b25ec0f5c783ee375314" dependencies: source-map "~0.5.1" yargs "~3.10.0" @@ -4510,8 +4515,8 @@ user-home@^2.0.0: os-homedir "^1.0.0" useragent@^2.1.12: - version "2.1.12" - resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.12.tgz#aa7da6cdc48bdc37ba86790871a7321d64edbaa2" + version "2.1.13" + resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.13.tgz#bba43e8aa24d5ceb83c2937473e102e21df74c10" dependencies: lru-cache "2.2.x" tmp "0.0.x" @@ -4574,8 +4579,8 @@ vue-resource@^0.9.3: resolved "https://registry.yarnpkg.com/vue-resource/-/vue-resource-0.9.3.tgz#ab46e1c44ea219142dcc28ae4043b3b04c80959d" vue@^2.2.4: - version "2.2.5" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.5.tgz#528eba68447d7eff99f86767b31176aa656c6963" + version "2.2.6" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.6.tgz#451714b394dd6d4eae7b773c40c2034a59621aed" watchpack@^1.3.1: version "1.3.1" @@ -4652,8 +4657,8 @@ webpack-sources@^0.2.3: source-map "~0.5.3" webpack@^2.2.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.2.tgz#7d521e6f0777a3a58985c69425263fdfe977b458" + version "2.3.3" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.3.tgz#eecc083c18fb7bf958ea4f40b57a6640c5a0cc78" dependencies: acorn "^4.0.4" acorn-dynamic-import "^2.0.0" From 06a20b8717887996ea93f1391aff2f3dd796b280 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sun, 19 Feb 2017 18:44:17 +0000 Subject: [PATCH 05/70] Updated droplab version to webpack version --- .eslintignore | 1 + app/assets/javascripts/droplab/droplab.js | 1508 ++++++++++------- .../javascripts/droplab/droplab_ajax.js | 103 -- .../droplab/droplab_ajax_filter.js | 164 -- .../javascripts/droplab/plugins/ajax.js | 159 ++ .../droplab/plugins/ajax_filter.js | 216 +++ .../javascripts/droplab/plugins/filter.js | 172 ++ .../droplab/plugins/input_setter.js | 129 ++ .../filtered_search/dropdown_hint.js | 1 - .../filtered_search/dropdown_non_user.js | 1 + .../filtered_search_dropdown.js | 2 +- .../filtered_search_manager.js | 2 +- app/assets/javascripts/main.js | 6 +- app/assets/stylesheets/framework/filters.scss | 2 +- .../shared/issuable/_search_bar.html.haml | 2 +- .../filtered_search/dropdown_hint_spec.rb | 14 +- .../filtered_search/dropdown_label_spec.rb | 31 +- .../issues/filtered_search/search_bar_spec.rb | 18 +- 18 files changed, 1590 insertions(+), 941 deletions(-) delete mode 100644 app/assets/javascripts/droplab/droplab_ajax.js delete mode 100644 app/assets/javascripts/droplab/droplab_ajax_filter.js create mode 100644 app/assets/javascripts/droplab/plugins/ajax.js create mode 100644 app/assets/javascripts/droplab/plugins/ajax_filter.js create mode 100644 app/assets/javascripts/droplab/plugins/filter.js create mode 100644 app/assets/javascripts/droplab/plugins/input_setter.js diff --git a/.eslintignore b/.eslintignore index c742b08c005..fe0766d8a44 100644 --- a/.eslintignore +++ b/.eslintignore @@ -5,5 +5,6 @@ /public/ /tmp/ /vendor/ +/app/assets/javascripts/droplab karma.config.js webpack.config.js diff --git a/app/assets/javascripts/droplab/droplab.js b/app/assets/javascripts/droplab/droplab.js index 8b14191395b..b5d6a43b83f 100644 --- a/app/assets/javascripts/droplab/droplab.js +++ b/app/assets/javascripts/droplab/droplab.js @@ -1,741 +1,983 @@ -/* eslint-disable */ -// Determine where to place this -if (typeof Object.assign != 'function') { - Object.assign = function (target, varArgs) { // .length of function is 2 - 'use strict'; - if (target == null) { // TypeError if undefined or null - throw new TypeError('Cannot convert undefined or null to object'); - } +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) +/******/ return installedModules[moduleId].exports; +/******/ +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // identity function for calling harmony imports with the correct context +/******/ __webpack_require__.i = function(value) { return value; }; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { +/******/ configurable: false, +/******/ enumerable: true, +/******/ get: getter +/******/ }); +/******/ } +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = 9); +/******/ }) +/************************************************************************/ +/******/ ([ +/* 0 */ +/***/ (function(module, exports, __webpack_require__) { - var to = Object(target); +"use strict"; - for (var index = 1; index < arguments.length; index++) { - var nextSource = arguments[index]; - if (nextSource != null) { // Skip over if undefined or null - for (var nextKey in nextSource) { - // Avoid bugs when hasOwnProperty is shadowed - if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) { - to[nextKey] = nextSource[nextKey]; - } - } - } - } - return to; - }; -} - -(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.droplab = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o 0) { - templateString = items[items.length - 1].outerHTML; +// Polyfill for creating CustomEvents on IE9/10/11 + +// code pulled from: +// https://github.com/d4tocchini/customevent-polyfill +// https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent#Polyfill + +try { + var ce = new window.CustomEvent('test'); + ce.preventDefault(); + if (ce.defaultPrevented !== true) { + // IE has problems with .preventDefault() on custom events + // http://stackoverflow.com/questions/23349191 + throw new Error('Could not prevent default'); } - this.templateString = templateString; - return this.templateString; - }, - - clickEvent: function(e) { - // climb up the tree to find the LI - var selected = utils.closest(e.target, 'LI'); - - if(selected) { - e.preventDefault(); - this.hide(); - var listEvent = new CustomEvent('click.dl', { - detail: { - list: this, - selected: selected, - data: e.target.dataset, - }, - }); - this.list.dispatchEvent(listEvent); - } - }, - - addEvents: function() { - this.clickWrapper = this.clickEvent.bind(this); - // event delegation. - this.list.addEventListener('click', this.clickWrapper); - }, - - toggle: function() { - if(this.hidden) { - this.show(); - } else { - this.hide(); - } - }, - - setData: function(data) { - this.data = data; - this.render(data); - }, - - addData: function(data) { - this.data = (this.data || []).concat(data); - this.render(this.data); - }, - - // call render manually on data; - render: function(data){ - // debugger - // empty the list first - var templateString = this.templateString; - var newChildren = []; - var toAppend; - - newChildren = (data ||[]).map(function(dat){ - var html = utils.t(templateString, dat); - var template = document.createElement('div'); - template.innerHTML = html; - - // Help set the image src template - var imageTags = template.querySelectorAll('img[data-src]'); - // debugger - for(var i = 0; i < imageTags.length; i++) { - var imageTag = imageTags[i]; - imageTag.src = imageTag.getAttribute('data-src'); - imageTag.removeAttribute('data-src'); - } - - if(dat.hasOwnProperty('droplab_hidden') && dat.droplab_hidden){ - template.firstChild.style.display = 'none' - }else{ - template.firstChild.style.display = 'block'; - } - return template.firstChild.outerHTML; - }); - toAppend = this.list.querySelector('ul[data-dynamic]'); - if(toAppend) { - toAppend.innerHTML = newChildren.join(''); - } else { - this.list.innerHTML = newChildren.join(''); - } - }, - - show: function() { - if (this.hidden) { - // debugger - this.list.style.display = 'block'; - this.currentIndex = 0; - this.hidden = false; - } - }, - - hide: function() { - if (!this.hidden) { - // debugger - this.list.style.display = 'none'; - this.currentIndex = 0; - this.hidden = true; - } - }, - - destroy: function() { - this.hide(); - this.list.removeEventListener('click', this.clickWrapper); - } -}); - -module.exports = DropDown; - -},{"./custom_event_polyfill":2,"./utils":10}],4:[function(require,module,exports){ -require('./window')(function(w){ - module.exports = function(deps) { - deps = deps || {}; - var window = deps.window || w; - var document = deps.document || window.document; - var CustomEvent = deps.CustomEvent || require('./custom_event_polyfill'); - var HookButton = deps.HookButton || require('./hook_button'); - var HookInput = deps.HookInput || require('./hook_input'); - var utils = deps.utils || require('./utils'); - var DATA_TRIGGER = require('./constants').DATA_TRIGGER; - - var DropLab = function(hook){ - if (!(this instanceof DropLab)) return new DropLab(hook); - this.ready = false; - this.hooks = []; - this.queuedData = []; - this.config = {}; - this.loadWrapper; - if(typeof hook !== 'undefined'){ - this.addHook(hook); - } +} catch(e) { + var CustomEvent = function(event, params) { + var evt, origPrevent; + params = params || { + bubbles: false, + cancelable: false, + detail: undefined }; - - Object.assign(DropLab.prototype, { - load: function() { - this.loadWrapper(); - }, - - loadWrapper: function(){ - var dropdownTriggers = [].slice.apply(document.querySelectorAll('['+DATA_TRIGGER+']')); - this.addHooks(dropdownTriggers).init(); - }, - - addData: function () { - var args = [].slice.apply(arguments); - this.applyArgs(args, '_addData'); - }, - - setData: function() { - var args = [].slice.apply(arguments); - this.applyArgs(args, '_setData'); - }, - - destroy: function() { - for(var i = 0; i < this.hooks.length; i++) { - this.hooks[i].destroy(); - } - this.hooks = []; - this.removeEvents(); - }, - - applyArgs: function(args, methodName) { - if(this.ready) { - this[methodName].apply(this, args); - } else { - this.queuedData = this.queuedData || []; - this.queuedData.push(args); - } - }, - - _addData: function(trigger, data) { - this._processData(trigger, data, 'addData'); - }, - - _setData: function(trigger, data) { - this._processData(trigger, data, 'setData'); - }, - - _processData: function(trigger, data, methodName) { - for(var i = 0; i < this.hooks.length; i++) { - var hook = this.hooks[i]; - if(hook.trigger.dataset.hasOwnProperty('id')) { - if(hook.trigger.dataset.id === trigger) { - hook.list[methodName](data); - } + evt = document.createEvent("CustomEvent"); + evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail); + origPrevent = evt.preventDefault; + evt.preventDefault = function () { + origPrevent.call(this); + try { + Object.defineProperty(this, 'defaultPrevented', { + get: function () { + return true; } - } - }, - - addEvents: function() { - var self = this; - this.windowClickedWrapper = function(e){ - var thisTag = e.target; - if(thisTag.tagName !== 'UL'){ - // climb up the tree to find the UL - thisTag = utils.closest(thisTag, 'UL'); - } - if(utils.isDropDownParts(thisTag)){ return } - if(utils.isDropDownParts(e.target)){ return } - for(var i = 0; i < self.hooks.length; i++) { - self.hooks[i].list.hide(); - } - }.bind(this); - document.addEventListener('click', this.windowClickedWrapper); - }, - - removeEvents: function(){ - w.removeEventListener('click', this.windowClickedWrapper); - w.removeEventListener('load', this.loadWrapper); - }, - - changeHookList: function(trigger, list, plugins, config) { - trigger = document.querySelector('[data-id="'+trigger+'"]'); - // list = document.querySelector(list); - this.hooks.every(function(hook, i) { - if(hook.trigger === trigger) { - hook.destroy(); - this.hooks.splice(i, 1); - this.addHook(trigger, list, plugins, config); - return false; - } - return true - }.bind(this)); - }, - - addHook: function(hook, list, plugins, config) { - if(!(hook instanceof HTMLElement) && typeof hook === 'string'){ - hook = document.querySelector(hook); - } - if(!list){ - list = document.querySelector(hook.dataset[utils.toDataCamelCase(DATA_TRIGGER)]); - } - - if(hook) { - if(hook.tagName === 'A' || hook.tagName === 'BUTTON') { - this.hooks.push(new HookButton(hook, list, plugins, config)); - } else if(hook.tagName === 'INPUT') { - this.hooks.push(new HookInput(hook, list, plugins, config)); - } - } - return this; - }, - - addHooks: function(hooks, plugins, config) { - for(var i = 0; i < hooks.length; i++) { - var hook = hooks[i]; - this.addHook(hook, null, plugins, config); - } - return this; - }, - - setConfig: function(obj){ - this.config = obj; - }, - - init: function () { - this.addEvents(); - var readyEvent = new CustomEvent('ready.dl', { - detail: { - dropdown: this, - }, }); - window.dispatchEvent(readyEvent); - this.ready = true; - for(var i = 0; i < this.queuedData.length; i++) { - this.addData.apply(this, this.queuedData[i]); - } - this.queuedData = []; - return this; - }, - }); - - return DropLab; + } catch(e) { + this.defaultPrevented = true; + } + }; + return evt; }; + + CustomEvent.prototype = window.Event.prototype; + window.CustomEvent = CustomEvent; // expose definition to window +} + + +/***/ }), +/* 2 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true }); -},{"./constants":1,"./custom_event_polyfill":2,"./hook_button":6,"./hook_input":7,"./utils":10,"./window":11}],5:[function(require,module,exports){ -var DropDown = require('./dropdown'); +var _dropdown = __webpack_require__(6); -var Hook = function(trigger, list, plugins, config){ +var _dropdown2 = _interopRequireDefault(_dropdown); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var Hook = function Hook(trigger, list, plugins, config) { this.trigger = trigger; - this.list = new DropDown(list); + this.list = new _dropdown2.default(list); this.type = 'Hook'; this.event = 'click'; this.plugins = plugins || []; this.config = config || {}; - this.id = trigger.dataset.id; + this.id = trigger.id; }; Object.assign(Hook.prototype, { - addEvents: function(){}, + addEvents: function addEvents() {}, - constructor: Hook, + constructor: Hook }); -module.exports = Hook; +exports.default = Hook; -},{"./dropdown":3}],6:[function(require,module,exports){ -var CustomEvent = require('./custom_event_polyfill'); -var Hook = require('./hook'); +/***/ }), +/* 3 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _constants = __webpack_require__(0); + +var _constants2 = _interopRequireDefault(_constants); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var DATA_TRIGGER = _constants2.default.DATA_TRIGGER, + DATA_DROPDOWN = _constants2.default.DATA_DROPDOWN; + + +var utils = { + toCamelCase: function toCamelCase(attr) { + return this.camelize(attr.split('-').slice(1).join(' ')); + }, + t: function t(s, d) { + for (var p in d) { + if (Object.prototype.hasOwnProperty.call(d, p)) { + s = s.replace(new RegExp('{{' + p + '}}', 'g'), d[p]); + } + } + return s; + }, + camelize: function camelize(str) { + return str.replace(/(?:^\w|[A-Z]|\b\w)/g, function (letter, index) { + return index === 0 ? letter.toLowerCase() : letter.toUpperCase(); + }).replace(/\s+/g, ''); + }, + closest: function closest(thisTag, stopTag) { + while (thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML') { + thisTag = thisTag.parentNode; + } + return thisTag; + }, + isDropDownParts: function isDropDownParts(target) { + if (!target || target.tagName === 'HTML') return false; + return target.hasAttribute(DATA_TRIGGER) || target.hasAttribute(DATA_DROPDOWN); + } +}; + +exports.default = utils; + +/***/ }), +/* 4 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +exports.default = function () { + var DropLab = function DropLab(hook, list) { + if (!this instanceof DropLab) return new DropLab(hook); + + this.ready = false; + this.hooks = []; + this.queuedData = []; + this.config = {}; + + this.eventWrapper = {}; + + if (!hook) return this.loadStatic(); + this.addHook(hook, list); + this.init(); + }; + + Object.assign(DropLab.prototype, { + loadStatic: function loadStatic() { + var dropdownTriggers = [].slice.apply(document.querySelectorAll('[' + DATA_TRIGGER + ']')); + this.addHooks(dropdownTriggers).init(); + }, + + addData: function addData() { + var args = [].slice.apply(arguments); + this.applyArgs(args, '_addData'); + }, + + setData: function setData() { + var args = [].slice.apply(arguments); + this.applyArgs(args, '_setData'); + }, + + destroy: function destroy() { + this.hooks.forEach(function (hook) { + return hook.destroy(); + }); + this.hooks = []; + this.removeEvents(); + }, + + applyArgs: function applyArgs(args, methodName) { + if (this.ready) return this[methodName].apply(this, args); + + this.queuedData = this.queuedData || []; + this.queuedData.push(args); + }, + + _addData: function _addData(trigger, data) { + this._processData(trigger, data, 'addData'); + }, + + _setData: function _setData(trigger, data) { + this._processData(trigger, data, 'setData'); + }, + + _processData: function _processData(trigger, data, methodName) { + this.hooks.forEach(function (hook) { + if (Array.isArray(trigger)) hook.list[methodName](trigger); + + if (hook.trigger.id === trigger) hook.list[methodName](data); + }); + }, + + addEvents: function addEvents() { + this.eventWrapper.documentClicked = this.documentClicked.bind(this); + document.addEventListener('click', this.eventWrapper.documentClicked); + }, + + documentClicked: function documentClicked(e) { + var thisTag = e.target; + + if (thisTag.tagName !== 'UL') thisTag = _utils2.default.closest(thisTag, 'UL'); + if (_utils2.default.isDropDownParts(thisTag, this.hooks) || _utils2.default.isDropDownParts(e.target, this.hooks)) return; + + this.hooks.forEach(function (hook) { + return hook.list.hide(); + }); + }, + + removeEvents: function removeEvents() { + document.removeEventListener('click', this.eventWrapper.documentClicked); + }, + + changeHookList: function changeHookList(trigger, list, plugins, config) { + var _this = this; + + var availableTrigger = typeof trigger === 'string' ? document.getElementById(trigger) : trigger; + + this.hooks.forEach(function (hook, i) { + hook.list.list.dataset.dropdownActive = false; + + if (hook.trigger !== availableTrigger) return; + + hook.destroy(); + _this.hooks.splice(i, 1); + _this.addHook(availableTrigger, list, plugins, config); + }); + }, + + addHook: function addHook(hook, list, plugins, config) { + var availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook; + var availableList = void 0; + + if (typeof list === 'string') { + availableList = document.querySelector(list); + } else if (list instanceof Element) { + availableList = list; + } else { + availableList = document.querySelector(hook.dataset[_utils2.default.toCamelCase(DATA_TRIGGER)]); + } + + availableList.dataset.dropdownActive = true; + + var HookObject = availableHook.tagName === 'INPUT' ? _hook_input2.default : _hook_button2.default; + this.hooks.push(new HookObject(availableHook, availableList, plugins, config)); + + return this; + }, + + addHooks: function addHooks(hooks, plugins, config) { + var _this2 = this; + + hooks.forEach(function (hook) { + return _this2.addHook(hook, null, plugins, config); + }); + return this; + }, + + setConfig: function setConfig(obj) { + this.config = obj; + }, + + fireReady: function fireReady() { + var readyEvent = new CustomEvent('ready.dl', { + detail: { + dropdown: this + } + }); + document.dispatchEvent(readyEvent); + + this.ready = true; + }, + + init: function init() { + var _this3 = this; + + this.addEvents(); + + this.fireReady(); + + this.queuedData.forEach(function (data) { + return _this3.addData(data); + }); + this.queuedData = []; + + return this; + } + }); + + return DropLab; +}; + +__webpack_require__(1); + +var _hook_button = __webpack_require__(7); + +var _hook_button2 = _interopRequireDefault(_hook_button); + +var _hook_input = __webpack_require__(8); + +var _hook_input2 = _interopRequireDefault(_hook_input); + +var _utils = __webpack_require__(3); + +var _utils2 = _interopRequireDefault(_utils); + +var _constants = __webpack_require__(0); + +var _constants2 = _interopRequireDefault(_constants); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var DATA_TRIGGER = _constants2.default.DATA_TRIGGER; + +; + +/***/ }), +/* 5 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +exports.default = function () { + var currentKey; + var currentFocus; + var isUpArrow = false; + var isDownArrow = false; + var removeHighlight = function removeHighlight(list) { + var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0); + var listItems = []; + for (var i = 0; i < itemElements.length; i++) { + var listItem = itemElements[i]; + listItem.classList.remove(_constants2.default.ACTIVE_CLASS); + + if (listItem.style.display !== 'none') { + listItems.push(listItem); + } + } + return listItems; + }; + + var setMenuForArrows = function setMenuForArrows(list) { + var listItems = removeHighlight(list); + if (list.currentIndex > 0) { + if (!listItems[list.currentIndex - 1]) { + list.currentIndex = list.currentIndex - 1; + } + + if (listItems[list.currentIndex - 1]) { + var el = listItems[list.currentIndex - 1]; + var filterDropdownEl = el.closest('.filter-dropdown'); + el.classList.add(_constants2.default.ACTIVE_CLASS); + + if (filterDropdownEl) { + var filterDropdownBottom = filterDropdownEl.offsetHeight; + var elOffsetTop = el.offsetTop - 30; + + if (elOffsetTop > filterDropdownBottom) { + filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom; + } + } + } + } + }; + + var mousedown = function mousedown(e) { + var list = e.detail.hook.list; + removeHighlight(list); + list.show(); + list.currentIndex = 0; + isUpArrow = false; + isDownArrow = false; + }; + var selectItem = function selectItem(list) { + var listItems = removeHighlight(list); + var currentItem = listItems[list.currentIndex - 1]; + var listEvent = new CustomEvent('click.dl', { + detail: { + list: list, + selected: currentItem, + data: currentItem.dataset + } + }); + list.list.dispatchEvent(listEvent); + list.hide(); + }; + + var keydown = function keydown(e) { + var typedOn = e.target; + var list = e.detail.hook.list; + var currentIndex = list.currentIndex; + isUpArrow = false; + isDownArrow = false; + + if (e.detail.which) { + currentKey = e.detail.which; + if (currentKey === 13) { + selectItem(e.detail.hook.list); + return; + } + if (currentKey === 38) { + isUpArrow = true; + } + if (currentKey === 40) { + isDownArrow = true; + } + } else if (e.detail.key) { + currentKey = e.detail.key; + if (currentKey === 'Enter') { + selectItem(e.detail.hook.list); + return; + } + if (currentKey === 'ArrowUp') { + isUpArrow = true; + } + if (currentKey === 'ArrowDown') { + isDownArrow = true; + } + } + if (isUpArrow) { + currentIndex--; + } + if (isDownArrow) { + currentIndex++; + } + if (currentIndex < 0) { + currentIndex = 0; + } + list.currentIndex = currentIndex; + setMenuForArrows(e.detail.hook.list); + }; + + document.addEventListener('mousedown.dl', mousedown); + document.addEventListener('keydown.dl', keydown); +}; + +var _constants = __webpack_require__(0); + +var _constants2 = _interopRequireDefault(_constants); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +/***/ }), +/* 6 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _Object$assign; + +__webpack_require__(1); + +var _utils = __webpack_require__(3); + +var _utils2 = _interopRequireDefault(_utils); + +var _constants = __webpack_require__(0); + +var _constants2 = _interopRequireDefault(_constants); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } + +var DropDown = function DropDown(list) { + this.currentIndex = 0; + this.hidden = true; + this.list = typeof list === 'string' ? document.querySelector(list) : list; + this.items = []; + + this.eventWrapper = {}; + + this.getItems(); + this.initTemplateString(); + this.addEvents(); + + this.initialState = list.innerHTML; +}; + +Object.assign(DropDown.prototype, (_Object$assign = { + getItems: function getItems() { + this.items = [].slice.call(this.list.querySelectorAll('li')); + return this.items; + }, + + initTemplateString: function initTemplateString() { + var items = this.items || this.getItems(); + + var templateString = ''; + if (items.length > 0) templateString = items[items.length - 1].outerHTML; + this.templateString = templateString; + + return this.templateString; + }, + + clickEvent: function clickEvent(e) { + var selected = _utils2.default.closest(e.target, 'LI'); + if (!selected) return; + + this.addSelectedClass(selected); + + e.preventDefault(); + this.hide(); + + var listEvent = new CustomEvent('click.dl', { + detail: { + list: this, + selected: selected, + data: e.target.dataset + } + }); + this.list.dispatchEvent(listEvent); + }, + + addSelectedClass: function addSelectedClass(selected) { + this.removeSelectedClasses(); + selected.classList.add(_constants2.default.SELECTED_CLASS); + }, + + removeSelectedClasses: function removeSelectedClasses() { + var items = this.items || this.getItems(); + + items.forEach(function (item) { + item.classList.remove(_constants2.default.SELECTED_CLASS); + }); + }, + + addEvents: function addEvents() { + this.eventWrapper.clickEvent = this.clickEvent.bind(this); + this.list.addEventListener('click', this.eventWrapper.clickEvent); + }, + + toggle: function toggle() { + this.hidden ? this.show() : this.hide(); + }, + + setData: function setData(data) { + this.data = data; + this.render(data); + }, + + addData: function addData(data) { + this.data = (this.data || []).concat(data); + this.render(this.data); + }, + + render: function render(data) { + var children = data ? data.map(this.renderChildren.bind(this)) : []; + var renderableList = this.list.querySelector('ul[data-dynamic]') || this.list; + + renderableList.innerHTML = children.join(''); + }, + + renderChildren: function renderChildren(data) { + var html = _utils2.default.t(this.templateString, data); + var template = document.createElement('div'); + + template.innerHTML = html; + this.setImagesSrc(template); + template.firstChild.style.display = data.droplab_hidden ? 'none' : 'block'; + + return template.firstChild.outerHTML; + }, + + setImagesSrc: function setImagesSrc(template) { + var images = [].slice.call(template.querySelectorAll('img[data-src]')); + + images.forEach(function (image) { + image.src = image.getAttribute('data-src'); + image.removeAttribute('data-src'); + }); + }, + + show: function show() { + if (!this.hidden) return; + this.list.style.display = 'block'; + this.currentIndex = 0; + this.hidden = false; + }, + + hide: function hide() { + if (this.hidden) return; + this.list.style.display = 'none'; + this.currentIndex = 0; + this.hidden = true; + } + +}, _defineProperty(_Object$assign, 'toggle', function toggle() { + this.hidden ? this.show() : this.hide(); +}), _defineProperty(_Object$assign, 'destroy', function destroy() { + this.hide(); + this.list.removeEventListener('click', this.eventWrapper.clickEvent); +}), _Object$assign)); + +exports.default = DropDown; + +/***/ }), +/* 7 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +__webpack_require__(1); + +var _hook = __webpack_require__(2); + +var _hook2 = _interopRequireDefault(_hook); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var HookButton = function HookButton(trigger, list, plugins, config) { + _hook2.default.call(this, trigger, list, plugins, config); -var HookButton = function(trigger, list, plugins, config) { - Hook.call(this, trigger, list, plugins, config); this.type = 'button'; this.event = 'click'; + + this.eventWrapper = {}; + this.addEvents(); this.addPlugins(); }; -HookButton.prototype = Object.create(Hook.prototype); +HookButton.prototype = Object.create(_hook2.default.prototype); Object.assign(HookButton.prototype, { - addPlugins: function() { - for(var i = 0; i < this.plugins.length; i++) { - this.plugins[i].init(this); - } + addPlugins: function addPlugins() { + var _this = this; + + this.plugins.forEach(function (plugin) { + return plugin.init(_this); + }); }, - clicked: function(e){ + clicked: function clicked(e) { var buttonEvent = new CustomEvent('click.dl', { detail: { - hook: this, + hook: this }, bubbles: true, cancelable: true }); - this.list.show(); e.target.dispatchEvent(buttonEvent); + + this.list.toggle(); }, - addEvents: function(){ - this.clickedWrapper = this.clicked.bind(this); - this.trigger.addEventListener('click', this.clickedWrapper); + addEvents: function addEvents() { + this.eventWrapper.clicked = this.clicked.bind(this); + this.trigger.addEventListener('click', this.eventWrapper.clicked); }, - removeEvents: function(){ - this.trigger.removeEventListener('click', this.clickedWrapper); + removeEvents: function removeEvents() { + this.trigger.removeEventListener('click', this.eventWrapper.clicked); }, - restoreInitialState: function() { + restoreInitialState: function restoreInitialState() { this.list.list.innerHTML = this.list.initialState; }, - removePlugins: function() { - for(var i = 0; i < this.plugins.length; i++) { - this.plugins[i].destroy(); - } + removePlugins: function removePlugins() { + this.plugins.forEach(function (plugin) { + return plugin.destroy(); + }); }, - destroy: function() { + destroy: function destroy() { this.restoreInitialState(); + this.removeEvents(); this.removePlugins(); }, - - constructor: HookButton, + constructor: HookButton }); +exports.default = HookButton; -module.exports = HookButton; +/***/ }), +/* 8 */ +/***/ (function(module, exports, __webpack_require__) { -},{"./custom_event_polyfill":2,"./hook":5}],7:[function(require,module,exports){ -var CustomEvent = require('./custom_event_polyfill'); -var Hook = require('./hook'); +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +__webpack_require__(1); + +var _hook = __webpack_require__(2); + +var _hook2 = _interopRequireDefault(_hook); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var HookInput = function HookInput(trigger, list, plugins, config) { + _hook2.default.call(this, trigger, list, plugins, config); -var HookInput = function(trigger, list, plugins, config) { - Hook.call(this, trigger, list, plugins, config); this.type = 'input'; this.event = 'input'; - this.addPlugins(); + + this.eventWrapper = {}; + this.addEvents(); + this.addPlugins(); }; Object.assign(HookInput.prototype, { - addPlugins: function() { - var self = this; - for(var i = 0; i < this.plugins.length; i++) { - this.plugins[i].init(self); - } + addPlugins: function addPlugins() { + var _this = this; + + this.plugins.forEach(function (plugin) { + return plugin.init(_this); + }); }, - addEvents: function(){ - var self = this; + addEvents: function addEvents() { + this.eventWrapper.mousedown = this.mousedown.bind(this); + this.eventWrapper.input = this.input.bind(this); + this.eventWrapper.keyup = this.keyup.bind(this); + this.eventWrapper.keydown = this.keydown.bind(this); - this.mousedown = function mousedown(e) { - if(self.hasRemovedEvents) return; - - var mouseEvent = new CustomEvent('mousedown.dl', { - detail: { - hook: self, - text: e.target.value, - }, - bubbles: true, - cancelable: true - }); - e.target.dispatchEvent(mouseEvent); - } - - this.input = function input(e) { - if(self.hasRemovedEvents) return; - - self.list.show(); - - var inputEvent = new CustomEvent('input.dl', { - detail: { - hook: self, - text: e.target.value, - }, - bubbles: true, - cancelable: true - }); - e.target.dispatchEvent(inputEvent); - } - - this.keyup = function keyup(e) { - if(self.hasRemovedEvents) return; - - keyEvent(e, 'keyup.dl'); - } - - this.keydown = function keydown(e) { - if(self.hasRemovedEvents) return; - - keyEvent(e, 'keydown.dl'); - } - - function keyEvent(e, keyEventName){ - self.list.show(); - - var keyEvent = new CustomEvent(keyEventName, { - detail: { - hook: self, - text: e.target.value, - which: e.which, - key: e.key, - }, - bubbles: true, - cancelable: true - }); - e.target.dispatchEvent(keyEvent); - } - - this.events = this.events || {}; - this.events.mousedown = this.mousedown; - this.events.input = this.input; - this.events.keyup = this.keyup; - this.events.keydown = this.keydown; - this.trigger.addEventListener('mousedown', this.mousedown); - this.trigger.addEventListener('input', this.input); - this.trigger.addEventListener('keyup', this.keyup); - this.trigger.addEventListener('keydown', this.keydown); + this.trigger.addEventListener('mousedown', this.eventWrapper.mousedown); + this.trigger.addEventListener('input', this.eventWrapper.input); + this.trigger.addEventListener('keyup', this.eventWrapper.keyup); + this.trigger.addEventListener('keydown', this.eventWrapper.keydown); }, - removeEvents: function() { + removeEvents: function removeEvents() { this.hasRemovedEvents = true; - this.trigger.removeEventListener('mousedown', this.mousedown); - this.trigger.removeEventListener('input', this.input); - this.trigger.removeEventListener('keyup', this.keyup); - this.trigger.removeEventListener('keydown', this.keydown); + + this.trigger.removeEventListener('mousedown', this.eventWrapper.mousedown); + this.trigger.removeEventListener('input', this.eventWrapper.input); + this.trigger.removeEventListener('keyup', this.eventWrapper.keyup); + this.trigger.removeEventListener('keydown', this.eventWrapper.keydown); }, - restoreInitialState: function() { + input: function input(e) { + if (this.hasRemovedEvents) return; + + this.list.show(); + + var inputEvent = new CustomEvent('input.dl', { + detail: { + hook: this, + text: e.target.value + }, + bubbles: true, + cancelable: true + }); + e.target.dispatchEvent(inputEvent); + }, + + mousedown: function mousedown(e) { + if (this.hasRemovedEvents) return; + + var mouseEvent = new CustomEvent('mousedown.dl', { + detail: { + hook: this, + text: e.target.value + }, + bubbles: true, + cancelable: true + }); + e.target.dispatchEvent(mouseEvent); + }, + + keyup: function keyup(e) { + if (this.hasRemovedEvents) return; + + this.keyEvent(e, 'keyup.dl'); + }, + + keydown: function keydown(e) { + if (this.hasRemovedEvents) return; + + this.keyEvent(e, 'keydown.dl'); + }, + + keyEvent: function keyEvent(e, eventName) { + this.list.show(); + + var keyEvent = new CustomEvent(eventName, { + detail: { + hook: this, + text: e.target.value, + which: e.which, + key: e.key + }, + bubbles: true, + cancelable: true + }); + e.target.dispatchEvent(keyEvent); + }, + + restoreInitialState: function restoreInitialState() { this.list.list.innerHTML = this.list.initialState; }, - removePlugins: function() { - for(var i = 0; i < this.plugins.length; i++) { - this.plugins[i].destroy(); - } + removePlugins: function removePlugins() { + this.plugins.forEach(function (plugin) { + return plugin.destroy(); + }); }, - destroy: function() { + destroy: function destroy() { this.restoreInitialState(); + this.removeEvents(); this.removePlugins(); + this.list.destroy(); } }); -module.exports = HookInput; +exports.default = HookInput; -},{"./custom_event_polyfill":2,"./hook":5}],8:[function(require,module,exports){ -var DropLab = require('./droplab')(); -var DATA_TRIGGER = require('./constants').DATA_TRIGGER; -var keyboard = require('./keyboard')(); -var setup = function() { - window.DropLab = DropLab; -}; +/***/ }), +/* 9 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; -module.exports = setup(); - -},{"./constants":1,"./droplab":4,"./keyboard":9}],9:[function(require,module,exports){ -require('./window')(function(w){ - module.exports = function(){ - var currentKey; - var currentFocus; - var isUpArrow = false; - var isDownArrow = false; - var removeHighlight = function removeHighlight(list) { - var listItems = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0); - var listItemsTmp = []; - for(var i = 0; i < listItems.length; i++) { - var listItem = listItems[i]; - listItem.classList.remove('dropdown-active'); - - if (listItem.style.display !== 'none') { - listItemsTmp.push(listItem); - } - } - return listItemsTmp; - }; - - var setMenuForArrows = function setMenuForArrows(list) { - var listItems = removeHighlight(list); - if(list.currentIndex>0){ - if(!listItems[list.currentIndex-1]){ - list.currentIndex = list.currentIndex-1; - } - - if (listItems[list.currentIndex-1]) { - var el = listItems[list.currentIndex-1]; - var filterDropdownEl = el.closest('.filter-dropdown'); - el.classList.add('dropdown-active'); - - if (filterDropdownEl) { - var filterDropdownBottom = filterDropdownEl.offsetHeight; - var elOffsetTop = el.offsetTop - 30; - - if (elOffsetTop > filterDropdownBottom) { - filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom; - } - } - } - } - }; - - var mousedown = function mousedown(e) { - var list = e.detail.hook.list; - removeHighlight(list); - list.show(); - list.currentIndex = 0; - isUpArrow = false; - isDownArrow = false; - }; - var selectItem = function selectItem(list) { - var listItems = removeHighlight(list); - var currentItem = listItems[list.currentIndex-1]; - var listEvent = new CustomEvent('click.dl', { - detail: { - list: list, - selected: currentItem, - data: currentItem.dataset, - }, - }); - list.list.dispatchEvent(listEvent); - list.hide(); - } - - var keydown = function keydown(e){ - var typedOn = e.target; - var list = e.detail.hook.list; - var currentIndex = list.currentIndex; - isUpArrow = false; - isDownArrow = false; - - if(e.detail.which){ - currentKey = e.detail.which; - if(currentKey === 13){ - selectItem(e.detail.hook.list); - return; - } - if(currentKey === 38) { - isUpArrow = true; - } - if(currentKey === 40) { - isDownArrow = true; - } - } else if(e.detail.key) { - currentKey = e.detail.key; - if(currentKey === 'Enter'){ - selectItem(e.detail.hook.list); - return; - } - if(currentKey === 'ArrowUp') { - isUpArrow = true; - } - if(currentKey === 'ArrowDown') { - isDownArrow = true; - } - } - if(isUpArrow){ currentIndex--; } - if(isDownArrow){ currentIndex++; } - if(currentIndex < 0){ currentIndex = 0; } - list.currentIndex = currentIndex; - setMenuForArrows(e.detail.hook.list); - }; - - w.addEventListener('mousedown.dl', mousedown); - w.addEventListener('keydown.dl', keydown); - }; +Object.defineProperty(exports, "__esModule", { + value: true }); -},{"./window":11}],10:[function(require,module,exports){ -var DATA_TRIGGER = require('./constants').DATA_TRIGGER; -var DATA_DROPDOWN = require('./constants').DATA_DROPDOWN; -var toDataCamelCase = function(attr){ - return this.camelize(attr.split('-').slice(1).join(' ')); +var _droplab = __webpack_require__(4); + +var _droplab2 = _interopRequireDefault(_droplab); + +var _constants = __webpack_require__(0); + +var _constants2 = _interopRequireDefault(_constants); + +var _keyboard = __webpack_require__(5); + +var _keyboard2 = _interopRequireDefault(_keyboard); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var DATA_TRIGGER = _constants2.default.DATA_TRIGGER; +var keyboard = (0, _keyboard2.default)(); + +var setup = function setup() { + window.DropLab = (0, _droplab2.default)(); }; -// the tiniest damn templating I can do -var t = function(s,d){ - for(var p in d) - s=s.replace(new RegExp('{{'+p+'}}','g'), d[p]); - return s; -}; +setup(); -var camelize = function(str) { - return str.replace(/(?:^\w|[A-Z]|\b\w)/g, function(letter, index) { - return index == 0 ? letter.toLowerCase() : letter.toUpperCase(); - }).replace(/\s+/g, ''); -}; +exports.default = setup; -var closest = function(thisTag, stopTag) { - while(thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML'){ - thisTag = thisTag.parentNode; - } - return thisTag; -}; - -var isDropDownParts = function(target) { - if(!target || target.tagName === 'HTML') { return false; } - return ( - target.hasAttribute(DATA_TRIGGER) || - target.hasAttribute(DATA_DROPDOWN) - ); -}; - -module.exports = { - toDataCamelCase: toDataCamelCase, - t: t, - camelize: camelize, - closest: closest, - isDropDownParts: isDropDownParts, -}; - -},{"./constants":1}],11:[function(require,module,exports){ -module.exports = function(callback) { - return (function() { - callback(this); - }).call(null); -}; - -},{}]},{},[8])(8) -}); +/***/ }) +/******/ ]); +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c","webpack:///./src/constants.js","webpack:///./~/custom-event-polyfill/custom-event-polyfill.js","webpack:///./src/hook.js","webpack:///./src/utils.js","webpack:///./src/droplab.js","webpack:///./src/keyboard.js","webpack:///./src/dropdown.js","webpack:///./src/hook_button.js","webpack:///./src/hook_input.js","webpack:///./src/index.js"],"names":["DATA_TRIGGER","DATA_DROPDOWN","SELECTED_CLASS","ACTIVE_CLASS","constants","Hook","trigger","list","plugins","config","type","event","id","Object","assign","prototype","addEvents","constructor","utils","toCamelCase","attr","camelize","split","slice","join","t","s","d","p","hasOwnProperty","call","replace","RegExp","str","letter","index","toLowerCase","toUpperCase","closest","thisTag","stopTag","tagName","parentNode","isDropDownParts","target","hasAttribute","DropLab","hook","ready","hooks","queuedData","eventWrapper","loadStatic","addHook","init","dropdownTriggers","apply","document","querySelectorAll","addHooks","addData","args","arguments","applyArgs","setData","destroy","forEach","removeEvents","methodName","push","_addData","data","_processData","_setData","Array","isArray","documentClicked","bind","addEventListener","e","hide","removeEventListener","changeHookList","availableTrigger","getElementById","i","dataset","dropdownActive","splice","availableHook","querySelector","availableList","Element","HookObject","setConfig","obj","fireReady","readyEvent","CustomEvent","detail","dropdown","dispatchEvent","currentKey","currentFocus","isUpArrow","isDownArrow","removeHighlight","itemElements","listItems","length","listItem","classList","remove","style","display","setMenuForArrows","currentIndex","el","filterDropdownEl","add","filterDropdownBottom","offsetHeight","elOffsetTop","offsetTop","scrollTop","mousedown","show","selectItem","currentItem","listEvent","selected","keydown","typedOn","which","key","DropDown","hidden","items","getItems","initTemplateString","initialState","innerHTML","templateString","outerHTML","clickEvent","addSelectedClass","preventDefault","removeSelectedClasses","item","toggle","render","concat","children","map","renderChildren","renderableList","html","template","createElement","setImagesSrc","firstChild","droplab_hidden","images","image","src","getAttribute","removeAttribute","HookButton","addPlugins","create","plugin","clicked","buttonEvent","bubbles","cancelable","restoreInitialState","removePlugins","HookInput","input","keyup","hasRemovedEvents","inputEvent","text","value","mouseEvent","keyEvent","eventName","keyboard","setup","window"],"mappings":";AAAA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;;AAEA;AACA,mDAA2C,cAAc;;AAEzD;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAK;AACL;AACA;;AAEA;AACA;AACA;AACA,mCAA2B,0BAA0B,EAAE;AACvD,yCAAiC,eAAe;AAChD;AACA;AACA;;AAEA;AACA,8DAAsD,+DAA+D;;AAErH;AACA;;AAEA;AACA;;;;;;;;;;;;;AChEA,IAAMA,eAAe,uBAArB;AACA,IAAMC,gBAAgB,eAAtB;AACA,IAAMC,iBAAiB,uBAAvB;AACA,IAAMC,eAAe,qBAArB;;AAEA,IAAMC,YAAY;AAChBJ,4BADgB;AAEhBC,8BAFgB;AAGhBC,gCAHgB;AAIhBC;AAJgB,CAAlB;;kBAOeC,S;;;;;;ACZf;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC;AACD;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;AACT,OAAO;AACP;AACA;AACA;AACA;AACA;;AAEA;AACA,mCAAmC;AACnC;;;;;;;;;;;;;;AC3CA;;;;;;AAEA,IAAIC,OAAO,SAAPA,IAAO,CAASC,OAAT,EAAkBC,IAAlB,EAAwBC,OAAxB,EAAiCC,MAAjC,EAAwC;AACjD,OAAKH,OAAL,GAAeA,OAAf;AACA,OAAKC,IAAL,GAAY,uBAAaA,IAAb,CAAZ;AACA,OAAKG,IAAL,GAAY,MAAZ;AACA,OAAKC,KAAL,GAAa,OAAb;AACA,OAAKH,OAAL,GAAeA,WAAW,EAA1B;AACA,OAAKC,MAAL,GAAcA,UAAU,EAAxB;AACA,OAAKG,EAAL,GAAUN,QAAQM,EAAlB;AACD,CARD;;AAUAC,OAAOC,MAAP,CAAcT,KAAKU,SAAnB,EAA8B;;AAE5BC,aAAW,qBAAU,CAAE,CAFK;;AAI5BC,eAAaZ;AAJe,CAA9B;;kBAOeA,I;;;;;;;;;;;;;ACnBf;;;;;;IAEQL,Y,uBAAAA,Y;IAAcC,a,uBAAAA,a;;;AAEtB,IAAMiB,QAAQ;AACZC,aADY,uBACAC,IADA,EACM;AAChB,WAAO,KAAKC,QAAL,CAAcD,KAAKE,KAAL,CAAW,GAAX,EAAgBC,KAAhB,CAAsB,CAAtB,EAAyBC,IAAzB,CAA8B,GAA9B,CAAd,CAAP;AACD,GAHW;AAKZC,GALY,aAKVC,CALU,EAKPC,CALO,EAKJ;AACN,SAAK,IAAMC,CAAX,IAAgBD,CAAhB,EAAmB;AACjB,UAAId,OAAOE,SAAP,CAAiBc,cAAjB,CAAgCC,IAAhC,CAAqCH,CAArC,EAAwCC,CAAxC,CAAJ,EAAgD;AAC9CF,YAAIA,EAAEK,OAAF,CAAU,IAAIC,MAAJ,QAAgBJ,CAAhB,SAAuB,GAAvB,CAAV,EAAuCD,EAAEC,CAAF,CAAvC,CAAJ;AACD;AACF;AACD,WAAOF,CAAP;AACD,GAZW;AAcZL,UAdY,oBAcHY,GAdG,EAcE;AACZ,WAAOA,IAAIF,OAAJ,CAAY,qBAAZ,EAAmC,UAACG,MAAD,EAASC,KAAT,EAAmB;AAC3D,aAAOA,UAAU,CAAV,GAAcD,OAAOE,WAAP,EAAd,GAAqCF,OAAOG,WAAP,EAA5C;AACD,KAFM,EAEJN,OAFI,CAEI,MAFJ,EAEY,EAFZ,CAAP;AAGD,GAlBW;AAoBZO,SApBY,mBAoBJC,OApBI,EAoBKC,OApBL,EAoBc;AACxB,WAAOD,WAAWA,QAAQE,OAAR,KAAoBD,OAA/B,IAA0CD,QAAQE,OAAR,KAAoB,MAArE,EAA6E;AAC3EF,gBAAUA,QAAQG,UAAlB;AACD;AACD,WAAOH,OAAP;AACD,GAzBW;AA2BZI,iBA3BY,2BA2BIC,MA3BJ,EA2BY;AACtB,QAAI,CAACA,MAAD,IAAWA,OAAOH,OAAP,KAAmB,MAAlC,EAA0C,OAAO,KAAP;AAC1C,WAAOG,OAAOC,YAAP,CAAoB7C,YAApB,KAAqC4C,OAAOC,YAAP,CAAoB5C,aAApB,CAA5C;AACD;AA9BW,CAAd;;kBAkCeiB,K;;;;;;;;;;;;;kBC/BA,YAAY;AACzB,MAAI4B,UAAU,SAAVA,OAAU,CAASC,IAAT,EAAexC,IAAf,EAAqB;AACjC,QAAI,CAAC,IAAD,YAAiBuC,OAArB,EAA8B,OAAO,IAAIA,OAAJ,CAAYC,IAAZ,CAAP;;AAE9B,SAAKC,KAAL,GAAa,KAAb;AACA,SAAKC,KAAL,GAAa,EAAb;AACA,SAAKC,UAAL,GAAkB,EAAlB;AACA,SAAKzC,MAAL,GAAc,EAAd;;AAEA,SAAK0C,YAAL,GAAoB,EAApB;;AAEA,QAAI,CAACJ,IAAL,EAAW,OAAO,KAAKK,UAAL,EAAP;AACX,SAAKC,OAAL,CAAaN,IAAb,EAAmBxC,IAAnB;AACA,SAAK+C,IAAL;AACD,GAbD;;AAeAzC,SAAOC,MAAP,CAAcgC,QAAQ/B,SAAtB,EAAiC;AAC/BqC,gBAAY,sBAAU;AACpB,UAAIG,mBAAmB,GAAGhC,KAAH,CAASiC,KAAT,CAAeC,SAASC,gBAAT,OAA8B1D,YAA9B,OAAf,CAAvB;AACA,WAAK2D,QAAL,CAAcJ,gBAAd,EAAgCD,IAAhC;AACD,KAJ8B;;AAM/BM,aAAS,mBAAY;AACnB,UAAIC,OAAO,GAAGtC,KAAH,CAASiC,KAAT,CAAeM,SAAf,CAAX;AACA,WAAKC,SAAL,CAAeF,IAAf,EAAqB,UAArB;AACD,KAT8B;;AAW/BG,aAAS,mBAAW;AAClB,UAAIH,OAAO,GAAGtC,KAAH,CAASiC,KAAT,CAAeM,SAAf,CAAX;AACA,WAAKC,SAAL,CAAeF,IAAf,EAAqB,UAArB;AACD,KAd8B;;AAgB/BI,aAAS,mBAAW;AAClB,WAAKhB,KAAL,CAAWiB,OAAX,CAAmB;AAAA,eAAQnB,KAAKkB,OAAL,EAAR;AAAA,OAAnB;AACA,WAAKhB,KAAL,GAAa,EAAb;AACA,WAAKkB,YAAL;AACD,KApB8B;;AAsB/BJ,eAAW,mBAASF,IAAT,EAAeO,UAAf,EAA2B;AACpC,UAAI,KAAKpB,KAAT,EAAgB,OAAO,KAAKoB,UAAL,EAAiBZ,KAAjB,CAAuB,IAAvB,EAA6BK,IAA7B,CAAP;;AAEhB,WAAKX,UAAL,GAAkB,KAAKA,UAAL,IAAmB,EAArC;AACA,WAAKA,UAAL,CAAgBmB,IAAhB,CAAqBR,IAArB;AACD,KA3B8B;;AA6B/BS,cAAU,kBAAShE,OAAT,EAAkBiE,IAAlB,EAAwB;AAChC,WAAKC,YAAL,CAAkBlE,OAAlB,EAA2BiE,IAA3B,EAAiC,SAAjC;AACD,KA/B8B;;AAiC/BE,cAAU,kBAASnE,OAAT,EAAkBiE,IAAlB,EAAwB;AAChC,WAAKC,YAAL,CAAkBlE,OAAlB,EAA2BiE,IAA3B,EAAiC,SAAjC;AACD,KAnC8B;;AAqC/BC,kBAAc,sBAASlE,OAAT,EAAkBiE,IAAlB,EAAwBH,UAAxB,EAAoC;AAChD,WAAKnB,KAAL,CAAWiB,OAAX,CAAmB,UAACnB,IAAD,EAAU;AAC3B,YAAI2B,MAAMC,OAAN,CAAcrE,OAAd,CAAJ,EAA4ByC,KAAKxC,IAAL,CAAU6D,UAAV,EAAsB9D,OAAtB;;AAE5B,YAAIyC,KAAKzC,OAAL,CAAaM,EAAb,KAAoBN,OAAxB,EAAiCyC,KAAKxC,IAAL,CAAU6D,UAAV,EAAsBG,IAAtB;AAClC,OAJD;AAKD,KA3C8B;;AA6C/BvD,eAAW,qBAAW;AACpB,WAAKmC,YAAL,CAAkByB,eAAlB,GAAoC,KAAKA,eAAL,CAAqBC,IAArB,CAA0B,IAA1B,CAApC;AACApB,eAASqB,gBAAT,CAA0B,OAA1B,EAAmC,KAAK3B,YAAL,CAAkByB,eAArD;AACD,KAhD8B;;AAkD/BA,qBAAiB,yBAASG,CAAT,EAAY;AAC3B,UAAIxC,UAAUwC,EAAEnC,MAAhB;;AAEA,UAAIL,QAAQE,OAAR,KAAoB,IAAxB,EAA8BF,UAAU,gBAAMD,OAAN,CAAcC,OAAd,EAAuB,IAAvB,CAAV;AAC9B,UAAI,gBAAMI,eAAN,CAAsBJ,OAAtB,EAA+B,KAAKU,KAApC,KAA8C,gBAAMN,eAAN,CAAsBoC,EAAEnC,MAAxB,EAAgC,KAAKK,KAArC,CAAlD,EAA+F;;AAE/F,WAAKA,KAAL,CAAWiB,OAAX,CAAmB;AAAA,eAAQnB,KAAKxC,IAAL,CAAUyE,IAAV,EAAR;AAAA,OAAnB;AACD,KAzD8B;;AA2D/Bb,kBAAc,wBAAU;AACtBV,eAASwB,mBAAT,CAA6B,OAA7B,EAAsC,KAAK9B,YAAL,CAAkByB,eAAxD;AACD,KA7D8B;;AA+D/BM,oBAAgB,wBAAS5E,OAAT,EAAkBC,IAAlB,EAAwBC,OAAxB,EAAiCC,MAAjC,EAAyC;AAAA;;AACvD,UAAM0E,mBAAoB,OAAO7E,OAAP,KAAmB,QAAnB,GAA8BmD,SAAS2B,cAAT,CAAwB9E,OAAxB,CAA9B,GAAiEA,OAA3F;;AAGA,WAAK2C,KAAL,CAAWiB,OAAX,CAAmB,UAACnB,IAAD,EAAOsC,CAAP,EAAa;AAC9BtC,aAAKxC,IAAL,CAAUA,IAAV,CAAe+E,OAAf,CAAuBC,cAAvB,GAAwC,KAAxC;;AAEA,YAAIxC,KAAKzC,OAAL,KAAiB6E,gBAArB,EAAuC;;AAEvCpC,aAAKkB,OAAL;AACA,cAAKhB,KAAL,CAAWuC,MAAX,CAAkBH,CAAlB,EAAqB,CAArB;AACA,cAAKhC,OAAL,CAAa8B,gBAAb,EAA+B5E,IAA/B,EAAqCC,OAArC,EAA8CC,MAA9C;AACD,OARD;AASD,KA5E8B;;AA8E/B4C,aAAS,iBAASN,IAAT,EAAexC,IAAf,EAAqBC,OAArB,EAA8BC,MAA9B,EAAsC;AAC7C,UAAMgF,gBAAgB,OAAO1C,IAAP,KAAgB,QAAhB,GAA2BU,SAASiC,aAAT,CAAuB3C,IAAvB,CAA3B,GAA0DA,IAAhF;AACA,UAAI4C,sBAAJ;;AAEA,UAAI,OAAOpF,IAAP,KAAgB,QAApB,EAA8B;AAC5BoF,wBAAgBlC,SAASiC,aAAT,CAAuBnF,IAAvB,CAAhB;AACD,OAFD,MAEO,IAAIA,gBAAgBqF,OAApB,EAA6B;AAClCD,wBAAgBpF,IAAhB;AACD,OAFM,MAEA;AACLoF,wBAAgBlC,SAASiC,aAAT,CAAuB3C,KAAKuC,OAAL,CAAa,gBAAMnE,WAAN,CAAkBnB,YAAlB,CAAb,CAAvB,CAAhB;AACD;;AAED2F,oBAAcL,OAAd,CAAsBC,cAAtB,GAAuC,IAAvC;;AAEA,UAAMM,aAAaJ,cAAchD,OAAd,KAA0B,OAA1B,+CAAnB;AACA,WAAKQ,KAAL,CAAWoB,IAAX,CAAgB,IAAIwB,UAAJ,CAAeJ,aAAf,EAA8BE,aAA9B,EAA6CnF,OAA7C,EAAsDC,MAAtD,CAAhB;;AAEA,aAAO,IAAP;AACD,KAhG8B;;AAkG/BkD,cAAU,kBAASV,KAAT,EAAgBzC,OAAhB,EAAyBC,MAAzB,EAAiC;AAAA;;AACzCwC,YAAMiB,OAAN,CAAc;AAAA,eAAQ,OAAKb,OAAL,CAAaN,IAAb,EAAmB,IAAnB,EAAyBvC,OAAzB,EAAkCC,MAAlC,CAAR;AAAA,OAAd;AACA,aAAO,IAAP;AACD,KArG8B;;AAuG/BqF,eAAW,mBAASC,GAAT,EAAa;AACtB,WAAKtF,MAAL,GAAcsF,GAAd;AACD,KAzG8B;;AA2G/BC,eAAW,qBAAW;AACpB,UAAMC,aAAa,IAAIC,WAAJ,CAAgB,UAAhB,EAA4B;AAC7CC,gBAAQ;AACNC,oBAAU;AADJ;AADqC,OAA5B,CAAnB;AAKA3C,eAAS4C,aAAT,CAAuBJ,UAAvB;;AAEA,WAAKjD,KAAL,GAAa,IAAb;AACD,KApH8B;;AAsH/BM,UAAM,gBAAY;AAAA;;AAChB,WAAKtC,SAAL;;AAEA,WAAKgF,SAAL;;AAEA,WAAK9C,UAAL,CAAgBgB,OAAhB,CAAwB;AAAA,eAAQ,OAAKN,OAAL,CAAaW,IAAb,CAAR;AAAA,OAAxB;AACA,WAAKrB,UAAL,GAAkB,EAAlB;;AAEA,aAAO,IAAP;AACD;AA/H8B,GAAjC;;AAkIA,SAAOJ,OAAP;AACD,C;;AA1JD;;AACA;;;;AACA;;;;AACA;;;;AACA;;;;;;AACA,IAAM9C,eAAe,oBAAUA,YAA/B;;AAqJC,C;;;;;;;;;;;;;kBCxJc,YAAY;AACzB,MAAIsG,UAAJ;AACA,MAAIC,YAAJ;AACA,MAAIC,YAAY,KAAhB;AACA,MAAIC,cAAc,KAAlB;AACA,MAAIC,kBAAkB,SAASA,eAAT,CAAyBnG,IAAzB,EAA+B;AACnD,QAAIoG,eAAejC,MAAM3D,SAAN,CAAgBQ,KAAhB,CAAsBO,IAAtB,CAA2BvB,KAAKA,IAAL,CAAUmD,gBAAV,CAA2B,kBAA3B,CAA3B,EAA2E,CAA3E,CAAnB;AACA,QAAIkD,YAAY,EAAhB;AACA,SAAI,IAAIvB,IAAI,CAAZ,EAAeA,IAAIsB,aAAaE,MAAhC,EAAwCxB,GAAxC,EAA6C;AAC3C,UAAIyB,WAAWH,aAAatB,CAAb,CAAf;AACAyB,eAASC,SAAT,CAAmBC,MAAnB,CAA0B,oBAAU7G,YAApC;;AAEA,UAAI2G,SAASG,KAAT,CAAeC,OAAf,KAA2B,MAA/B,EAAuC;AACrCN,kBAAUvC,IAAV,CAAeyC,QAAf;AACD;AACF;AACD,WAAOF,SAAP;AACD,GAZD;;AAcA,MAAIO,mBAAmB,SAASA,gBAAT,CAA0B5G,IAA1B,EAAgC;AACrD,QAAIqG,YAAYF,gBAAgBnG,IAAhB,CAAhB;AACA,QAAGA,KAAK6G,YAAL,GAAkB,CAArB,EAAuB;AACrB,UAAG,CAACR,UAAUrG,KAAK6G,YAAL,GAAkB,CAA5B,CAAJ,EAAmC;AACjC7G,aAAK6G,YAAL,GAAoB7G,KAAK6G,YAAL,GAAkB,CAAtC;AACD;;AAED,UAAIR,UAAUrG,KAAK6G,YAAL,GAAkB,CAA5B,CAAJ,EAAoC;AAClC,YAAIC,KAAKT,UAAUrG,KAAK6G,YAAL,GAAkB,CAA5B,CAAT;AACA,YAAIE,mBAAmBD,GAAG/E,OAAH,CAAW,kBAAX,CAAvB;AACA+E,WAAGN,SAAH,CAAaQ,GAAb,CAAiB,oBAAUpH,YAA3B;;AAEA,YAAImH,gBAAJ,EAAsB;AACpB,cAAIE,uBAAuBF,iBAAiBG,YAA5C;AACA,cAAIC,cAAcL,GAAGM,SAAH,GAAe,EAAjC;;AAEA,cAAID,cAAcF,oBAAlB,EAAwC;AACtCF,6BAAiBM,SAAjB,GAA6BF,cAAcF,oBAA3C;AACD;AACF;AACF;AACF;AACF,GAtBD;;AAwBA,MAAIK,YAAY,SAASA,SAAT,CAAmB9C,CAAnB,EAAsB;AACpC,QAAIxE,OAAOwE,EAAEoB,MAAF,CAASpD,IAAT,CAAcxC,IAAzB;AACAmG,oBAAgBnG,IAAhB;AACAA,SAAKuH,IAAL;AACAvH,SAAK6G,YAAL,GAAoB,CAApB;AACAZ,gBAAY,KAAZ;AACAC,kBAAc,KAAd;AACD,GAPD;AAQA,MAAIsB,aAAa,SAASA,UAAT,CAAoBxH,IAApB,EAA0B;AACzC,QAAIqG,YAAYF,gBAAgBnG,IAAhB,CAAhB;AACA,QAAIyH,cAAcpB,UAAUrG,KAAK6G,YAAL,GAAkB,CAA5B,CAAlB;AACA,QAAIa,YAAY,IAAI/B,WAAJ,CAAgB,UAAhB,EAA4B;AAC1CC,cAAQ;AACN5F,cAAMA,IADA;AAEN2H,kBAAUF,WAFJ;AAGNzD,cAAMyD,YAAY1C;AAHZ;AADkC,KAA5B,CAAhB;AAOA/E,SAAKA,IAAL,CAAU8F,aAAV,CAAwB4B,SAAxB;AACA1H,SAAKyE,IAAL;AACD,GAZD;;AAcA,MAAImD,UAAU,SAASA,OAAT,CAAiBpD,CAAjB,EAAmB;AAC/B,QAAIqD,UAAUrD,EAAEnC,MAAhB;AACA,QAAIrC,OAAOwE,EAAEoB,MAAF,CAASpD,IAAT,CAAcxC,IAAzB;AACA,QAAI6G,eAAe7G,KAAK6G,YAAxB;AACAZ,gBAAY,KAAZ;AACAC,kBAAc,KAAd;;AAEA,QAAG1B,EAAEoB,MAAF,CAASkC,KAAZ,EAAkB;AAChB/B,mBAAavB,EAAEoB,MAAF,CAASkC,KAAtB;AACA,UAAG/B,eAAe,EAAlB,EAAqB;AACnByB,mBAAWhD,EAAEoB,MAAF,CAASpD,IAAT,CAAcxC,IAAzB;AACA;AACD;AACD,UAAG+F,eAAe,EAAlB,EAAsB;AACpBE,oBAAY,IAAZ;AACD;AACD,UAAGF,eAAe,EAAlB,EAAsB;AACpBG,sBAAc,IAAd;AACD;AACF,KAZD,MAYO,IAAG1B,EAAEoB,MAAF,CAASmC,GAAZ,EAAiB;AACtBhC,mBAAavB,EAAEoB,MAAF,CAASmC,GAAtB;AACA,UAAGhC,eAAe,OAAlB,EAA0B;AACxByB,mBAAWhD,EAAEoB,MAAF,CAASpD,IAAT,CAAcxC,IAAzB;AACA;AACD;AACD,UAAG+F,eAAe,SAAlB,EAA6B;AAC3BE,oBAAY,IAAZ;AACD;AACD,UAAGF,eAAe,WAAlB,EAA+B;AAC7BG,sBAAc,IAAd;AACD;AACF;AACD,QAAGD,SAAH,EAAa;AAAEY;AAAiB;AAChC,QAAGX,WAAH,EAAe;AAAEW;AAAiB;AAClC,QAAGA,eAAe,CAAlB,EAAoB;AAAEA,qBAAe,CAAf;AAAmB;AACzC7G,SAAK6G,YAAL,GAAoBA,YAApB;AACAD,qBAAiBpC,EAAEoB,MAAF,CAASpD,IAAT,CAAcxC,IAA/B;AACD,GArCD;;AAuCAkD,WAASqB,gBAAT,CAA0B,cAA1B,EAA0C+C,SAA1C;AACApE,WAASqB,gBAAT,CAA0B,YAA1B,EAAwCqD,OAAxC;AACD,C;;AA5GD;;;;;;;;;;;;;;;;;;;ACAA;;AACA;;;;AACA;;;;;;;;AAEA,IAAII,WAAW,SAAXA,QAAW,CAAShI,IAAT,EAAe;AAC5B,OAAK6G,YAAL,GAAoB,CAApB;AACA,OAAKoB,MAAL,GAAc,IAAd;AACA,OAAKjI,IAAL,GAAY,OAAOA,IAAP,KAAgB,QAAhB,GAA2BkD,SAASiC,aAAT,CAAuBnF,IAAvB,CAA3B,GAA0DA,IAAtE;AACA,OAAKkI,KAAL,GAAa,EAAb;;AAEA,OAAKtF,YAAL,GAAoB,EAApB;;AAEA,OAAKuF,QAAL;AACA,OAAKC,kBAAL;AACA,OAAK3H,SAAL;;AAEA,OAAK4H,YAAL,GAAoBrI,KAAKsI,SAAzB;AACD,CAbD;;AAeAhI,OAAOC,MAAP,CAAcyH,SAASxH,SAAvB;AACE2H,YAAU,oBAAW;AACnB,SAAKD,KAAL,GAAa,GAAGlH,KAAH,CAASO,IAAT,CAAc,KAAKvB,IAAL,CAAUmD,gBAAV,CAA2B,IAA3B,CAAd,CAAb;AACA,WAAO,KAAK+E,KAAZ;AACD,GAJH;;AAMEE,sBAAoB,8BAAW;AAC7B,QAAIF,QAAQ,KAAKA,KAAL,IAAc,KAAKC,QAAL,EAA1B;;AAEA,QAAII,iBAAiB,EAArB;AACA,QAAIL,MAAM5B,MAAN,GAAe,CAAnB,EAAsBiC,iBAAiBL,MAAMA,MAAM5B,MAAN,GAAe,CAArB,EAAwBkC,SAAzC;AACtB,SAAKD,cAAL,GAAsBA,cAAtB;;AAEA,WAAO,KAAKA,cAAZ;AACD,GAdH;;AAgBEE,cAAY,oBAASjE,CAAT,EAAY;AACtB,QAAImD,WAAW,gBAAM5F,OAAN,CAAcyC,EAAEnC,MAAhB,EAAwB,IAAxB,CAAf;AACA,QAAI,CAACsF,QAAL,EAAe;;AAEf,SAAKe,gBAAL,CAAsBf,QAAtB;;AAEAnD,MAAEmE,cAAF;AACA,SAAKlE,IAAL;;AAEA,QAAIiD,YAAY,IAAI/B,WAAJ,CAAgB,UAAhB,EAA4B;AAC1CC,cAAQ;AACN5F,cAAM,IADA;AAEN2H,kBAAUA,QAFJ;AAGN3D,cAAMQ,EAAEnC,MAAF,CAAS0C;AAHT;AADkC,KAA5B,CAAhB;AAOA,SAAK/E,IAAL,CAAU8F,aAAV,CAAwB4B,SAAxB;AACD,GAjCH;;AAmCEgB,oBAAkB,0BAAUf,QAAV,EAAoB;AACpC,SAAKiB,qBAAL;AACAjB,aAASnB,SAAT,CAAmBQ,GAAnB,CAAuB,oBAAUrH,cAAjC;AACD,GAtCH;;AAwCEiJ,yBAAuB,iCAAY;AACjC,QAAMV,QAAQ,KAAKA,KAAL,IAAc,KAAKC,QAAL,EAA5B;;AAEAD,UAAMvE,OAAN,CAAc,UAACkF,IAAD,EAAU;AACtBA,WAAKrC,SAAL,CAAeC,MAAf,CAAsB,oBAAU9G,cAAhC;AACD,KAFD;AAGD,GA9CH;;AAgDEc,aAAW,qBAAW;AACpB,SAAKmC,YAAL,CAAkB6F,UAAlB,GAA+B,KAAKA,UAAL,CAAgBnE,IAAhB,CAAqB,IAArB,CAA/B;AACA,SAAKtE,IAAL,CAAUuE,gBAAV,CAA2B,OAA3B,EAAoC,KAAK3B,YAAL,CAAkB6F,UAAtD;AACD,GAnDH;;AAqDEK,UAAQ,kBAAW;AACjB,SAAKb,MAAL,GAAc,KAAKV,IAAL,EAAd,GAA4B,KAAK9C,IAAL,EAA5B;AACD,GAvDH;;AAyDEhB,WAAS,iBAASO,IAAT,EAAe;AACtB,SAAKA,IAAL,GAAYA,IAAZ;AACA,SAAK+E,MAAL,CAAY/E,IAAZ;AACD,GA5DH;;AA8DEX,WAAS,iBAASW,IAAT,EAAe;AACtB,SAAKA,IAAL,GAAY,CAAC,KAAKA,IAAL,IAAa,EAAd,EAAkBgF,MAAlB,CAAyBhF,IAAzB,CAAZ;AACA,SAAK+E,MAAL,CAAY,KAAK/E,IAAjB;AACD,GAjEH;;AAmEE+E,UAAQ,gBAAS/E,IAAT,EAAe;AACrB,QAAMiF,WAAWjF,OAAOA,KAAKkF,GAAL,CAAS,KAAKC,cAAL,CAAoB7E,IAApB,CAAyB,IAAzB,CAAT,CAAP,GAAkD,EAAnE;AACA,QAAM8E,iBAAiB,KAAKpJ,IAAL,CAAUmF,aAAV,CAAwB,kBAAxB,KAA+C,KAAKnF,IAA3E;;AAEAoJ,mBAAed,SAAf,GAA2BW,SAAShI,IAAT,CAAc,EAAd,CAA3B;AACD,GAxEH;;AA0EEkI,kBAAgB,wBAASnF,IAAT,EAAe;AAC7B,QAAIqF,OAAO,gBAAMnI,CAAN,CAAQ,KAAKqH,cAAb,EAA6BvE,IAA7B,CAAX;AACA,QAAIsF,WAAWpG,SAASqG,aAAT,CAAuB,KAAvB,CAAf;;AAEAD,aAAShB,SAAT,GAAqBe,IAArB;AACA,SAAKG,YAAL,CAAkBF,QAAlB;AACAA,aAASG,UAAT,CAAoB/C,KAApB,CAA0BC,OAA1B,GAAoC3C,KAAK0F,cAAL,GAAsB,MAAtB,GAA+B,OAAnE;;AAEA,WAAOJ,SAASG,UAAT,CAAoBjB,SAA3B;AACD,GAnFH;;AAqFEgB,gBAAc,sBAASF,QAAT,EAAmB;AAC/B,QAAMK,SAAS,GAAG3I,KAAH,CAASO,IAAT,CAAc+H,SAASnG,gBAAT,CAA0B,eAA1B,CAAd,CAAf;;AAEAwG,WAAOhG,OAAP,CAAe,UAACiG,KAAD,EAAW;AACxBA,YAAMC,GAAN,GAAYD,MAAME,YAAN,CAAmB,UAAnB,CAAZ;AACAF,YAAMG,eAAN,CAAsB,UAAtB;AACD,KAHD;AAID,GA5FH;;AA8FExC,QAAM,gBAAW;AACf,QAAI,CAAC,KAAKU,MAAV,EAAkB;AAClB,SAAKjI,IAAL,CAAU0G,KAAV,CAAgBC,OAAhB,GAA0B,OAA1B;AACA,SAAKE,YAAL,GAAoB,CAApB;AACA,SAAKoB,MAAL,GAAc,KAAd;AACD,GAnGH;;AAqGExD,QAAM,gBAAW;AACf,QAAI,KAAKwD,MAAT,EAAiB;AACjB,SAAKjI,IAAL,CAAU0G,KAAV,CAAgBC,OAAhB,GAA0B,MAA1B;AACA,SAAKE,YAAL,GAAoB,CAApB;AACA,SAAKoB,MAAL,GAAc,IAAd;AACD;;AA1GH,6CA4GU,kBAAY;AAClB,OAAKA,MAAL,GAAc,KAAKV,IAAL,EAAd,GAA4B,KAAK9C,IAAL,EAA5B;AACD,CA9GH,8CAgHW,mBAAW;AAClB,OAAKA,IAAL;AACA,OAAKzE,IAAL,CAAU0E,mBAAV,CAA8B,OAA9B,EAAuC,KAAK9B,YAAL,CAAkB6F,UAAzD;AACD,CAnHH;;kBAsHeT,Q;;;;;;;;;;;;;ACzIf;;AACA;;;;;;AAEA,IAAIgC,aAAa,SAAbA,UAAa,CAASjK,OAAT,EAAkBC,IAAlB,EAAwBC,OAAxB,EAAiCC,MAAjC,EAAyC;AACxD,iBAAKqB,IAAL,CAAU,IAAV,EAAgBxB,OAAhB,EAAyBC,IAAzB,EAA+BC,OAA/B,EAAwCC,MAAxC;;AAEA,OAAKC,IAAL,GAAY,QAAZ;AACA,OAAKC,KAAL,GAAa,OAAb;;AAEA,OAAKwC,YAAL,GAAoB,EAApB;;AAEA,OAAKnC,SAAL;AACA,OAAKwJ,UAAL;AACD,CAVD;;AAYAD,WAAWxJ,SAAX,GAAuBF,OAAO4J,MAAP,CAAc,eAAK1J,SAAnB,CAAvB;;AAEAF,OAAOC,MAAP,CAAcyJ,WAAWxJ,SAAzB,EAAoC;AAClCyJ,cAAY,sBAAW;AAAA;;AACrB,SAAKhK,OAAL,CAAa0D,OAAb,CAAqB;AAAA,aAAUwG,OAAOpH,IAAP,OAAV;AAAA,KAArB;AACD,GAHiC;;AAKlCqH,WAAS,iBAAS5F,CAAT,EAAW;AAClB,QAAI6F,cAAc,IAAI1E,WAAJ,CAAgB,UAAhB,EAA4B;AAC5CC,cAAQ;AACNpD,cAAM;AADA,OADoC;AAI5C8H,eAAS,IAJmC;AAK5CC,kBAAY;AALgC,KAA5B,CAAlB;AAOA/F,MAAEnC,MAAF,CAASyD,aAAT,CAAuBuE,WAAvB;;AAEA,SAAKrK,IAAL,CAAU8I,MAAV;AACD,GAhBiC;;AAkBlCrI,aAAW,qBAAU;AACnB,SAAKmC,YAAL,CAAkBwH,OAAlB,GAA4B,KAAKA,OAAL,CAAa9F,IAAb,CAAkB,IAAlB,CAA5B;AACA,SAAKvE,OAAL,CAAawE,gBAAb,CAA8B,OAA9B,EAAuC,KAAK3B,YAAL,CAAkBwH,OAAzD;AACD,GArBiC;;AAuBlCxG,gBAAc,wBAAU;AACtB,SAAK7D,OAAL,CAAa2E,mBAAb,CAAiC,OAAjC,EAA0C,KAAK9B,YAAL,CAAkBwH,OAA5D;AACD,GAzBiC;;AA2BlCI,uBAAqB,+BAAW;AAC9B,SAAKxK,IAAL,CAAUA,IAAV,CAAesI,SAAf,GAA2B,KAAKtI,IAAL,CAAUqI,YAArC;AACD,GA7BiC;;AA+BlCoC,iBAAe,yBAAW;AACxB,SAAKxK,OAAL,CAAa0D,OAAb,CAAqB;AAAA,aAAUwG,OAAOzG,OAAP,EAAV;AAAA,KAArB;AACD,GAjCiC;;AAmClCA,WAAS,mBAAW;AAClB,SAAK8G,mBAAL;;AAEA,SAAK5G,YAAL;AACA,SAAK6G,aAAL;AACD,GAxCiC;;AA0ClC/J,eAAasJ;AA1CqB,CAApC;;kBA8CeA,U;;;;;;;;;;;;;AC/Df;;AACA;;;;;;AAEA,IAAIU,YAAY,SAAZA,SAAY,CAAS3K,OAAT,EAAkBC,IAAlB,EAAwBC,OAAxB,EAAiCC,MAAjC,EAAyC;AACvD,iBAAKqB,IAAL,CAAU,IAAV,EAAgBxB,OAAhB,EAAyBC,IAAzB,EAA+BC,OAA/B,EAAwCC,MAAxC;;AAEA,OAAKC,IAAL,GAAY,OAAZ;AACA,OAAKC,KAAL,GAAa,OAAb;;AAEA,OAAKwC,YAAL,GAAoB,EAApB;;AAEA,OAAKnC,SAAL;AACA,OAAKwJ,UAAL;AACD,CAVD;;AAYA3J,OAAOC,MAAP,CAAcmK,UAAUlK,SAAxB,EAAmC;AACjCyJ,cAAY,sBAAW;AAAA;;AACrB,SAAKhK,OAAL,CAAa0D,OAAb,CAAqB;AAAA,aAAUwG,OAAOpH,IAAP,OAAV;AAAA,KAArB;AACD,GAHgC;;AAKjCtC,aAAW,qBAAU;AACnB,SAAKmC,YAAL,CAAkB0E,SAAlB,GAA8B,KAAKA,SAAL,CAAehD,IAAf,CAAoB,IAApB,CAA9B;AACA,SAAK1B,YAAL,CAAkB+H,KAAlB,GAA0B,KAAKA,KAAL,CAAWrG,IAAX,CAAgB,IAAhB,CAA1B;AACA,SAAK1B,YAAL,CAAkBgI,KAAlB,GAA0B,KAAKA,KAAL,CAAWtG,IAAX,CAAgB,IAAhB,CAA1B;AACA,SAAK1B,YAAL,CAAkBgF,OAAlB,GAA4B,KAAKA,OAAL,CAAatD,IAAb,CAAkB,IAAlB,CAA5B;;AAEA,SAAKvE,OAAL,CAAawE,gBAAb,CAA8B,WAA9B,EAA2C,KAAK3B,YAAL,CAAkB0E,SAA7D;AACA,SAAKvH,OAAL,CAAawE,gBAAb,CAA8B,OAA9B,EAAuC,KAAK3B,YAAL,CAAkB+H,KAAzD;AACA,SAAK5K,OAAL,CAAawE,gBAAb,CAA8B,OAA9B,EAAuC,KAAK3B,YAAL,CAAkBgI,KAAzD;AACA,SAAK7K,OAAL,CAAawE,gBAAb,CAA8B,SAA9B,EAAyC,KAAK3B,YAAL,CAAkBgF,OAA3D;AACD,GAfgC;;AAiBjChE,gBAAc,wBAAW;AACvB,SAAKiH,gBAAL,GAAwB,IAAxB;;AAEA,SAAK9K,OAAL,CAAa2E,mBAAb,CAAiC,WAAjC,EAA8C,KAAK9B,YAAL,CAAkB0E,SAAhE;AACA,SAAKvH,OAAL,CAAa2E,mBAAb,CAAiC,OAAjC,EAA0C,KAAK9B,YAAL,CAAkB+H,KAA5D;AACA,SAAK5K,OAAL,CAAa2E,mBAAb,CAAiC,OAAjC,EAA0C,KAAK9B,YAAL,CAAkBgI,KAA5D;AACA,SAAK7K,OAAL,CAAa2E,mBAAb,CAAiC,SAAjC,EAA4C,KAAK9B,YAAL,CAAkBgF,OAA9D;AACD,GAxBgC;;AA0BjC+C,SAAO,eAASnG,CAAT,EAAY;AACjB,QAAG,KAAKqG,gBAAR,EAA0B;;AAE1B,SAAK7K,IAAL,CAAUuH,IAAV;;AAEA,QAAMuD,aAAa,IAAInF,WAAJ,CAAgB,UAAhB,EAA4B;AAC7CC,cAAQ;AACNpD,cAAM,IADA;AAENuI,cAAMvG,EAAEnC,MAAF,CAAS2I;AAFT,OADqC;AAK7CV,eAAS,IALoC;AAM7CC,kBAAY;AANiC,KAA5B,CAAnB;AAQA/F,MAAEnC,MAAF,CAASyD,aAAT,CAAuBgF,UAAvB;AACD,GAxCgC;;AA0CjCxD,aAAW,mBAAS9C,CAAT,EAAY;AACrB,QAAI,KAAKqG,gBAAT,EAA2B;;AAE3B,QAAMI,aAAa,IAAItF,WAAJ,CAAgB,cAAhB,EAAgC;AACjDC,cAAQ;AACNpD,cAAM,IADA;AAENuI,cAAMvG,EAAEnC,MAAF,CAAS2I;AAFT,OADyC;AAKjDV,eAAS,IALwC;AAMjDC,kBAAY;AANqC,KAAhC,CAAnB;AAQA/F,MAAEnC,MAAF,CAASyD,aAAT,CAAuBmF,UAAvB;AACD,GAtDgC;;AAwDjCL,SAAO,eAASpG,CAAT,EAAY;AACjB,QAAI,KAAKqG,gBAAT,EAA2B;;AAE3B,SAAKK,QAAL,CAAc1G,CAAd,EAAiB,UAAjB;AACD,GA5DgC;;AA8DjCoD,WAAS,iBAASpD,CAAT,EAAY;AACnB,QAAI,KAAKqG,gBAAT,EAA2B;;AAE3B,SAAKK,QAAL,CAAc1G,CAAd,EAAiB,YAAjB;AACD,GAlEgC;;AAoEjC0G,YAAU,kBAAS1G,CAAT,EAAY2G,SAAZ,EAAuB;AAC/B,SAAKnL,IAAL,CAAUuH,IAAV;;AAEA,QAAM2D,WAAW,IAAIvF,WAAJ,CAAgBwF,SAAhB,EAA2B;AAC1CvF,cAAQ;AACNpD,cAAM,IADA;AAENuI,cAAMvG,EAAEnC,MAAF,CAAS2I,KAFT;AAGNlD,eAAOtD,EAAEsD,KAHH;AAINC,aAAKvD,EAAEuD;AAJD,OADkC;AAO1CuC,eAAS,IAPiC;AAQ1CC,kBAAY;AAR8B,KAA3B,CAAjB;AAUA/F,MAAEnC,MAAF,CAASyD,aAAT,CAAuBoF,QAAvB;AACD,GAlFgC;;AAoFjCV,uBAAqB,+BAAW;AAC9B,SAAKxK,IAAL,CAAUA,IAAV,CAAesI,SAAf,GAA2B,KAAKtI,IAAL,CAAUqI,YAArC;AACD,GAtFgC;;AAwFjCoC,iBAAe,yBAAW;AACxB,SAAKxK,OAAL,CAAa0D,OAAb,CAAqB;AAAA,aAAUwG,OAAOzG,OAAP,EAAV;AAAA,KAArB;AACD,GA1FgC;;AA4FjCA,WAAS,mBAAW;AAClB,SAAK8G,mBAAL;;AAEA,SAAK5G,YAAL;AACA,SAAK6G,aAAL;;AAEA,SAAKzK,IAAL,CAAU0D,OAAV;AACD;AAnGgC,CAAnC;;kBAsGegH,S;;;;;;;;;;;;;ACrHf;;;;AACA;;;;AACA;;;;;;AAEA,IAAMjL,eAAe,oBAAUA,YAA/B;AACA,IAAM2L,WAAW,yBAAjB;;AAEA,IAAMC,QAAQ,SAARA,KAAQ,GAAY;AACxBC,SAAO/I,OAAP,GAAiB,wBAAjB;AACD,CAFD;;AAIA8I;;kBAEeA,K","file":"./dist/droplab.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 9);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","const DATA_TRIGGER = 'data-dropdown-trigger';\nconst DATA_DROPDOWN = 'data-dropdown';\nconst SELECTED_CLASS = 'droplab-item-selected';\nconst ACTIVE_CLASS = 'droplab-item-active';\n\nconst constants = {\n  DATA_TRIGGER,\n  DATA_DROPDOWN,\n  SELECTED_CLASS,\n  ACTIVE_CLASS,\n};\n\nexport default constants;\n\n\n\n// WEBPACK FOOTER //\n// ./src/constants.js","// Polyfill for creating CustomEvents on IE9/10/11\n\n// code pulled from:\n// https://github.com/d4tocchini/customevent-polyfill\n// https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent#Polyfill\n\ntry {\n    var ce = new window.CustomEvent('test');\n    ce.preventDefault();\n    if (ce.defaultPrevented !== true) {\n        // IE has problems with .preventDefault() on custom events\n        // http://stackoverflow.com/questions/23349191\n        throw new Error('Could not prevent default');\n    }\n} catch(e) {\n  var CustomEvent = function(event, params) {\n    var evt, origPrevent;\n    params = params || {\n      bubbles: false,\n      cancelable: false,\n      detail: undefined\n    };\n\n    evt = document.createEvent(\"CustomEvent\");\n    evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);\n    origPrevent = evt.preventDefault;\n    evt.preventDefault = function () {\n      origPrevent.call(this);\n      try {\n        Object.defineProperty(this, 'defaultPrevented', {\n          get: function () {\n            return true;\n          }\n        });\n      } catch(e) {\n        this.defaultPrevented = true;\n      }\n    };\n    return evt;\n  };\n\n  CustomEvent.prototype = window.Event.prototype;\n  window.CustomEvent = CustomEvent; // expose definition to window\n}\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./~/custom-event-polyfill/custom-event-polyfill.js\n// module id = 1\n// module chunks = 0","import DropDown from './dropdown';\n\nvar Hook = function(trigger, list, plugins, config){\n  this.trigger = trigger;\n  this.list = new DropDown(list);\n  this.type = 'Hook';\n  this.event = 'click';\n  this.plugins = plugins || [];\n  this.config = config || {};\n  this.id = trigger.id;\n};\n\nObject.assign(Hook.prototype, {\n\n  addEvents: function(){},\n\n  constructor: Hook,\n});\n\nexport default Hook;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook.js","import constants from './constants';\n\nconst { DATA_TRIGGER, DATA_DROPDOWN } = constants;\n\nconst utils = {\n  toCamelCase(attr) {\n    return this.camelize(attr.split('-').slice(1).join(' '));\n  },\n\n  t(s, d) {\n    for (const p in d) {\n      if (Object.prototype.hasOwnProperty.call(d, p)) {\n        s = s.replace(new RegExp(`{{${p}}}`, 'g'), d[p]);\n      }\n    }\n    return s;\n  },\n\n  camelize(str) {\n    return str.replace(/(?:^\\w|[A-Z]|\\b\\w)/g, (letter, index) => {\n      return index === 0 ? letter.toLowerCase() : letter.toUpperCase();\n    }).replace(/\\s+/g, '');\n  },\n\n  closest(thisTag, stopTag) {\n    while (thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML') {\n      thisTag = thisTag.parentNode;\n    }\n    return thisTag;\n  },\n\n  isDropDownParts(target) {\n    if (!target || target.tagName === 'HTML') return false;\n    return target.hasAttribute(DATA_TRIGGER) || target.hasAttribute(DATA_DROPDOWN);\n  },\n};\n\n\nexport default utils;\n\n\n\n// WEBPACK FOOTER //\n// ./src/utils.js","import 'custom-event-polyfill';\nimport HookButton from './hook_button';\nimport HookInput from './hook_input';\nimport utils from './utils';\nimport constants from './constants';\nconst DATA_TRIGGER = constants.DATA_TRIGGER;\n\nexport default function () {\n  var DropLab = function(hook, list) {\n    if (!this instanceof DropLab) return new DropLab(hook);\n\n    this.ready = false;\n    this.hooks = [];\n    this.queuedData = [];\n    this.config = {};\n\n    this.eventWrapper = {};\n\n    if (!hook) return this.loadStatic();\n    this.addHook(hook, list);\n    this.init();\n  };\n\n  Object.assign(DropLab.prototype, {\n    loadStatic: function(){\n      var dropdownTriggers = [].slice.apply(document.querySelectorAll(`[${DATA_TRIGGER}]`));\n      this.addHooks(dropdownTriggers).init();\n    },\n\n    addData: function () {\n      var args = [].slice.apply(arguments);\n      this.applyArgs(args, '_addData');\n    },\n\n    setData: function() {\n      var args = [].slice.apply(arguments);\n      this.applyArgs(args, '_setData');\n    },\n\n    destroy: function() {\n      this.hooks.forEach(hook => hook.destroy());\n      this.hooks = [];\n      this.removeEvents();\n    },\n\n    applyArgs: function(args, methodName) {\n      if (this.ready) return this[methodName].apply(this, args);\n\n      this.queuedData = this.queuedData || [];\n      this.queuedData.push(args);\n    },\n\n    _addData: function(trigger, data) {\n      this._processData(trigger, data, 'addData');\n    },\n\n    _setData: function(trigger, data) {\n      this._processData(trigger, data, 'setData');\n    },\n\n    _processData: function(trigger, data, methodName) {\n      this.hooks.forEach((hook) => {\n        if (Array.isArray(trigger)) hook.list[methodName](trigger);\n\n        if (hook.trigger.id === trigger) hook.list[methodName](data);\n      });\n    },\n\n    addEvents: function() {\n      this.eventWrapper.documentClicked = this.documentClicked.bind(this)\n      document.addEventListener('click', this.eventWrapper.documentClicked);\n    },\n\n    documentClicked: function(e) {\n      let thisTag = e.target;\n\n      if (thisTag.tagName !== 'UL') thisTag = utils.closest(thisTag, 'UL');\n      if (utils.isDropDownParts(thisTag, this.hooks) || utils.isDropDownParts(e.target, this.hooks)) return;\n\n      this.hooks.forEach(hook => hook.list.hide());\n    },\n\n    removeEvents: function(){\n      document.removeEventListener('click', this.eventWrapper.documentClicked);\n    },\n\n    changeHookList: function(trigger, list, plugins, config) {\n      const availableTrigger =  typeof trigger === 'string' ? document.getElementById(trigger) : trigger;\n\n\n      this.hooks.forEach((hook, i) => {\n        hook.list.list.dataset.dropdownActive = false;\n\n        if (hook.trigger !== availableTrigger) return;\n\n        hook.destroy();\n        this.hooks.splice(i, 1);\n        this.addHook(availableTrigger, list, plugins, config);\n      });\n    },\n\n    addHook: function(hook, list, plugins, config) {\n      const availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook;\n      let availableList;\n\n      if (typeof list === 'string') {\n        availableList = document.querySelector(list);\n      } else if (list instanceof Element) {\n        availableList = list;\n      } else {\n        availableList = document.querySelector(hook.dataset[utils.toCamelCase(DATA_TRIGGER)]);\n      }\n\n      availableList.dataset.dropdownActive = true;\n\n      const HookObject = availableHook.tagName === 'INPUT' ? HookInput : HookButton;\n      this.hooks.push(new HookObject(availableHook, availableList, plugins, config));\n\n      return this;\n    },\n\n    addHooks: function(hooks, plugins, config) {\n      hooks.forEach(hook => this.addHook(hook, null, plugins, config));\n      return this;\n    },\n\n    setConfig: function(obj){\n      this.config = obj;\n    },\n\n    fireReady: function() {\n      const readyEvent = new CustomEvent('ready.dl', {\n        detail: {\n          dropdown: this,\n        },\n      });\n      document.dispatchEvent(readyEvent);\n\n      this.ready = true;\n    },\n\n    init: function () {\n      this.addEvents();\n\n      this.fireReady();\n\n      this.queuedData.forEach(data => this.addData(data));\n      this.queuedData = [];\n\n      return this;\n    },\n  });\n\n  return DropLab;\n};\n\n\n\n// WEBPACK FOOTER //\n// ./src/droplab.js","import constants from './constants';\n\nexport default function () {\n  var currentKey;\n  var currentFocus;\n  var isUpArrow = false;\n  var isDownArrow = false;\n  var removeHighlight = function removeHighlight(list) {\n    var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0);\n    var listItems = [];\n    for(var i = 0; i < itemElements.length; i++) {\n      var listItem = itemElements[i];\n      listItem.classList.remove(constants.ACTIVE_CLASS);\n\n      if (listItem.style.display !== 'none') {\n        listItems.push(listItem);\n      }\n    }\n    return listItems;\n  };\n\n  var setMenuForArrows = function setMenuForArrows(list) {\n    var listItems = removeHighlight(list);\n    if(list.currentIndex>0){\n      if(!listItems[list.currentIndex-1]){\n        list.currentIndex = list.currentIndex-1;\n      }\n\n      if (listItems[list.currentIndex-1]) {\n        var el = listItems[list.currentIndex-1];\n        var filterDropdownEl = el.closest('.filter-dropdown');\n        el.classList.add(constants.ACTIVE_CLASS);\n\n        if (filterDropdownEl) {\n          var filterDropdownBottom = filterDropdownEl.offsetHeight;\n          var elOffsetTop = el.offsetTop - 30;\n\n          if (elOffsetTop > filterDropdownBottom) {\n            filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom;\n          }\n        }\n      }\n    }\n  };\n\n  var mousedown = function mousedown(e) {\n    var list = e.detail.hook.list;\n    removeHighlight(list);\n    list.show();\n    list.currentIndex = 0;\n    isUpArrow = false;\n    isDownArrow = false;\n  };\n  var selectItem = function selectItem(list) {\n    var listItems = removeHighlight(list);\n    var currentItem = listItems[list.currentIndex-1];\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: list,\n        selected: currentItem,\n        data: currentItem.dataset,\n      },\n    });\n    list.list.dispatchEvent(listEvent);\n    list.hide();\n  }\n\n  var keydown = function keydown(e){\n    var typedOn = e.target;\n    var list = e.detail.hook.list;\n    var currentIndex = list.currentIndex;\n    isUpArrow = false;\n    isDownArrow = false;\n\n    if(e.detail.which){\n      currentKey = e.detail.which;\n      if(currentKey === 13){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 38) {\n        isUpArrow = true;\n      }\n      if(currentKey === 40) {\n        isDownArrow = true;\n      }\n    } else if(e.detail.key) {\n      currentKey = e.detail.key;\n      if(currentKey === 'Enter'){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 'ArrowUp') {\n        isUpArrow = true;\n      }\n      if(currentKey === 'ArrowDown') {\n        isDownArrow = true;\n      }\n    }\n    if(isUpArrow){ currentIndex--; }\n    if(isDownArrow){ currentIndex++; }\n    if(currentIndex < 0){ currentIndex = 0; }\n    list.currentIndex = currentIndex;\n    setMenuForArrows(e.detail.hook.list);\n  };\n\n  document.addEventListener('mousedown.dl', mousedown);\n  document.addEventListener('keydown.dl', keydown);\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/keyboard.js","import 'custom-event-polyfill';\nimport utils from './utils';\nimport constants from '../src/constants';\n\nvar DropDown = function(list) {\n  this.currentIndex = 0;\n  this.hidden = true;\n  this.list = typeof list === 'string' ? document.querySelector(list) : list;\n  this.items = [];\n\n  this.eventWrapper = {};\n\n  this.getItems();\n  this.initTemplateString();\n  this.addEvents();\n\n  this.initialState = list.innerHTML;\n};\n\nObject.assign(DropDown.prototype, {\n  getItems: function() {\n    this.items = [].slice.call(this.list.querySelectorAll('li'));\n    return this.items;\n  },\n\n  initTemplateString: function() {\n    var items = this.items || this.getItems();\n\n    var templateString = '';\n    if (items.length > 0) templateString = items[items.length - 1].outerHTML;\n    this.templateString = templateString;\n\n    return this.templateString;\n  },\n\n  clickEvent: function(e) {\n    var selected = utils.closest(e.target, 'LI');\n    if (!selected) return;\n\n    this.addSelectedClass(selected);\n\n    e.preventDefault();\n    this.hide();\n\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: this,\n        selected: selected,\n        data: e.target.dataset,\n      },\n    });\n    this.list.dispatchEvent(listEvent);\n  },\n\n  addSelectedClass: function (selected) {\n    this.removeSelectedClasses();\n    selected.classList.add(constants.SELECTED_CLASS);\n  },\n\n  removeSelectedClasses: function () {\n    const items = this.items || this.getItems();\n\n    items.forEach((item) => {\n      item.classList.remove(constants.SELECTED_CLASS)\n    });\n  },\n\n  addEvents: function() {\n    this.eventWrapper.clickEvent = this.clickEvent.bind(this)\n    this.list.addEventListener('click', this.eventWrapper.clickEvent);\n  },\n\n  toggle: function() {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  setData: function(data) {\n    this.data = data;\n    this.render(data);\n  },\n\n  addData: function(data) {\n    this.data = (this.data || []).concat(data);\n    this.render(this.data);\n  },\n\n  render: function(data) {\n    const children = data ? data.map(this.renderChildren.bind(this)) : [];\n    const renderableList = this.list.querySelector('ul[data-dynamic]') || this.list;\n\n    renderableList.innerHTML = children.join('');\n  },\n\n  renderChildren: function(data) {\n    var html = utils.t(this.templateString, data);\n    var template = document.createElement('div');\n\n    template.innerHTML = html;\n    this.setImagesSrc(template);\n    template.firstChild.style.display = data.droplab_hidden ? 'none' : 'block';\n\n    return template.firstChild.outerHTML;\n  },\n\n  setImagesSrc: function(template) {\n    const images = [].slice.call(template.querySelectorAll('img[data-src]'));\n\n    images.forEach((image) => {\n      image.src = image.getAttribute('data-src');\n      image.removeAttribute('data-src');\n    });\n  },\n\n  show: function() {\n    if (!this.hidden) return;\n    this.list.style.display = 'block';\n    this.currentIndex = 0;\n    this.hidden = false;\n  },\n\n  hide: function() {\n    if (this.hidden) return;\n    this.list.style.display = 'none';\n    this.currentIndex = 0;\n    this.hidden = true;\n  },\n\n  toggle: function () {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  destroy: function() {\n    this.hide();\n    this.list.removeEventListener('click', this.eventWrapper.clickEvent);\n  }\n});\n\nexport default DropDown;\n\n\n\n// WEBPACK FOOTER //\n// ./src/dropdown.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookButton = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'button';\n  this.event = 'click';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nHookButton.prototype = Object.create(Hook.prototype);\n\nObject.assign(HookButton.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  clicked: function(e){\n    var buttonEvent = new CustomEvent('click.dl', {\n      detail: {\n        hook: this,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(buttonEvent);\n\n    this.list.toggle();\n  },\n\n  addEvents: function(){\n    this.eventWrapper.clicked = this.clicked.bind(this);\n    this.trigger.addEventListener('click', this.eventWrapper.clicked);\n  },\n\n  removeEvents: function(){\n    this.trigger.removeEventListener('click', this.eventWrapper.clicked);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n  },\n\n  constructor: HookButton,\n});\n\n\nexport default HookButton;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_button.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookInput = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'input';\n  this.event = 'input';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nObject.assign(HookInput.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  addEvents: function(){\n    this.eventWrapper.mousedown = this.mousedown.bind(this);\n    this.eventWrapper.input = this.input.bind(this);\n    this.eventWrapper.keyup = this.keyup.bind(this);\n    this.eventWrapper.keydown = this.keydown.bind(this);\n\n    this.trigger.addEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.addEventListener('input', this.eventWrapper.input);\n    this.trigger.addEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.addEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  removeEvents: function() {\n    this.hasRemovedEvents = true;\n\n    this.trigger.removeEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.removeEventListener('input', this.eventWrapper.input);\n    this.trigger.removeEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.removeEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  input: function(e) {\n    if(this.hasRemovedEvents) return;\n\n    this.list.show();\n\n    const inputEvent = new CustomEvent('input.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(inputEvent);\n  },\n\n  mousedown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    const mouseEvent = new CustomEvent('mousedown.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(mouseEvent);\n  },\n\n  keyup: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keyup.dl');\n  },\n\n  keydown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keydown.dl');\n  },\n\n  keyEvent: function(e, eventName) {\n    this.list.show();\n\n    const keyEvent = new CustomEvent(eventName, {\n      detail: {\n        hook: this,\n        text: e.target.value,\n        which: e.which,\n        key: e.key,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(keyEvent);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n\n    this.list.destroy();\n  }\n});\n\nexport default HookInput;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_input.js","import DropLab from './droplab';\nimport constants from './constants';\nimport Keyboard from './keyboard';\n\nconst DATA_TRIGGER = constants.DATA_TRIGGER;\nconst keyboard = Keyboard();\n\nconst setup = function () {\n  window.DropLab = DropLab();\n};\n\nsetup();\n\nexport default setup\n\n\n\n// WEBPACK FOOTER //\n// ./src/index.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/droplab_ajax.js b/app/assets/javascripts/droplab/droplab_ajax.js deleted file mode 100644 index 020f8b4ac65..00000000000 --- a/app/assets/javascripts/droplab/droplab_ajax.js +++ /dev/null @@ -1,103 +0,0 @@ -/* eslint-disable */ -(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g=(g.droplab||(g.droplab = {}));g=(g.ajax||(g.ajax = {}));g=(g.datasource||(g.datasource = {}));g.js = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o -1; - var focusEvent = e.type === 'focus'; - - if (invalidKeyPressed || this.loading) { - return; - } - - if (this.timeout) { - clearTimeout(this.timeout); - } - - this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200); - }, - - trigger: function trigger(getEntireList) { - var config = this.hook.config.droplabAjaxFilter; - var searchValue = this.trigger.value; - - if (!config || !config.endpoint || !config.searchKey) { - return; - } - - if (config.searchValueFunction) { - searchValue = config.searchValueFunction(); - } - - if (config.loadingTemplate && this.hook.list.data === undefined || - this.hook.list.data.length === 0) { - var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); - - var loadingTemplate = document.createElement('div'); - loadingTemplate.innerHTML = config.loadingTemplate; - loadingTemplate.setAttribute('data-loading-template', true); - - this.listTemplate = dynamicList.outerHTML; - dynamicList.outerHTML = loadingTemplate.outerHTML; - } - - if (getEntireList) { - searchValue = ''; - } - - if (config.searchKey === searchValue) { - return this.list.show(); - } - - this.loading = true; - - var params = config.params || {}; - params[config.searchKey] = searchValue; - var self = this; - self.cache = self.cache || {}; - var url = config.endpoint + this.buildParams(params); - var urlCachedData = self.cache[url]; - - if (urlCachedData) { - self._loadData(urlCachedData, config, self); - } else { - this._loadUrlData(url) - .then(function(data) { - self._loadData(data, config, self); - }, function(xhrError) { - // TODO: properly handle errors due to XHR cancellation - return; - }); - } - }, - - _loadUrlData: function _loadUrlData(url) { - var self = this; - return new Promise(function(resolve, reject) { - var xhr = new XMLHttpRequest; - xhr.open('GET', url, true); - xhr.onreadystatechange = function () { - if(xhr.readyState === XMLHttpRequest.DONE) { - if (xhr.status === 200) { - var data = JSON.parse(xhr.responseText); - self.cache[url] = data; - return resolve(data); - } else { - return reject([xhr.responseText, xhr.status]); - } - } - }; - xhr.send(); - }); - }, - - _loadData: function _loadData(data, config, self) { - if (config.loadingTemplate && self.hook.list.data === undefined || - self.hook.list.data.length === 0) { - const dataLoadingTemplate = self.hook.list.list.querySelector('[data-loading-template]'); - - if (dataLoadingTemplate) { - dataLoadingTemplate.outerHTML = self.listTemplate; - } - } - - if (!self.destroyed) { - var hookListChildren = self.hook.list.list.children; - var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic'); - - if (onlyDynamicList && data.length === 0) { - self.hook.list.hide(); - } - - self.hook.list.setData.call(self.hook.list, data); - } - self.notLoading(); - self.hook.list.currentIndex = 0; - }, - - buildParams: function(params) { - if (!params) return ''; - var paramsArray = Object.keys(params).map(function(param) { - return param + '=' + (params[param] || ''); - }); - return '?' + paramsArray.join('&'); - }, - - destroy: function destroy() { - if (this.timeout) { - clearTimeout(this.timeout); - } - - this.destroyed = true; - - this.hook.trigger.removeEventListener('keydown.dl', this.debounceTriggerWrapper); - this.hook.trigger.removeEventListener('focus', this.debounceTriggerWrapper); - } - }; -}); -},{"../window":2}],2:[function(require,module,exports){ -module.exports = function(callback) { - return (function() { - callback(this); - }).call(null); -}; - -},{}]},{},[1])(1) -}); diff --git a/app/assets/javascripts/droplab/plugins/ajax.js b/app/assets/javascripts/droplab/plugins/ajax.js new file mode 100644 index 00000000000..e68983416ec --- /dev/null +++ b/app/assets/javascripts/droplab/plugins/ajax.js @@ -0,0 +1,159 @@ +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) +/******/ return installedModules[moduleId].exports; +/******/ +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // identity function for calling harmony imports with the correct context +/******/ __webpack_require__.i = function(value) { return value; }; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { +/******/ configurable: false, +/******/ enumerable: true, +/******/ get: getter +/******/ }); +/******/ } +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = 10); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ 10: +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +function droplabAjaxException(message) { + this.message = message; +} + +var droplabAjax = { + _loadUrlData: function _loadUrlData(url) { + var self = this; + return new Promise(function (resolve, reject) { + var xhr = new XMLHttpRequest(); + xhr.open('GET', url, true); + xhr.onreadystatechange = function () { + if (xhr.readyState === XMLHttpRequest.DONE) { + if (xhr.status === 200) { + var data = JSON.parse(xhr.responseText); + self.cache[url] = data; + return resolve(data); + } else { + return reject([xhr.responseText, xhr.status]); + } + } + }; + xhr.send(); + }); + }, + _loadData: function _loadData(data, config, self) { + if (config.loadingTemplate) { + var dataLoadingTemplate = self.hook.list.list.querySelector('[data-loading-template]'); + if (dataLoadingTemplate) dataLoadingTemplate.outerHTML = self.listTemplate; + } + + if (!self.destroyed) self.hook.list[config.method].call(self.hook.list, data); + }, + init: function init(hook) { + var self = this; + self.destroyed = false; + self.cache = self.cache || {}; + var config = hook.config.droplabAjax; + this.hook = hook; + if (!config || !config.endpoint || !config.method) { + return; + } + if (config.method !== 'setData' && config.method !== 'addData') { + return; + } + if (config.loadingTemplate) { + var dynamicList = hook.list.list.querySelector('[data-dynamic]'); + var loadingTemplate = document.createElement('div'); + loadingTemplate.innerHTML = config.loadingTemplate; + loadingTemplate.setAttribute('data-loading-template', ''); + this.listTemplate = dynamicList.outerHTML; + dynamicList.outerHTML = loadingTemplate.outerHTML; + } + if (self.cache[config.endpoint]) { + self._loadData(self.cache[config.endpoint], config, self); + } else { + this._loadUrlData(config.endpoint).then(function (d) { + self._loadData(d, config, self); + }).catch(function (e) { + throw new droplabAjaxException(e.message || e); + }); + } + }, + destroy: function destroy() { + this.destroyed = true; + + var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); + if (this.listTemplate && dynamicList) { + dynamicList.outerHTML = this.listTemplate; + } + } +}; + +window.droplabAjax = droplabAjax; + +exports.default = droplabAjax; + +/***/ }) + +/******/ }); +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c?ec5f***","webpack:///./src/plugins/ajax.js"],"names":["droplabAjaxException","message","droplabAjax","_loadUrlData","url","self","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","data","JSON","parse","responseText","cache","send","_loadData","config","loadingTemplate","dataLoadingTemplate","hook","list","querySelector","outerHTML","listTemplate","destroyed","method","call","init","endpoint","dynamicList","document","createElement","innerHTML","setAttribute","then","d","catch","e","destroy","window"],"mappings":"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","file":"./dist/plugins/ajax.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 10);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","function droplabAjaxException(message) {\n  this.message = message;\n}\n\nconst droplabAjax = {\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n  _loadData: function _loadData(data, config, self) {\n    if (config.loadingTemplate) {\n      var dataLoadingTemplate = self.hook.list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) dataLoadingTemplate.outerHTML = self.listTemplate;\n    }\n\n    if (!self.destroyed) self.hook.list[config.method].call(self.hook.list, data);\n  },\n  init: function init(hook) {\n    var self = this;\n    self.destroyed = false;\n    self.cache = self.cache || {};\n    var config = hook.config.droplabAjax;\n    this.hook = hook;\n    if (!config || !config.endpoint || !config.method) {\n      return;\n    }\n    if (config.method !== 'setData' && config.method !== 'addData') {\n      return;\n    }\n    if (config.loadingTemplate) {\n      var dynamicList = hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', '');\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (self.cache[config.endpoint]) {\n      self._loadData(self.cache[config.endpoint], config, self);\n    } else {\n      this._loadUrlData(config.endpoint)\n        .then(function(d) {\n          self._loadData(d, config, self);\n        }).catch(function(e) {\n          throw new droplabAjaxException(e.message || e);\n        });\n    }\n  },\n  destroy: function() {\n    this.destroyed = true;\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nwindow.droplabAjax = droplabAjax;\n\nexport default droplabAjax;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/ajax_filter.js b/app/assets/javascripts/droplab/plugins/ajax_filter.js new file mode 100644 index 00000000000..b5892694e60 --- /dev/null +++ b/app/assets/javascripts/droplab/plugins/ajax_filter.js @@ -0,0 +1,216 @@ +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) +/******/ return installedModules[moduleId].exports; +/******/ +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // identity function for calling harmony imports with the correct context +/******/ __webpack_require__.i = function(value) { return value; }; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { +/******/ configurable: false, +/******/ enumerable: true, +/******/ get: getter +/******/ }); +/******/ } +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = 11); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ 11: +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +var droplabAjaxFilter = { + init: function init(hook) { + this.destroyed = false; + this.hook = hook; + this.notLoading(); + + this.eventWrapper = {}; + this.eventWrapper.debounceTrigger = this.debounceTrigger.bind(this); + this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceTrigger); + this.hook.trigger.addEventListener('focus', this.eventWrapper.debounceTrigger); + + this.trigger(true); + }, + + notLoading: function notLoading() { + this.loading = false; + }, + + debounceTrigger: function debounceTrigger(e) { + var NON_CHARACTER_KEYS = [16, 17, 18, 20, 37, 38, 39, 40, 91, 93]; + var invalidKeyPressed = NON_CHARACTER_KEYS.indexOf(e.detail.which || e.detail.keyCode) > -1; + var focusEvent = e.type === 'focus'; + if (invalidKeyPressed || this.loading) { + return; + } + if (this.timeout) { + clearTimeout(this.timeout); + } + this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200); + }, + + trigger: function trigger(getEntireList) { + var config = this.hook.config.droplabAjaxFilter; + var searchValue = this.trigger.value; + if (!config || !config.endpoint || !config.searchKey) { + return; + } + if (config.searchValueFunction) { + searchValue = config.searchValueFunction(); + } + if (config.loadingTemplate && this.hook.list.data === undefined || this.hook.list.data.length === 0) { + var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); + var loadingTemplate = document.createElement('div'); + loadingTemplate.innerHTML = config.loadingTemplate; + loadingTemplate.setAttribute('data-loading-template', true); + this.listTemplate = dynamicList.outerHTML; + dynamicList.outerHTML = loadingTemplate.outerHTML; + } + if (getEntireList) { + searchValue = ''; + } + if (config.searchKey === searchValue) { + return this.list.show(); + } + this.loading = true; + var params = config.params || {}; + params[config.searchKey] = searchValue; + var self = this; + self.cache = self.cache || {}; + var url = config.endpoint + this.buildParams(params); + var urlCachedData = self.cache[url]; + if (urlCachedData) { + self._loadData(urlCachedData, config, self); + } else { + this._loadUrlData(url).then(function (data) { + self._loadData(data, config, self); + }); + } + }, + + _loadUrlData: function _loadUrlData(url) { + var self = this; + return new Promise(function (resolve, reject) { + var xhr = new XMLHttpRequest(); + xhr.open('GET', url, true); + xhr.onreadystatechange = function () { + if (xhr.readyState === XMLHttpRequest.DONE) { + if (xhr.status === 200) { + var data = JSON.parse(xhr.responseText); + self.cache[url] = data; + return resolve(data); + } else { + return reject([xhr.responseText, xhr.status]); + } + } + }; + xhr.send(); + }); + }, + + _loadData: function _loadData(data, config, self) { + var list = self.hook.list; + if (config.loadingTemplate && list.data === undefined || list.data.length === 0) { + var dataLoadingTemplate = list.list.querySelector('[data-loading-template]'); + if (dataLoadingTemplate) { + dataLoadingTemplate.outerHTML = self.listTemplate; + } + } + if (!self.destroyed) { + var hookListChildren = list.list.children; + var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic'); + if (onlyDynamicList && data.length === 0) { + list.hide(); + } + list.setData.call(list, data); + } + self.notLoading(); + list.currentIndex = 0; + }, + + buildParams: function buildParams(params) { + if (!params) return ''; + var paramsArray = Object.keys(params).map(function (param) { + return param + '=' + (params[param] || ''); + }); + return '?' + paramsArray.join('&'); + }, + + destroy: function destroy() { + if (this.timeout) { + clearTimeout(this.timeout); + } + + this.destroyed = true; + this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceTrigger); + this.hook.trigger.removeEventListener('focus', this.eventWrapper.debounceTrigger); + } +}; + +window.droplabAjaxFilter = droplabAjaxFilter; + +exports.default = droplabAjaxFilter; + +/***/ }) + +/******/ }); +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c?ec5f**","webpack:///./src/plugins/ajax_filter.js"],"names":["droplabAjaxFilter","init","hook","destroyed","notLoading","eventWrapper","debounceTrigger","bind","trigger","addEventListener","loading","e","NON_CHARACTER_KEYS","invalidKeyPressed","indexOf","detail","which","keyCode","focusEvent","type","timeout","clearTimeout","setTimeout","getEntireList","config","searchValue","value","endpoint","searchKey","searchValueFunction","loadingTemplate","list","data","undefined","length","dynamicList","querySelector","document","createElement","innerHTML","setAttribute","listTemplate","outerHTML","show","params","self","cache","url","buildParams","urlCachedData","_loadData","_loadUrlData","then","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","JSON","parse","responseText","send","dataLoadingTemplate","hookListChildren","children","onlyDynamicList","hasAttribute","hide","setData","call","currentIndex","paramsArray","Object","keys","map","param","join","destroy","removeEventListener","window"],"mappings":"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","file":"./dist/plugins/ajax_filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 11);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","const droplabAjaxFilter = {\n  init: function(hook) {\n    this.destroyed = false;\n    this.hook = hook;\n    this.notLoading();\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceTrigger = this.debounceTrigger.bind(this);\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.addEventListener('focus', this.eventWrapper.debounceTrigger);\n\n    this.trigger(true);\n  },\n\n  notLoading: function notLoading() {\n    this.loading = false;\n  },\n\n  debounceTrigger: function debounceTrigger(e) {\n    var NON_CHARACTER_KEYS = [16, 17, 18, 20, 37, 38, 39, 40, 91, 93];\n    var invalidKeyPressed = NON_CHARACTER_KEYS.indexOf(e.detail.which || e.detail.keyCode) > -1;\n    var focusEvent = e.type === 'focus';\n    if (invalidKeyPressed || this.loading) {\n      return;\n    }\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n    this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200);\n  },\n\n  trigger: function trigger(getEntireList) {\n    var config = this.hook.config.droplabAjaxFilter;\n    var searchValue = this.trigger.value;\n    if (!config || !config.endpoint || !config.searchKey) {\n      return;\n    }\n    if (config.searchValueFunction) {\n      searchValue = config.searchValueFunction();\n    }\n    if (config.loadingTemplate && this.hook.list.data === undefined ||\n      this.hook.list.data.length === 0) {\n      var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', true);\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (getEntireList) {\n      searchValue = '';\n    }\n    if (config.searchKey === searchValue) {\n      return this.list.show();\n    }\n    this.loading = true;\n    var params = config.params || {};\n    params[config.searchKey] = searchValue;\n    var self = this;\n    self.cache = self.cache || {};\n    var url = config.endpoint + this.buildParams(params);\n    var urlCachedData = self.cache[url];\n    if (urlCachedData) {\n      self._loadData(urlCachedData, config, self);\n    } else {\n      this._loadUrlData(url)\n        .then(function(data) {\n          self._loadData(data, config, self);\n        });\n    }\n  },\n\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n\n  _loadData: function _loadData(data, config, self) {\n    const list = self.hook.list;\n    if (config.loadingTemplate && list.data === undefined ||\n      list.data.length === 0) {\n      const dataLoadingTemplate = list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) {\n        dataLoadingTemplate.outerHTML = self.listTemplate;\n      }\n    }\n    if (!self.destroyed) {\n      var hookListChildren = list.list.children;\n      var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic');\n      if (onlyDynamicList && data.length === 0) {\n        list.hide();\n      }\n      list.setData.call(list, data);\n    }\n    self.notLoading();\n    list.currentIndex = 0;\n  },\n\n  buildParams: function(params) {\n    if (!params) return '';\n    var paramsArray = Object.keys(params).map(function(param) {\n      return param + '=' + (params[param] || '');\n    });\n    return '?' + paramsArray.join('&');\n  },\n\n  destroy: function destroy() {\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n\n    this.destroyed = true;\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.removeEventListener('focus', this.eventWrapper.debounceTrigger);\n  }\n};\n\nwindow.droplabAjaxFilter = droplabAjaxFilter;\n\nexport default droplabAjaxFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax_filter.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/filter.js b/app/assets/javascripts/droplab/plugins/filter.js new file mode 100644 index 00000000000..183d137b3a3 --- /dev/null +++ b/app/assets/javascripts/droplab/plugins/filter.js @@ -0,0 +1,172 @@ +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) +/******/ return installedModules[moduleId].exports; +/******/ +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // identity function for calling harmony imports with the correct context +/******/ __webpack_require__.i = function(value) { return value; }; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { +/******/ configurable: false, +/******/ enumerable: true, +/******/ get: getter +/******/ }); +/******/ } +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = 12); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ 12: +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +var droplabFilter = { + keydown: function keydown(e) { + var hiddenCount = 0; + var dataHiddenCount = 0; + + var list = e.detail.hook.list; + var data = list.data; + var value = e.detail.hook.trigger.value.toLowerCase(); + var config = e.detail.hook.config.droplabFilter; + var matches = []; + var filterFunction; + // will only work on dynamically set data + if (!data) { + return; + } + + if (config && config.filterFunction && typeof config.filterFunction === 'function') { + filterFunction = config.filterFunction; + } else { + filterFunction = function filterFunction(o) { + // cheap string search + o.droplab_hidden = o[config.template].toLowerCase().indexOf(value) === -1; + return o; + }; + } + + dataHiddenCount = data.filter(function (o) { + return !o.droplab_hidden; + }).length; + + matches = data.map(function (o) { + return filterFunction(o, value); + }); + + hiddenCount = matches.filter(function (o) { + return !o.droplab_hidden; + }).length; + + if (dataHiddenCount !== hiddenCount) { + list.render(matches); + list.currentIndex = 0; + } + }, + + debounceKeydown: function debounceKeydown(e) { + if ([13, // enter + 16, // shift + 17, // ctrl + 18, // alt + 20, // caps lock + 37, // left arrow + 38, // up arrow + 39, // right arrow + 40, // down arrow + 91, // left window + 92, // right window + 93].indexOf(e.detail.which || e.detail.keyCode) > -1) return; + + if (this.timeout) clearTimeout(this.timeout); + this.timeout = setTimeout(this.keydown.bind(this, e), 200); + }, + + init: function init(hook) { + var config = hook.config.droplabFilter; + + if (!config || !config.template) return; + + this.hook = hook; + + this.eventWrapper = {}; + this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this); + + this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown); + }, + + destroy: function destroy() { + this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown); + + var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); + if (this.listTemplate && dynamicList) { + dynamicList.outerHTML = this.listTemplate; + } + } +}; + +window.droplabFilter = droplabFilter; + +exports.default = droplabFilter; + +/***/ }) + +/******/ }); +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c?ec5f*","webpack:///./src/plugins/filter.js"],"names":["droplabFilter","keydown","e","hiddenCount","dataHiddenCount","list","detail","hook","data","value","trigger","toLowerCase","config","matches","filterFunction","o","droplab_hidden","template","indexOf","filter","length","map","render","currentIndex","debounceKeydown","which","keyCode","timeout","clearTimeout","setTimeout","bind","init","eventWrapper","addEventListener","destroy","removeEventListener","dynamicList","querySelector","listTemplate","outerHTML","window"],"mappings":"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","file":"./dist/plugins/filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 12);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","const droplabFilter = {\n  keydown: function(e){\n    var hiddenCount = 0;\n    var dataHiddenCount = 0;\n\n    var list = e.detail.hook.list;\n    var data = list.data;\n    var value = e.detail.hook.trigger.value.toLowerCase();\n    var config = e.detail.hook.config.droplabFilter;\n    var matches = [];\n    var filterFunction;\n    // will only work on dynamically set data\n    if(!data){\n      return;\n    }\n\n    if (config && config.filterFunction && typeof config.filterFunction === 'function') {\n      filterFunction = config.filterFunction;\n    } else {\n      filterFunction = function(o){\n        // cheap string search\n        o.droplab_hidden = o[config.template].toLowerCase().indexOf(value) === -1;\n        return o;\n      };\n    }\n\n    dataHiddenCount = data.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    matches = data.map(function(o) {\n      return filterFunction(o, value);\n    });\n\n    hiddenCount = matches.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    if (dataHiddenCount !== hiddenCount) {\n      list.render(matches);\n      list.currentIndex = 0;\n    }\n  },\n\n  debounceKeydown: function debounceKeydown(e) {\n    if ([\n      13, // enter\n      16, // shift\n      17, // ctrl\n      18, // alt\n      20, // caps lock\n      37, // left arrow\n      38, // up arrow\n      39, // right arrow\n      40, // down arrow\n      91, // left window\n      92, // right window\n      93, // select\n    ].indexOf(e.detail.which || e.detail.keyCode) > -1) return;\n\n    if (this.timeout) clearTimeout(this.timeout);\n    this.timeout = setTimeout(this.keydown.bind(this, e), 200);\n  },\n\n  init: function init(hook) {\n    var config = hook.config.droplabFilter;\n\n    if (!config || !config.template) return;\n\n    this.hook = hook;\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this);\n\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n  },\n\n  destroy: function destroy() {\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nwindow.droplabFilter = droplabFilter;\n\nexport default droplabFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/filter.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/input_setter.js b/app/assets/javascripts/droplab/plugins/input_setter.js new file mode 100644 index 00000000000..ffc9af0476d --- /dev/null +++ b/app/assets/javascripts/droplab/plugins/input_setter.js @@ -0,0 +1,129 @@ +/******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) +/******/ return installedModules[moduleId].exports; +/******/ +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // identity function for calling harmony imports with the correct context +/******/ __webpack_require__.i = function(value) { return value; }; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { +/******/ configurable: false, +/******/ enumerable: true, +/******/ get: getter +/******/ }); +/******/ } +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = 13); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ 13: +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +var droplabInputSetter = { + init: function init(hook) { + this.hook = hook; + this.config = hook.config.droplabInputSetter || (this.hook.config.droplabInputSetter = {}); + + this.eventWrapper = {}; + + this.addEvents(); + }, + addEvents: function addEvents() { + this.eventWrapper.setInputs = this.setInputs.bind(this); + this.hook.list.list.addEventListener('click.dl', this.eventWrapper.setInputs); + }, + removeEvents: function removeEvents() { + this.hook.list.list.removeEventListener('click.dl', this.eventWrapper.setInputs); + }, + setInputs: function setInputs(e) { + var _this = this; + + var selectedItem = e.detail.selected; + + if (!Array.isArray(this.config)) this.config = [this.config]; + + this.config.forEach(function (config) { + return _this.setInput(config, selectedItem); + }); + }, + setInput: function setInput(config, selectedItem) { + var input = config.input || this.hook.trigger; + var newValue = selectedItem.getAttribute(config.valueAttribute); + + if (input.tagName === 'INPUT') { + input.value = newValue; + } else { + input.textContent = newValue; + } + }, + destroy: function destroy() { + this.removeEvents(); + } +}; + +window.droplabInputSetter = droplabInputSetter; + +exports.default = droplabInputSetter; + +/***/ }) + +/******/ }); +//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vd2VicGFjay9ib290c3RyYXAgZjM3NjcyYjdmNTI4YjQ3MmE0NGM/ZWM1ZiIsIndlYnBhY2s6Ly8vLi9zcmMvcGx1Z2lucy9pbnB1dF9zZXR0ZXIuanMiXSwibmFtZXMiOlsiZHJvcGxhYklucHV0U2V0dGVyIiwiaW5pdCIsImhvb2siLCJjb25maWciLCJldmVudFdyYXBwZXIiLCJhZGRFdmVudHMiLCJzZXRJbnB1dHMiLCJiaW5kIiwibGlzdCIsImFkZEV2ZW50TGlzdGVuZXIiLCJyZW1vdmVFdmVudHMiLCJyZW1vdmVFdmVudExpc3RlbmVyIiwiZSIsInNlbGVjdGVkSXRlbSIsImRldGFpbCIsInNlbGVjdGVkIiwiQXJyYXkiLCJpc0FycmF5IiwiZm9yRWFjaCIsInNldElucHV0IiwiaW5wdXQiLCJ0cmlnZ2VyIiwibmV3VmFsdWUiLCJnZXRBdHRyaWJ1dGUiLCJ2YWx1ZUF0dHJpYnV0ZSIsInRhZ05hbWUiLCJ2YWx1ZSIsInRleHRDb250ZW50IiwiZGVzdHJveSIsIndpbmRvdyJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBO0FBQ0E7O0FBRUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOztBQUVBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBO0FBQ0E7OztBQUdBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBLG1EQUEyQyxjQUFjOztBQUV6RDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBLGFBQUs7QUFDTDtBQUNBOztBQUVBO0FBQ0E7QUFDQTtBQUNBLG1DQUEyQiwwQkFBMEIsRUFBRTtBQUN2RCx5Q0FBaUMsZUFBZTtBQUNoRDtBQUNBO0FBQ0E7O0FBRUE7QUFDQSw4REFBc0QsK0RBQStEOztBQUVySDtBQUNBOztBQUVBO0FBQ0E7Ozs7Ozs7Ozs7Ozs7O0FDaEVBLElBQU1BLHFCQUFxQjtBQUN6QkMsTUFEeUIsZ0JBQ3BCQyxJQURvQixFQUNkO0FBQ1QsU0FBS0EsSUFBTCxHQUFZQSxJQUFaO0FBQ0EsU0FBS0MsTUFBTCxHQUFjRCxLQUFLQyxNQUFMLENBQVlILGtCQUFaLEtBQW1DLEtBQUtFLElBQUwsQ0FBVUMsTUFBVixDQUFpQkgsa0JBQWpCLEdBQXNDLEVBQXpFLENBQWQ7O0FBRUEsU0FBS0ksWUFBTCxHQUFvQixFQUFwQjs7QUFFQSxTQUFLQyxTQUFMO0FBQ0QsR0FSd0I7QUFVekJBLFdBVnlCLHVCQVViO0FBQ1YsU0FBS0QsWUFBTCxDQUFrQkUsU0FBbEIsR0FBOEIsS0FBS0EsU0FBTCxDQUFlQyxJQUFmLENBQW9CLElBQXBCLENBQTlCO0FBQ0EsU0FBS0wsSUFBTCxDQUFVTSxJQUFWLENBQWVBLElBQWYsQ0FBb0JDLGdCQUFwQixDQUFxQyxVQUFyQyxFQUFpRCxLQUFLTCxZQUFMLENBQWtCRSxTQUFuRTtBQUNELEdBYndCO0FBZXpCSSxjQWZ5QiwwQkFlVjtBQUNiLFNBQUtSLElBQUwsQ0FBVU0sSUFBVixDQUFlQSxJQUFmLENBQW9CRyxtQkFBcEIsQ0FBd0MsVUFBeEMsRUFBb0QsS0FBS1AsWUFBTCxDQUFrQkUsU0FBdEU7QUFDRCxHQWpCd0I7QUFtQnpCQSxXQW5CeUIscUJBbUJmTSxDQW5CZSxFQW1CWjtBQUFBOztBQUNYLFFBQU1DLGVBQWVELEVBQUVFLE1BQUYsQ0FBU0MsUUFBOUI7O0FBRUEsUUFBSSxDQUFDQyxNQUFNQyxPQUFOLENBQWMsS0FBS2QsTUFBbkIsQ0FBTCxFQUFpQyxLQUFLQSxNQUFMLEdBQWMsQ0FBQyxLQUFLQSxNQUFOLENBQWQ7O0FBRWpDLFNBQUtBLE1BQUwsQ0FBWWUsT0FBWixDQUFvQjtBQUFBLGFBQVUsTUFBS0MsUUFBTCxDQUFjaEIsTUFBZCxFQUFzQlUsWUFBdEIsQ0FBVjtBQUFBLEtBQXBCO0FBQ0QsR0F6QndCO0FBMkJ6Qk0sVUEzQnlCLG9CQTJCaEJoQixNQTNCZ0IsRUEyQlJVLFlBM0JRLEVBMkJNO0FBQzdCLFFBQU1PLFFBQVFqQixPQUFPaUIsS0FBUCxJQUFnQixLQUFLbEIsSUFBTCxDQUFVbUIsT0FBeEM7QUFDQSxRQUFNQyxXQUFXVCxhQUFhVSxZQUFiLENBQTBCcEIsT0FBT3FCLGNBQWpDLENBQWpCOztBQUVBLFFBQUlKLE1BQU1LLE9BQU4sS0FBa0IsT0FBdEIsRUFBK0I7QUFDN0JMLFlBQU1NLEtBQU4sR0FBY0osUUFBZDtBQUNELEtBRkQsTUFFTztBQUNMRixZQUFNTyxXQUFOLEdBQW9CTCxRQUFwQjtBQUNEO0FBQ0YsR0FwQ3dCO0FBc0N6Qk0sU0F0Q3lCLHFCQXNDZjtBQUNSLFNBQUtsQixZQUFMO0FBQ0Q7QUF4Q3dCLENBQTNCOztBQTJDQW1CLE9BQU83QixrQkFBUCxHQUE0QkEsa0JBQTVCOztrQkFFZUEsa0IiLCJmaWxlIjoiLi9kaXN0L3BsdWdpbnMvaW5wdXRfc2V0dGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiIFx0Ly8gVGhlIG1vZHVsZSBjYWNoZVxuIFx0dmFyIGluc3RhbGxlZE1vZHVsZXMgPSB7fTtcblxuIFx0Ly8gVGhlIHJlcXVpcmUgZnVuY3Rpb25cbiBcdGZ1bmN0aW9uIF9fd2VicGFja19yZXF1aXJlX18obW9kdWxlSWQpIHtcblxuIFx0XHQvLyBDaGVjayBpZiBtb2R1bGUgaXMgaW4gY2FjaGVcbiBcdFx0aWYoaW5zdGFsbGVkTW9kdWxlc1ttb2R1bGVJZF0pXG4gXHRcdFx0cmV0dXJuIGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdLmV4cG9ydHM7XG5cbiBcdFx0Ly8gQ3JlYXRlIGEgbmV3IG1vZHVsZSAoYW5kIHB1dCBpdCBpbnRvIHRoZSBjYWNoZSlcbiBcdFx0dmFyIG1vZHVsZSA9IGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdID0ge1xuIFx0XHRcdGk6IG1vZHVsZUlkLFxuIFx0XHRcdGw6IGZhbHNlLFxuIFx0XHRcdGV4cG9ydHM6IHt9XG4gXHRcdH07XG5cbiBcdFx0Ly8gRXhlY3V0ZSB0aGUgbW9kdWxlIGZ1bmN0aW9uXG4gXHRcdG1vZHVsZXNbbW9kdWxlSWRdLmNhbGwobW9kdWxlLmV4cG9ydHMsIG1vZHVsZSwgbW9kdWxlLmV4cG9ydHMsIF9fd2VicGFja19yZXF1aXJlX18pO1xuXG4gXHRcdC8vIEZsYWcgdGhlIG1vZHVsZSBhcyBsb2FkZWRcbiBcdFx0bW9kdWxlLmwgPSB0cnVlO1xuXG4gXHRcdC8vIFJldHVybiB0aGUgZXhwb3J0cyBvZiB0aGUgbW9kdWxlXG4gXHRcdHJldHVybiBtb2R1bGUuZXhwb3J0cztcbiBcdH1cblxuXG4gXHQvLyBleHBvc2UgdGhlIG1vZHVsZXMgb2JqZWN0IChfX3dlYnBhY2tfbW9kdWxlc19fKVxuIFx0X193ZWJwYWNrX3JlcXVpcmVfXy5tID0gbW9kdWxlcztcblxuIFx0Ly8gZXhwb3NlIHRoZSBtb2R1bGUgY2FjaGVcbiBcdF9fd2VicGFja19yZXF1aXJlX18uYyA9IGluc3RhbGxlZE1vZHVsZXM7XG5cbiBcdC8vIGlkZW50aXR5IGZ1bmN0aW9uIGZvciBjYWxsaW5nIGhhcm1vbnkgaW1wb3J0cyB3aXRoIHRoZSBjb3JyZWN0IGNvbnRleHRcbiBcdF9fd2VicGFja19yZXF1aXJlX18uaSA9IGZ1bmN0aW9uKHZhbHVlKSB7IHJldHVybiB2YWx1ZTsgfTtcblxuIFx0Ly8gZGVmaW5lIGdldHRlciBmdW5jdGlvbiBmb3IgaGFybW9ueSBleHBvcnRzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQgPSBmdW5jdGlvbihleHBvcnRzLCBuYW1lLCBnZXR0ZXIpIHtcbiBcdFx0aWYoIV9fd2VicGFja19yZXF1aXJlX18ubyhleHBvcnRzLCBuYW1lKSkge1xuIFx0XHRcdE9iamVjdC5kZWZpbmVQcm9wZXJ0eShleHBvcnRzLCBuYW1lLCB7XG4gXHRcdFx0XHRjb25maWd1cmFibGU6IGZhbHNlLFxuIFx0XHRcdFx0ZW51bWVyYWJsZTogdHJ1ZSxcbiBcdFx0XHRcdGdldDogZ2V0dGVyXG4gXHRcdFx0fSk7XG4gXHRcdH1cbiBcdH07XG5cbiBcdC8vIGdldERlZmF1bHRFeHBvcnQgZnVuY3Rpb24gZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBub24taGFybW9ueSBtb2R1bGVzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLm4gPSBmdW5jdGlvbihtb2R1bGUpIHtcbiBcdFx0dmFyIGdldHRlciA9IG1vZHVsZSAmJiBtb2R1bGUuX19lc01vZHVsZSA/XG4gXHRcdFx0ZnVuY3Rpb24gZ2V0RGVmYXVsdCgpIHsgcmV0dXJuIG1vZHVsZVsnZGVmYXVsdCddOyB9IDpcbiBcdFx0XHRmdW5jdGlvbiBnZXRNb2R1bGVFeHBvcnRzKCkgeyByZXR1cm4gbW9kdWxlOyB9O1xuIFx0XHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQoZ2V0dGVyLCAnYScsIGdldHRlcik7XG4gXHRcdHJldHVybiBnZXR0ZXI7XG4gXHR9O1xuXG4gXHQvLyBPYmplY3QucHJvdG90eXBlLmhhc093blByb3BlcnR5LmNhbGxcbiBcdF9fd2VicGFja19yZXF1aXJlX18ubyA9IGZ1bmN0aW9uKG9iamVjdCwgcHJvcGVydHkpIHsgcmV0dXJuIE9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbChvYmplY3QsIHByb3BlcnR5KTsgfTtcblxuIFx0Ly8gX193ZWJwYWNrX3B1YmxpY19wYXRoX19cbiBcdF9fd2VicGFja19yZXF1aXJlX18ucCA9IFwiXCI7XG5cbiBcdC8vIExvYWQgZW50cnkgbW9kdWxlIGFuZCByZXR1cm4gZXhwb3J0c1xuIFx0cmV0dXJuIF9fd2VicGFja19yZXF1aXJlX18oX193ZWJwYWNrX3JlcXVpcmVfXy5zID0gMTMpO1xuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIHdlYnBhY2svYm9vdHN0cmFwIGYzNzY3MmI3ZjUyOGI0NzJhNDRjIiwiY29uc3QgZHJvcGxhYklucHV0U2V0dGVyID0ge1xuICBpbml0KGhvb2spIHtcbiAgICB0aGlzLmhvb2sgPSBob29rO1xuICAgIHRoaXMuY29uZmlnID0gaG9vay5jb25maWcuZHJvcGxhYklucHV0U2V0dGVyIHx8ICh0aGlzLmhvb2suY29uZmlnLmRyb3BsYWJJbnB1dFNldHRlciA9IHt9KTtcblxuICAgIHRoaXMuZXZlbnRXcmFwcGVyID0ge307XG5cbiAgICB0aGlzLmFkZEV2ZW50cygpO1xuICB9LFxuXG4gIGFkZEV2ZW50cygpIHtcbiAgICB0aGlzLmV2ZW50V3JhcHBlci5zZXRJbnB1dHMgPSB0aGlzLnNldElucHV0cy5iaW5kKHRoaXMpO1xuICAgIHRoaXMuaG9vay5saXN0Lmxpc3QuYWRkRXZlbnRMaXN0ZW5lcignY2xpY2suZGwnLCB0aGlzLmV2ZW50V3JhcHBlci5zZXRJbnB1dHMpO1xuICB9LFxuXG4gIHJlbW92ZUV2ZW50cygpIHtcbiAgICB0aGlzLmhvb2subGlzdC5saXN0LnJlbW92ZUV2ZW50TGlzdGVuZXIoJ2NsaWNrLmRsJywgdGhpcy5ldmVudFdyYXBwZXIuc2V0SW5wdXRzKTtcbiAgfSxcblxuICBzZXRJbnB1dHMoZSkge1xuICAgIGNvbnN0IHNlbGVjdGVkSXRlbSA9IGUuZGV0YWlsLnNlbGVjdGVkO1xuXG4gICAgaWYgKCFBcnJheS5pc0FycmF5KHRoaXMuY29uZmlnKSkgdGhpcy5jb25maWcgPSBbdGhpcy5jb25maWddO1xuXG4gICAgdGhpcy5jb25maWcuZm9yRWFjaChjb25maWcgPT4gdGhpcy5zZXRJbnB1dChjb25maWcsIHNlbGVjdGVkSXRlbSkpO1xuICB9LFxuXG4gIHNldElucHV0KGNvbmZpZywgc2VsZWN0ZWRJdGVtKSB7XG4gICAgY29uc3QgaW5wdXQgPSBjb25maWcuaW5wdXQgfHwgdGhpcy5ob29rLnRyaWdnZXI7XG4gICAgY29uc3QgbmV3VmFsdWUgPSBzZWxlY3RlZEl0ZW0uZ2V0QXR0cmlidXRlKGNvbmZpZy52YWx1ZUF0dHJpYnV0ZSk7XG5cbiAgICBpZiAoaW5wdXQudGFnTmFtZSA9PT0gJ0lOUFVUJykge1xuICAgICAgaW5wdXQudmFsdWUgPSBuZXdWYWx1ZTtcbiAgICB9IGVsc2Uge1xuICAgICAgaW5wdXQudGV4dENvbnRlbnQgPSBuZXdWYWx1ZTtcbiAgICB9XG4gIH0sXG5cbiAgZGVzdHJveSgpIHtcbiAgICB0aGlzLnJlbW92ZUV2ZW50cygpO1xuICB9LFxufTtcblxud2luZG93LmRyb3BsYWJJbnB1dFNldHRlciA9IGRyb3BsYWJJbnB1dFNldHRlcjtcblxuZXhwb3J0IGRlZmF1bHQgZHJvcGxhYklucHV0U2V0dGVyO1xuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIC4vc3JjL3BsdWdpbnMvaW5wdXRfc2V0dGVyLmpzIl0sInNvdXJjZVJvb3QiOiIifQ== \ No newline at end of file diff --git a/app/assets/javascripts/filtered_search/dropdown_hint.js b/app/assets/javascripts/filtered_search/dropdown_hint.js index 98dcb697af9..475aef219da 100644 --- a/app/assets/javascripts/filtered_search/dropdown_hint.js +++ b/app/assets/javascripts/filtered_search/dropdown_hint.js @@ -55,7 +55,6 @@ require('./filtered_search_dropdown'); renderContent() { const dropdownData = []; - [].forEach.call(this.input.closest('.filtered-search-input-container').querySelectorAll('.dropdown-menu'), (dropdownMenu) => { const { icon, hint, tag, type } = dropdownMenu.dataset; if (icon && hint && tag) { diff --git a/app/assets/javascripts/filtered_search/dropdown_non_user.js b/app/assets/javascripts/filtered_search/dropdown_non_user.js index b3dc3e502c5..9ee805a08cb 100644 --- a/app/assets/javascripts/filtered_search/dropdown_non_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_non_user.js @@ -16,6 +16,7 @@ require('./filtered_search_dropdown'); }, droplabFilter: { filterFunction: gl.DropdownUtils.filterWithSymbol.bind(null, this.symbol, input), + template: 'title', }, }; } diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown.js b/app/assets/javascripts/filtered_search/filtered_search_dropdown.js index e7bf530d343..d58eeeebf81 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_dropdown.js +++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown.js @@ -4,7 +4,7 @@ class FilteredSearchDropdown { constructor(droplab, dropdown, input, filter) { this.droplab = droplab; - this.hookId = input && input.getAttribute('data-id'); + this.hookId = input && input.id; this.input = input; this.filter = filter; this.dropdown = dropdown; diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js index 22352950452..36090b49651 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_manager.js +++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js @@ -110,7 +110,7 @@ import FilteredSearchContainer from './container'; if (e.keyCode === 13) { const dropdown = this.dropdownManager.mapping[this.dropdownManager.currentDropdown]; const dropdownEl = dropdown.element; - const activeElements = dropdownEl.querySelectorAll('.dropdown-active'); + const activeElements = dropdownEl.querySelectorAll('.droplab-item-active'); e.preventDefault(); diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 5b50bc62876..c9b4716cc64 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -77,9 +77,9 @@ import './u2f/util'; // droplab import './droplab/droplab'; -import './droplab/droplab_ajax'; -import './droplab/droplab_ajax_filter'; -import './droplab/droplab_filter'; +import './droplab/plugins/ajax'; +import './droplab/plugins/ajax_filter'; +import './droplab/plugins/filter'; // everything else import './abuse_reports'; diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index 51805c5d734..5a034e11206 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -343,7 +343,7 @@ } } -.filter-dropdown-item.dropdown-active { +.filter-dropdown-item.droplab-item-active { .btn { @extend %filter-dropdown-item-btn-hover; } diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index 330fa8a5b10..4c3c81a2f56 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -15,7 +15,7 @@ .scroll-container %ul.tokens-container.list-unstyled %li.input-token - %input.form-control.filtered-search{ placeholder: 'Search or filter results...', data: { id: "filtered-search-#{type.to_s}", 'project-id' => @project.id, 'username-params' => @users.to_json(only: [:id, :username]), 'base-endpoint' => namespace_project_path(@project.namespace, @project) } } + %input.form-control.filtered-search{ id: "filtered-search-#{type.to_s}", placeholder: 'Search or filter results...', data: { 'project-id' => @project.id, 'username-params' => @users.to_json(only: [:id, :username]), 'base-endpoint' => namespace_project_path(@project.namespace, @project) } } = icon('filter') %button.clear-search.hidden{ type: 'button' } = icon('times') diff --git a/spec/features/issues/filtered_search/dropdown_hint_spec.rb b/spec/features/issues/filtered_search/dropdown_hint_spec.rb index bc8cbe30e66..cae01f37b6b 100644 --- a/spec/features/issues/filtered_search/dropdown_hint_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_hint_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -describe 'Dropdown hint', js: true, feature: true do +describe 'Dropdown hint', :js, :feature do include FilteredSearchHelpers include WaitForAjax @@ -9,10 +9,6 @@ describe 'Dropdown hint', js: true, feature: true do let(:filtered_search) { find('.filtered-search') } let(:js_dropdown_hint) { '#js-dropdown-hint' } - def dropdown_hint_size - page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size - end - def click_hint(text) find('#js-dropdown-hint .filter-dropdown .filter-dropdown-item', text: text).click end @@ -46,14 +42,16 @@ describe 'Dropdown hint', js: true, feature: true do it 'does not filter `Press Enter or click to search`' do filtered_search.set('randomtext') - expect(page).to have_css(js_dropdown_hint, text: 'Press Enter or click to search', visible: false) - expect(dropdown_hint_size).to eq(0) + hint_dropdown = find(js_dropdown_hint) + + expect(hint_dropdown).to have_content('Press Enter or click to search') + expect(hint_dropdown).to have_selector('.filter-dropdown .filter-dropdown-item', count: 0) end it 'filters with text' do filtered_search.set('a') - expect(dropdown_hint_size).to eq(3) + expect(find(js_dropdown_hint)).to have_selector('.filter-dropdown .filter-dropdown-item', count: 3) end end diff --git a/spec/features/issues/filtered_search/dropdown_label_spec.rb b/spec/features/issues/filtered_search/dropdown_label_spec.rb index b192064b693..d7d71b0eba9 100644 --- a/spec/features/issues/filtered_search/dropdown_label_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_label_spec.rb @@ -28,10 +28,6 @@ describe 'Dropdown label', js: true, feature: true do filter_dropdown.find('.filter-dropdown-item', text: text).click end - def dropdown_label_size - filter_dropdown.all('.filter-dropdown-item').size - end - def clear_search_field find('.filtered-search-input-container .clear-search').click end @@ -81,7 +77,7 @@ describe 'Dropdown label', js: true, feature: true do filtered_search.set('label:') expect(filter_dropdown).to have_content(bug_label.title) - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) end end @@ -97,7 +93,8 @@ describe 'Dropdown label', js: true, feature: true do expect(filter_dropdown.find('.filter-dropdown-item', text: bug_label.title)).to be_visible expect(filter_dropdown.find('.filter-dropdown-item', text: uppercase_label.title)).to be_visible - expect(dropdown_label_size).to eq(2) + + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 2) clear_search_field init_label_search @@ -106,14 +103,14 @@ describe 'Dropdown label', js: true, feature: true do expect(filter_dropdown.find('.filter-dropdown-item', text: bug_label.title)).to be_visible expect(filter_dropdown.find('.filter-dropdown-item', text: uppercase_label.title)).to be_visible - expect(dropdown_label_size).to eq(2) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 2) end it 'filters by multiple words with or without symbol' do filtered_search.send_keys('Hig') expect(filter_dropdown.find('.filter-dropdown-item', text: two_words_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) clear_search_field init_label_search @@ -121,14 +118,14 @@ describe 'Dropdown label', js: true, feature: true do filtered_search.send_keys('~Hig') expect(filter_dropdown.find('.filter-dropdown-item', text: two_words_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) end it 'filters by multiple words containing single quotes with or without symbol' do filtered_search.send_keys('won\'t') expect(filter_dropdown.find('.filter-dropdown-item', text: wont_fix_single_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) clear_search_field init_label_search @@ -136,14 +133,14 @@ describe 'Dropdown label', js: true, feature: true do filtered_search.send_keys('~won\'t') expect(filter_dropdown.find('.filter-dropdown-item', text: wont_fix_single_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) end it 'filters by multiple words containing double quotes with or without symbol' do filtered_search.send_keys('won"t') expect(filter_dropdown.find('.filter-dropdown-item', text: wont_fix_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) clear_search_field init_label_search @@ -151,14 +148,14 @@ describe 'Dropdown label', js: true, feature: true do filtered_search.send_keys('~won"t') expect(filter_dropdown.find('.filter-dropdown-item', text: wont_fix_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) end it 'filters by special characters with or without symbol' do filtered_search.send_keys('^+') expect(filter_dropdown.find('.filter-dropdown-item', text: special_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) clear_search_field init_label_search @@ -166,7 +163,7 @@ describe 'Dropdown label', js: true, feature: true do filtered_search.send_keys('~^+') expect(filter_dropdown.find('.filter-dropdown-item', text: special_label.title)).to be_visible - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) end end @@ -280,13 +277,13 @@ describe 'Dropdown label', js: true, feature: true do create(:label, project: project, title: 'bug-label') init_label_search - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) create(:label, project: project) clear_search_field init_label_search - expect(dropdown_label_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown-item', count: 1) end end end diff --git a/spec/features/issues/filtered_search/search_bar_spec.rb b/spec/features/issues/filtered_search/search_bar_spec.rb index 59244d65eec..3b2b6347bc0 100644 --- a/spec/features/issues/filtered_search/search_bar_spec.rb +++ b/spec/features/issues/filtered_search/search_bar_spec.rb @@ -26,7 +26,7 @@ describe 'Search bar', js: true, feature: true do filtered_search.native.send_keys(:down) page.within '#js-dropdown-hint' do - expect(page).to have_selector('.dropdown-active') + expect(page).to have_selector('.droplab-item-active') end end @@ -79,28 +79,30 @@ describe 'Search bar', js: true, feature: true do filtered_search.set('author') - expect(page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size).to eq(1) + expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 1) find('.filtered-search-input-container .clear-search').click filtered_search.click - expect(page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size).to eq(original_size) + expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: original_size) end it 'resets the dropdown filters' do + filtered_search.click + + hint_offset = get_left_style(find('#js-dropdown-hint')['style']) + filtered_search.set('a') - hint_style = page.find('#js-dropdown-hint')['style'] - hint_offset = get_left_style(hint_style) filtered_search.set('author:') - expect(page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size).to eq(0) + find('#js-dropdown-hint', visible: false) find('.filtered-search-input-container .clear-search').click filtered_search.click - expect(page.all('#js-dropdown-hint .filter-dropdown .filter-dropdown-item').size).to be > 0 - expect(get_left_style(page.find('#js-dropdown-hint')['style'])).to eq(hint_offset) + expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 4) + expect(get_left_style(find('#js-dropdown-hint')['style'])).to eq(hint_offset) end end end From c2cb2fb4731f7e7fbc7093be3b6e019f1f4d2d9c Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sat, 25 Mar 2017 12:20:49 +0000 Subject: [PATCH 06/70] update droplab --- app/assets/javascripts/droplab/droplab.js | 660 +++++++++--------- .../javascripts/droplab/plugins/ajax.js | 8 +- .../droplab/plugins/ajax_filter.js | 8 +- .../javascripts/droplab/plugins/filter.js | 10 +- .../droplab/plugins/input_setter.js | 8 +- .../filtered_search/dropdown_hint.js | 4 +- .../filtered_search/dropdown_non_user.js | 6 +- .../filtered_search/dropdown_user.js | 4 +- .../filtered_search_dropdown_manager.js | 2 +- app/assets/javascripts/main.js | 6 - 10 files changed, 337 insertions(+), 379 deletions(-) diff --git a/app/assets/javascripts/droplab/droplab.js b/app/assets/javascripts/droplab/droplab.js index b5d6a43b83f..d1d8447d165 100644 --- a/app/assets/javascripts/droplab/droplab.js +++ b/app/assets/javascripts/droplab/droplab.js @@ -63,7 +63,7 @@ /******/ __webpack_require__.p = ""; /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 9); +/******/ return __webpack_require__(__webpack_require__.s = 14); /******/ }) /************************************************************************/ /******/ ([ @@ -81,14 +81,10 @@ var DATA_DROPDOWN = 'data-dropdown'; var SELECTED_CLASS = 'droplab-item-selected'; var ACTIVE_CLASS = 'droplab-item-active'; -var constants = { - DATA_TRIGGER: DATA_TRIGGER, - DATA_DROPDOWN: DATA_DROPDOWN, - SELECTED_CLASS: SELECTED_CLASS, - ACTIVE_CLASS: ACTIVE_CLASS -}; - -exports.default = constants; +exports.DATA_TRIGGER = DATA_TRIGGER; +exports.DATA_DROPDOWN = DATA_DROPDOWN; +exports.SELECTED_CLASS = SELECTED_CLASS; +exports.ACTIVE_CLASS = ACTIVE_CLASS; /***/ }), /* 1 */ @@ -151,7 +147,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -var _dropdown = __webpack_require__(6); +var _dropdown = __webpack_require__(9); var _dropdown2 = _interopRequireDefault(_dropdown); @@ -189,14 +185,6 @@ Object.defineProperty(exports, "__esModule", { var _constants = __webpack_require__(0); -var _constants2 = _interopRequireDefault(_constants); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var DATA_TRIGGER = _constants2.default.DATA_TRIGGER, - DATA_DROPDOWN = _constants2.default.DATA_DROPDOWN; - - var utils = { toCamelCase: function toCamelCase(attr) { return this.camelize(attr.split('-').slice(1).join(' ')); @@ -222,7 +210,7 @@ var utils = { }, isDropDownParts: function isDropDownParts(target) { if (!target || target.tagName === 'HTML') return false; - return target.hasAttribute(DATA_TRIGGER) || target.hasAttribute(DATA_DROPDOWN); + return target.hasAttribute(_constants.DATA_TRIGGER) || target.hasAttribute(_constants.DATA_DROPDOWN); } }; @@ -239,175 +227,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.default = function () { - var DropLab = function DropLab(hook, list) { - if (!this instanceof DropLab) return new DropLab(hook); - - this.ready = false; - this.hooks = []; - this.queuedData = []; - this.config = {}; - - this.eventWrapper = {}; - - if (!hook) return this.loadStatic(); - this.addHook(hook, list); - this.init(); - }; - - Object.assign(DropLab.prototype, { - loadStatic: function loadStatic() { - var dropdownTriggers = [].slice.apply(document.querySelectorAll('[' + DATA_TRIGGER + ']')); - this.addHooks(dropdownTriggers).init(); - }, - - addData: function addData() { - var args = [].slice.apply(arguments); - this.applyArgs(args, '_addData'); - }, - - setData: function setData() { - var args = [].slice.apply(arguments); - this.applyArgs(args, '_setData'); - }, - - destroy: function destroy() { - this.hooks.forEach(function (hook) { - return hook.destroy(); - }); - this.hooks = []; - this.removeEvents(); - }, - - applyArgs: function applyArgs(args, methodName) { - if (this.ready) return this[methodName].apply(this, args); - - this.queuedData = this.queuedData || []; - this.queuedData.push(args); - }, - - _addData: function _addData(trigger, data) { - this._processData(trigger, data, 'addData'); - }, - - _setData: function _setData(trigger, data) { - this._processData(trigger, data, 'setData'); - }, - - _processData: function _processData(trigger, data, methodName) { - this.hooks.forEach(function (hook) { - if (Array.isArray(trigger)) hook.list[methodName](trigger); - - if (hook.trigger.id === trigger) hook.list[methodName](data); - }); - }, - - addEvents: function addEvents() { - this.eventWrapper.documentClicked = this.documentClicked.bind(this); - document.addEventListener('click', this.eventWrapper.documentClicked); - }, - - documentClicked: function documentClicked(e) { - var thisTag = e.target; - - if (thisTag.tagName !== 'UL') thisTag = _utils2.default.closest(thisTag, 'UL'); - if (_utils2.default.isDropDownParts(thisTag, this.hooks) || _utils2.default.isDropDownParts(e.target, this.hooks)) return; - - this.hooks.forEach(function (hook) { - return hook.list.hide(); - }); - }, - - removeEvents: function removeEvents() { - document.removeEventListener('click', this.eventWrapper.documentClicked); - }, - - changeHookList: function changeHookList(trigger, list, plugins, config) { - var _this = this; - - var availableTrigger = typeof trigger === 'string' ? document.getElementById(trigger) : trigger; - - this.hooks.forEach(function (hook, i) { - hook.list.list.dataset.dropdownActive = false; - - if (hook.trigger !== availableTrigger) return; - - hook.destroy(); - _this.hooks.splice(i, 1); - _this.addHook(availableTrigger, list, plugins, config); - }); - }, - - addHook: function addHook(hook, list, plugins, config) { - var availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook; - var availableList = void 0; - - if (typeof list === 'string') { - availableList = document.querySelector(list); - } else if (list instanceof Element) { - availableList = list; - } else { - availableList = document.querySelector(hook.dataset[_utils2.default.toCamelCase(DATA_TRIGGER)]); - } - - availableList.dataset.dropdownActive = true; - - var HookObject = availableHook.tagName === 'INPUT' ? _hook_input2.default : _hook_button2.default; - this.hooks.push(new HookObject(availableHook, availableList, plugins, config)); - - return this; - }, - - addHooks: function addHooks(hooks, plugins, config) { - var _this2 = this; - - hooks.forEach(function (hook) { - return _this2.addHook(hook, null, plugins, config); - }); - return this; - }, - - setConfig: function setConfig(obj) { - this.config = obj; - }, - - fireReady: function fireReady() { - var readyEvent = new CustomEvent('ready.dl', { - detail: { - dropdown: this - } - }); - document.dispatchEvent(readyEvent); - - this.ready = true; - }, - - init: function init() { - var _this3 = this; - - this.addEvents(); - - this.fireReady(); - - this.queuedData.forEach(function (data) { - return _this3.addData(data); - }); - this.queuedData = []; - - return this; - } - }); - - return DropLab; -}; - __webpack_require__(1); -var _hook_button = __webpack_require__(7); +var _hook_button = __webpack_require__(10); var _hook_button2 = _interopRequireDefault(_hook_button); -var _hook_input = __webpack_require__(8); +var _hook_input = __webpack_require__(11); var _hook_input2 = _interopRequireDefault(_hook_input); @@ -415,149 +241,178 @@ var _utils = __webpack_require__(3); var _utils2 = _interopRequireDefault(_utils); -var _constants = __webpack_require__(0); +var _keyboard = __webpack_require__(12); -var _constants2 = _interopRequireDefault(_constants); +var _keyboard2 = _interopRequireDefault(_keyboard); + +var _constants = __webpack_require__(0); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var DATA_TRIGGER = _constants2.default.DATA_TRIGGER; +var DropLab = function DropLab() { + this.ready = false; + this.hooks = []; + this.queuedData = []; + this.config = {}; -; - -/***/ }), -/* 5 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -exports.default = function () { - var currentKey; - var currentFocus; - var isUpArrow = false; - var isDownArrow = false; - var removeHighlight = function removeHighlight(list) { - var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0); - var listItems = []; - for (var i = 0; i < itemElements.length; i++) { - var listItem = itemElements[i]; - listItem.classList.remove(_constants2.default.ACTIVE_CLASS); - - if (listItem.style.display !== 'none') { - listItems.push(listItem); - } - } - return listItems; - }; - - var setMenuForArrows = function setMenuForArrows(list) { - var listItems = removeHighlight(list); - if (list.currentIndex > 0) { - if (!listItems[list.currentIndex - 1]) { - list.currentIndex = list.currentIndex - 1; - } - - if (listItems[list.currentIndex - 1]) { - var el = listItems[list.currentIndex - 1]; - var filterDropdownEl = el.closest('.filter-dropdown'); - el.classList.add(_constants2.default.ACTIVE_CLASS); - - if (filterDropdownEl) { - var filterDropdownBottom = filterDropdownEl.offsetHeight; - var elOffsetTop = el.offsetTop - 30; - - if (elOffsetTop > filterDropdownBottom) { - filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom; - } - } - } - } - }; - - var mousedown = function mousedown(e) { - var list = e.detail.hook.list; - removeHighlight(list); - list.show(); - list.currentIndex = 0; - isUpArrow = false; - isDownArrow = false; - }; - var selectItem = function selectItem(list) { - var listItems = removeHighlight(list); - var currentItem = listItems[list.currentIndex - 1]; - var listEvent = new CustomEvent('click.dl', { - detail: { - list: list, - selected: currentItem, - data: currentItem.dataset - } - }); - list.list.dispatchEvent(listEvent); - list.hide(); - }; - - var keydown = function keydown(e) { - var typedOn = e.target; - var list = e.detail.hook.list; - var currentIndex = list.currentIndex; - isUpArrow = false; - isDownArrow = false; - - if (e.detail.which) { - currentKey = e.detail.which; - if (currentKey === 13) { - selectItem(e.detail.hook.list); - return; - } - if (currentKey === 38) { - isUpArrow = true; - } - if (currentKey === 40) { - isDownArrow = true; - } - } else if (e.detail.key) { - currentKey = e.detail.key; - if (currentKey === 'Enter') { - selectItem(e.detail.hook.list); - return; - } - if (currentKey === 'ArrowUp') { - isUpArrow = true; - } - if (currentKey === 'ArrowDown') { - isDownArrow = true; - } - } - if (isUpArrow) { - currentIndex--; - } - if (isDownArrow) { - currentIndex++; - } - if (currentIndex < 0) { - currentIndex = 0; - } - list.currentIndex = currentIndex; - setMenuForArrows(e.detail.hook.list); - }; - - document.addEventListener('mousedown.dl', mousedown); - document.addEventListener('keydown.dl', keydown); + this.eventWrapper = {}; }; -var _constants = __webpack_require__(0); +Object.assign(DropLab.prototype, { + loadStatic: function loadStatic() { + var dropdownTriggers = [].slice.apply(document.querySelectorAll('[' + _constants.DATA_TRIGGER + ']')); + this.addHooks(dropdownTriggers); + }, -var _constants2 = _interopRequireDefault(_constants); + addData: function addData() { + var args = [].slice.apply(arguments); + this.applyArgs(args, '_addData'); + }, -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + setData: function setData() { + var args = [].slice.apply(arguments); + this.applyArgs(args, '_setData'); + }, + + destroy: function destroy() { + this.hooks.forEach(function (hook) { + return hook.destroy(); + }); + this.hooks = []; + this.removeEvents(); + }, + + applyArgs: function applyArgs(args, methodName) { + if (this.ready) return this[methodName].apply(this, args); + + this.queuedData = this.queuedData || []; + this.queuedData.push(args); + }, + + _addData: function _addData(trigger, data) { + this._processData(trigger, data, 'addData'); + }, + + _setData: function _setData(trigger, data) { + this._processData(trigger, data, 'setData'); + }, + + _processData: function _processData(trigger, data, methodName) { + this.hooks.forEach(function (hook) { + if (Array.isArray(trigger)) hook.list[methodName](trigger); + + if (hook.trigger.id === trigger) hook.list[methodName](data); + }); + }, + + addEvents: function addEvents() { + this.eventWrapper.documentClicked = this.documentClicked.bind(this); + document.addEventListener('click', this.eventWrapper.documentClicked); + }, + + documentClicked: function documentClicked(e) { + var thisTag = e.target; + + if (thisTag.tagName !== 'UL') thisTag = _utils2.default.closest(thisTag, 'UL'); + if (_utils2.default.isDropDownParts(thisTag, this.hooks) || _utils2.default.isDropDownParts(e.target, this.hooks)) return; + + this.hooks.forEach(function (hook) { + return hook.list.hide(); + }); + }, + + removeEvents: function removeEvents() { + document.removeEventListener('click', this.eventWrapper.documentClicked); + }, + + changeHookList: function changeHookList(trigger, list, plugins, config) { + var _this = this; + + var availableTrigger = typeof trigger === 'string' ? document.getElementById(trigger) : trigger; + + this.hooks.forEach(function (hook, i) { + hook.list.list.dataset.dropdownActive = false; + + if (hook.trigger !== availableTrigger) return; + + hook.destroy(); + _this.hooks.splice(i, 1); + _this.addHook(availableTrigger, list, plugins, config); + }); + }, + + addHook: function addHook(hook, list, plugins, config) { + var availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook; + var availableList = void 0; + + if (typeof list === 'string') { + availableList = document.querySelector(list); + } else if (list instanceof Element) { + availableList = list; + } else { + availableList = document.querySelector(hook.dataset[_utils2.default.toCamelCase(_constants.DATA_TRIGGER)]); + } + + availableList.dataset.dropdownActive = true; + + var HookObject = availableHook.tagName === 'INPUT' ? _hook_input2.default : _hook_button2.default; + this.hooks.push(new HookObject(availableHook, availableList, plugins, config)); + + return this; + }, + + addHooks: function addHooks(hooks, plugins, config) { + var _this2 = this; + + hooks.forEach(function (hook) { + return _this2.addHook(hook, null, plugins, config); + }); + return this; + }, + + setConfig: function setConfig(obj) { + this.config = obj; + }, + + fireReady: function fireReady() { + var readyEvent = new CustomEvent('ready.dl', { + detail: { + dropdown: this + } + }); + document.dispatchEvent(readyEvent); + + this.ready = true; + }, + + init: function init(hook, list, plugins, config) { + var _this3 = this; + + hook ? this.addHook(hook, list, plugins, config) : this.loadStatic(); + + this.addEvents(); + + (0, _keyboard2.default)(); + + this.fireReady(); + + this.queuedData.forEach(function (data) { + return _this3.addData(data); + }); + this.queuedData = []; + + return this; + } +}); + +exports.default = DropLab; /***/ }), -/* 6 */ +/* 5 */, +/* 6 */, +/* 7 */, +/* 8 */, +/* 9 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -577,8 +432,6 @@ var _utils2 = _interopRequireDefault(_utils); var _constants = __webpack_require__(0); -var _constants2 = _interopRequireDefault(_constants); - function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } @@ -635,14 +488,14 @@ Object.assign(DropDown.prototype, (_Object$assign = { addSelectedClass: function addSelectedClass(selected) { this.removeSelectedClasses(); - selected.classList.add(_constants2.default.SELECTED_CLASS); + selected.classList.add(_constants.SELECTED_CLASS); }, removeSelectedClasses: function removeSelectedClasses() { var items = this.items || this.getItems(); items.forEach(function (item) { - item.classList.remove(_constants2.default.SELECTED_CLASS); + return item.classList.remove(_constants.SELECTED_CLASS); }); }, @@ -716,7 +569,7 @@ Object.assign(DropDown.prototype, (_Object$assign = { exports.default = DropDown; /***/ }), -/* 7 */ +/* 10 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -802,7 +655,7 @@ Object.assign(HookButton.prototype, { exports.default = HookButton; /***/ }), -/* 8 */ +/* 11 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -943,7 +796,137 @@ Object.assign(HookInput.prototype, { exports.default = HookInput; /***/ }), -/* 9 */ +/* 12 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _constants = __webpack_require__(0); + +var Keyboard = function Keyboard() { + var currentKey; + var currentFocus; + var isUpArrow = false; + var isDownArrow = false; + var removeHighlight = function removeHighlight(list) { + var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0); + var listItems = []; + for (var i = 0; i < itemElements.length; i++) { + var listItem = itemElements[i]; + listItem.classList.remove(_constants.ACTIVE_CLASS); + + if (listItem.style.display !== 'none') { + listItems.push(listItem); + } + } + return listItems; + }; + + var setMenuForArrows = function setMenuForArrows(list) { + var listItems = removeHighlight(list); + if (list.currentIndex > 0) { + if (!listItems[list.currentIndex - 1]) { + list.currentIndex = list.currentIndex - 1; + } + + if (listItems[list.currentIndex - 1]) { + var el = listItems[list.currentIndex - 1]; + var filterDropdownEl = el.closest('.filter-dropdown'); + el.classList.add(_constants.ACTIVE_CLASS); + + if (filterDropdownEl) { + var filterDropdownBottom = filterDropdownEl.offsetHeight; + var elOffsetTop = el.offsetTop - 30; + + if (elOffsetTop > filterDropdownBottom) { + filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom; + } + } + } + } + }; + + var mousedown = function mousedown(e) { + var list = e.detail.hook.list; + removeHighlight(list); + list.show(); + list.currentIndex = 0; + isUpArrow = false; + isDownArrow = false; + }; + var selectItem = function selectItem(list) { + var listItems = removeHighlight(list); + var currentItem = listItems[list.currentIndex - 1]; + var listEvent = new CustomEvent('click.dl', { + detail: { + list: list, + selected: currentItem, + data: currentItem.dataset + } + }); + list.list.dispatchEvent(listEvent); + list.hide(); + }; + + var keydown = function keydown(e) { + var typedOn = e.target; + var list = e.detail.hook.list; + var currentIndex = list.currentIndex; + isUpArrow = false; + isDownArrow = false; + + if (e.detail.which) { + currentKey = e.detail.which; + if (currentKey === 13) { + selectItem(e.detail.hook.list); + return; + } + if (currentKey === 38) { + isUpArrow = true; + } + if (currentKey === 40) { + isDownArrow = true; + } + } else if (e.detail.key) { + currentKey = e.detail.key; + if (currentKey === 'Enter') { + selectItem(e.detail.hook.list); + return; + } + if (currentKey === 'ArrowUp') { + isUpArrow = true; + } + if (currentKey === 'ArrowDown') { + isDownArrow = true; + } + } + if (isUpArrow) { + currentIndex--; + } + if (isDownArrow) { + currentIndex++; + } + if (currentIndex < 0) { + currentIndex = 0; + } + list.currentIndex = currentIndex; + setMenuForArrows(e.detail.hook.list); + }; + + document.addEventListener('mousedown.dl', mousedown); + document.addEventListener('keydown.dl', keydown); +}; + +exports.default = Keyboard; + +/***/ }), +/* 13 */, +/* 14 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -955,29 +938,16 @@ Object.defineProperty(exports, "__esModule", { var _droplab = __webpack_require__(4); -var _droplab2 = _interopRequireDefault(_droplab); - -var _constants = __webpack_require__(0); - -var _constants2 = _interopRequireDefault(_constants); - -var _keyboard = __webpack_require__(5); - -var _keyboard2 = _interopRequireDefault(_keyboard); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var DATA_TRIGGER = _constants2.default.DATA_TRIGGER; -var keyboard = (0, _keyboard2.default)(); - -var setup = function setup() { - window.DropLab = (0, _droplab2.default)(); -}; - -setup(); - -exports.default = setup; +Object.keys(_droplab).forEach(function (key) { + if (key === "default" || key === "__esModule") return; + Object.defineProperty(exports, key, { + enumerable: true, + get: function get() { + return _droplab[key]; + } + }); +}); /***/ }) /******/ ]); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c","webpack:///./src/constants.js","webpack:///./~/custom-event-polyfill/custom-event-polyfill.js","webpack:///./src/hook.js","webpack:///./src/utils.js","webpack:///./src/droplab.js","webpack:///./src/keyboard.js","webpack:///./src/dropdown.js","webpack:///./src/hook_button.js","webpack:///./src/hook_input.js","webpack:///./src/index.js"],"names":["DATA_TRIGGER","DATA_DROPDOWN","SELECTED_CLASS","ACTIVE_CLASS","constants","Hook","trigger","list","plugins","config","type","event","id","Object","assign","prototype","addEvents","constructor","utils","toCamelCase","attr","camelize","split","slice","join","t","s","d","p","hasOwnProperty","call","replace","RegExp","str","letter","index","toLowerCase","toUpperCase","closest","thisTag","stopTag","tagName","parentNode","isDropDownParts","target","hasAttribute","DropLab","hook","ready","hooks","queuedData","eventWrapper","loadStatic","addHook","init","dropdownTriggers","apply","document","querySelectorAll","addHooks","addData","args","arguments","applyArgs","setData","destroy","forEach","removeEvents","methodName","push","_addData","data","_processData","_setData","Array","isArray","documentClicked","bind","addEventListener","e","hide","removeEventListener","changeHookList","availableTrigger","getElementById","i","dataset","dropdownActive","splice","availableHook","querySelector","availableList","Element","HookObject","setConfig","obj","fireReady","readyEvent","CustomEvent","detail","dropdown","dispatchEvent","currentKey","currentFocus","isUpArrow","isDownArrow","removeHighlight","itemElements","listItems","length","listItem","classList","remove","style","display","setMenuForArrows","currentIndex","el","filterDropdownEl","add","filterDropdownBottom","offsetHeight","elOffsetTop","offsetTop","scrollTop","mousedown","show","selectItem","currentItem","listEvent","selected","keydown","typedOn","which","key","DropDown","hidden","items","getItems","initTemplateString","initialState","innerHTML","templateString","outerHTML","clickEvent","addSelectedClass","preventDefault","removeSelectedClasses","item","toggle","render","concat","children","map","renderChildren","renderableList","html","template","createElement","setImagesSrc","firstChild","droplab_hidden","images","image","src","getAttribute","removeAttribute","HookButton","addPlugins","create","plugin","clicked","buttonEvent","bubbles","cancelable","restoreInitialState","removePlugins","HookInput","input","keyup","hasRemovedEvents","inputEvent","text","value","mouseEvent","keyEvent","eventName","keyboard","setup","window"],"mappings":"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","file":"./dist/droplab.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 9);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","const DATA_TRIGGER = 'data-dropdown-trigger';\nconst DATA_DROPDOWN = 'data-dropdown';\nconst SELECTED_CLASS = 'droplab-item-selected';\nconst ACTIVE_CLASS = 'droplab-item-active';\n\nconst constants = {\n  DATA_TRIGGER,\n  DATA_DROPDOWN,\n  SELECTED_CLASS,\n  ACTIVE_CLASS,\n};\n\nexport default constants;\n\n\n\n// WEBPACK FOOTER //\n// ./src/constants.js","// Polyfill for creating CustomEvents on IE9/10/11\n\n// code pulled from:\n// https://github.com/d4tocchini/customevent-polyfill\n// https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent#Polyfill\n\ntry {\n    var ce = new window.CustomEvent('test');\n    ce.preventDefault();\n    if (ce.defaultPrevented !== true) {\n        // IE has problems with .preventDefault() on custom events\n        // http://stackoverflow.com/questions/23349191\n        throw new Error('Could not prevent default');\n    }\n} catch(e) {\n  var CustomEvent = function(event, params) {\n    var evt, origPrevent;\n    params = params || {\n      bubbles: false,\n      cancelable: false,\n      detail: undefined\n    };\n\n    evt = document.createEvent(\"CustomEvent\");\n    evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);\n    origPrevent = evt.preventDefault;\n    evt.preventDefault = function () {\n      origPrevent.call(this);\n      try {\n        Object.defineProperty(this, 'defaultPrevented', {\n          get: function () {\n            return true;\n          }\n        });\n      } catch(e) {\n        this.defaultPrevented = true;\n      }\n    };\n    return evt;\n  };\n\n  CustomEvent.prototype = window.Event.prototype;\n  window.CustomEvent = CustomEvent; // expose definition to window\n}\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./~/custom-event-polyfill/custom-event-polyfill.js\n// module id = 1\n// module chunks = 0","import DropDown from './dropdown';\n\nvar Hook = function(trigger, list, plugins, config){\n  this.trigger = trigger;\n  this.list = new DropDown(list);\n  this.type = 'Hook';\n  this.event = 'click';\n  this.plugins = plugins || [];\n  this.config = config || {};\n  this.id = trigger.id;\n};\n\nObject.assign(Hook.prototype, {\n\n  addEvents: function(){},\n\n  constructor: Hook,\n});\n\nexport default Hook;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook.js","import constants from './constants';\n\nconst { DATA_TRIGGER, DATA_DROPDOWN } = constants;\n\nconst utils = {\n  toCamelCase(attr) {\n    return this.camelize(attr.split('-').slice(1).join(' '));\n  },\n\n  t(s, d) {\n    for (const p in d) {\n      if (Object.prototype.hasOwnProperty.call(d, p)) {\n        s = s.replace(new RegExp(`{{${p}}}`, 'g'), d[p]);\n      }\n    }\n    return s;\n  },\n\n  camelize(str) {\n    return str.replace(/(?:^\\w|[A-Z]|\\b\\w)/g, (letter, index) => {\n      return index === 0 ? letter.toLowerCase() : letter.toUpperCase();\n    }).replace(/\\s+/g, '');\n  },\n\n  closest(thisTag, stopTag) {\n    while (thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML') {\n      thisTag = thisTag.parentNode;\n    }\n    return thisTag;\n  },\n\n  isDropDownParts(target) {\n    if (!target || target.tagName === 'HTML') return false;\n    return target.hasAttribute(DATA_TRIGGER) || target.hasAttribute(DATA_DROPDOWN);\n  },\n};\n\n\nexport default utils;\n\n\n\n// WEBPACK FOOTER //\n// ./src/utils.js","import 'custom-event-polyfill';\nimport HookButton from './hook_button';\nimport HookInput from './hook_input';\nimport utils from './utils';\nimport constants from './constants';\nconst DATA_TRIGGER = constants.DATA_TRIGGER;\n\nexport default function () {\n  var DropLab = function(hook, list) {\n    if (!this instanceof DropLab) return new DropLab(hook);\n\n    this.ready = false;\n    this.hooks = [];\n    this.queuedData = [];\n    this.config = {};\n\n    this.eventWrapper = {};\n\n    if (!hook) return this.loadStatic();\n    this.addHook(hook, list);\n    this.init();\n  };\n\n  Object.assign(DropLab.prototype, {\n    loadStatic: function(){\n      var dropdownTriggers = [].slice.apply(document.querySelectorAll(`[${DATA_TRIGGER}]`));\n      this.addHooks(dropdownTriggers).init();\n    },\n\n    addData: function () {\n      var args = [].slice.apply(arguments);\n      this.applyArgs(args, '_addData');\n    },\n\n    setData: function() {\n      var args = [].slice.apply(arguments);\n      this.applyArgs(args, '_setData');\n    },\n\n    destroy: function() {\n      this.hooks.forEach(hook => hook.destroy());\n      this.hooks = [];\n      this.removeEvents();\n    },\n\n    applyArgs: function(args, methodName) {\n      if (this.ready) return this[methodName].apply(this, args);\n\n      this.queuedData = this.queuedData || [];\n      this.queuedData.push(args);\n    },\n\n    _addData: function(trigger, data) {\n      this._processData(trigger, data, 'addData');\n    },\n\n    _setData: function(trigger, data) {\n      this._processData(trigger, data, 'setData');\n    },\n\n    _processData: function(trigger, data, methodName) {\n      this.hooks.forEach((hook) => {\n        if (Array.isArray(trigger)) hook.list[methodName](trigger);\n\n        if (hook.trigger.id === trigger) hook.list[methodName](data);\n      });\n    },\n\n    addEvents: function() {\n      this.eventWrapper.documentClicked = this.documentClicked.bind(this)\n      document.addEventListener('click', this.eventWrapper.documentClicked);\n    },\n\n    documentClicked: function(e) {\n      let thisTag = e.target;\n\n      if (thisTag.tagName !== 'UL') thisTag = utils.closest(thisTag, 'UL');\n      if (utils.isDropDownParts(thisTag, this.hooks) || utils.isDropDownParts(e.target, this.hooks)) return;\n\n      this.hooks.forEach(hook => hook.list.hide());\n    },\n\n    removeEvents: function(){\n      document.removeEventListener('click', this.eventWrapper.documentClicked);\n    },\n\n    changeHookList: function(trigger, list, plugins, config) {\n      const availableTrigger =  typeof trigger === 'string' ? document.getElementById(trigger) : trigger;\n\n\n      this.hooks.forEach((hook, i) => {\n        hook.list.list.dataset.dropdownActive = false;\n\n        if (hook.trigger !== availableTrigger) return;\n\n        hook.destroy();\n        this.hooks.splice(i, 1);\n        this.addHook(availableTrigger, list, plugins, config);\n      });\n    },\n\n    addHook: function(hook, list, plugins, config) {\n      const availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook;\n      let availableList;\n\n      if (typeof list === 'string') {\n        availableList = document.querySelector(list);\n      } else if (list instanceof Element) {\n        availableList = list;\n      } else {\n        availableList = document.querySelector(hook.dataset[utils.toCamelCase(DATA_TRIGGER)]);\n      }\n\n      availableList.dataset.dropdownActive = true;\n\n      const HookObject = availableHook.tagName === 'INPUT' ? HookInput : HookButton;\n      this.hooks.push(new HookObject(availableHook, availableList, plugins, config));\n\n      return this;\n    },\n\n    addHooks: function(hooks, plugins, config) {\n      hooks.forEach(hook => this.addHook(hook, null, plugins, config));\n      return this;\n    },\n\n    setConfig: function(obj){\n      this.config = obj;\n    },\n\n    fireReady: function() {\n      const readyEvent = new CustomEvent('ready.dl', {\n        detail: {\n          dropdown: this,\n        },\n      });\n      document.dispatchEvent(readyEvent);\n\n      this.ready = true;\n    },\n\n    init: function () {\n      this.addEvents();\n\n      this.fireReady();\n\n      this.queuedData.forEach(data => this.addData(data));\n      this.queuedData = [];\n\n      return this;\n    },\n  });\n\n  return DropLab;\n};\n\n\n\n// WEBPACK FOOTER //\n// ./src/droplab.js","import constants from './constants';\n\nexport default function () {\n  var currentKey;\n  var currentFocus;\n  var isUpArrow = false;\n  var isDownArrow = false;\n  var removeHighlight = function removeHighlight(list) {\n    var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0);\n    var listItems = [];\n    for(var i = 0; i < itemElements.length; i++) {\n      var listItem = itemElements[i];\n      listItem.classList.remove(constants.ACTIVE_CLASS);\n\n      if (listItem.style.display !== 'none') {\n        listItems.push(listItem);\n      }\n    }\n    return listItems;\n  };\n\n  var setMenuForArrows = function setMenuForArrows(list) {\n    var listItems = removeHighlight(list);\n    if(list.currentIndex>0){\n      if(!listItems[list.currentIndex-1]){\n        list.currentIndex = list.currentIndex-1;\n      }\n\n      if (listItems[list.currentIndex-1]) {\n        var el = listItems[list.currentIndex-1];\n        var filterDropdownEl = el.closest('.filter-dropdown');\n        el.classList.add(constants.ACTIVE_CLASS);\n\n        if (filterDropdownEl) {\n          var filterDropdownBottom = filterDropdownEl.offsetHeight;\n          var elOffsetTop = el.offsetTop - 30;\n\n          if (elOffsetTop > filterDropdownBottom) {\n            filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom;\n          }\n        }\n      }\n    }\n  };\n\n  var mousedown = function mousedown(e) {\n    var list = e.detail.hook.list;\n    removeHighlight(list);\n    list.show();\n    list.currentIndex = 0;\n    isUpArrow = false;\n    isDownArrow = false;\n  };\n  var selectItem = function selectItem(list) {\n    var listItems = removeHighlight(list);\n    var currentItem = listItems[list.currentIndex-1];\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: list,\n        selected: currentItem,\n        data: currentItem.dataset,\n      },\n    });\n    list.list.dispatchEvent(listEvent);\n    list.hide();\n  }\n\n  var keydown = function keydown(e){\n    var typedOn = e.target;\n    var list = e.detail.hook.list;\n    var currentIndex = list.currentIndex;\n    isUpArrow = false;\n    isDownArrow = false;\n\n    if(e.detail.which){\n      currentKey = e.detail.which;\n      if(currentKey === 13){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 38) {\n        isUpArrow = true;\n      }\n      if(currentKey === 40) {\n        isDownArrow = true;\n      }\n    } else if(e.detail.key) {\n      currentKey = e.detail.key;\n      if(currentKey === 'Enter'){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 'ArrowUp') {\n        isUpArrow = true;\n      }\n      if(currentKey === 'ArrowDown') {\n        isDownArrow = true;\n      }\n    }\n    if(isUpArrow){ currentIndex--; }\n    if(isDownArrow){ currentIndex++; }\n    if(currentIndex < 0){ currentIndex = 0; }\n    list.currentIndex = currentIndex;\n    setMenuForArrows(e.detail.hook.list);\n  };\n\n  document.addEventListener('mousedown.dl', mousedown);\n  document.addEventListener('keydown.dl', keydown);\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/keyboard.js","import 'custom-event-polyfill';\nimport utils from './utils';\nimport constants from '../src/constants';\n\nvar DropDown = function(list) {\n  this.currentIndex = 0;\n  this.hidden = true;\n  this.list = typeof list === 'string' ? document.querySelector(list) : list;\n  this.items = [];\n\n  this.eventWrapper = {};\n\n  this.getItems();\n  this.initTemplateString();\n  this.addEvents();\n\n  this.initialState = list.innerHTML;\n};\n\nObject.assign(DropDown.prototype, {\n  getItems: function() {\n    this.items = [].slice.call(this.list.querySelectorAll('li'));\n    return this.items;\n  },\n\n  initTemplateString: function() {\n    var items = this.items || this.getItems();\n\n    var templateString = '';\n    if (items.length > 0) templateString = items[items.length - 1].outerHTML;\n    this.templateString = templateString;\n\n    return this.templateString;\n  },\n\n  clickEvent: function(e) {\n    var selected = utils.closest(e.target, 'LI');\n    if (!selected) return;\n\n    this.addSelectedClass(selected);\n\n    e.preventDefault();\n    this.hide();\n\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: this,\n        selected: selected,\n        data: e.target.dataset,\n      },\n    });\n    this.list.dispatchEvent(listEvent);\n  },\n\n  addSelectedClass: function (selected) {\n    this.removeSelectedClasses();\n    selected.classList.add(constants.SELECTED_CLASS);\n  },\n\n  removeSelectedClasses: function () {\n    const items = this.items || this.getItems();\n\n    items.forEach((item) => {\n      item.classList.remove(constants.SELECTED_CLASS)\n    });\n  },\n\n  addEvents: function() {\n    this.eventWrapper.clickEvent = this.clickEvent.bind(this)\n    this.list.addEventListener('click', this.eventWrapper.clickEvent);\n  },\n\n  toggle: function() {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  setData: function(data) {\n    this.data = data;\n    this.render(data);\n  },\n\n  addData: function(data) {\n    this.data = (this.data || []).concat(data);\n    this.render(this.data);\n  },\n\n  render: function(data) {\n    const children = data ? data.map(this.renderChildren.bind(this)) : [];\n    const renderableList = this.list.querySelector('ul[data-dynamic]') || this.list;\n\n    renderableList.innerHTML = children.join('');\n  },\n\n  renderChildren: function(data) {\n    var html = utils.t(this.templateString, data);\n    var template = document.createElement('div');\n\n    template.innerHTML = html;\n    this.setImagesSrc(template);\n    template.firstChild.style.display = data.droplab_hidden ? 'none' : 'block';\n\n    return template.firstChild.outerHTML;\n  },\n\n  setImagesSrc: function(template) {\n    const images = [].slice.call(template.querySelectorAll('img[data-src]'));\n\n    images.forEach((image) => {\n      image.src = image.getAttribute('data-src');\n      image.removeAttribute('data-src');\n    });\n  },\n\n  show: function() {\n    if (!this.hidden) return;\n    this.list.style.display = 'block';\n    this.currentIndex = 0;\n    this.hidden = false;\n  },\n\n  hide: function() {\n    if (this.hidden) return;\n    this.list.style.display = 'none';\n    this.currentIndex = 0;\n    this.hidden = true;\n  },\n\n  toggle: function () {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  destroy: function() {\n    this.hide();\n    this.list.removeEventListener('click', this.eventWrapper.clickEvent);\n  }\n});\n\nexport default DropDown;\n\n\n\n// WEBPACK FOOTER //\n// ./src/dropdown.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookButton = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'button';\n  this.event = 'click';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nHookButton.prototype = Object.create(Hook.prototype);\n\nObject.assign(HookButton.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  clicked: function(e){\n    var buttonEvent = new CustomEvent('click.dl', {\n      detail: {\n        hook: this,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(buttonEvent);\n\n    this.list.toggle();\n  },\n\n  addEvents: function(){\n    this.eventWrapper.clicked = this.clicked.bind(this);\n    this.trigger.addEventListener('click', this.eventWrapper.clicked);\n  },\n\n  removeEvents: function(){\n    this.trigger.removeEventListener('click', this.eventWrapper.clicked);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n  },\n\n  constructor: HookButton,\n});\n\n\nexport default HookButton;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_button.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookInput = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'input';\n  this.event = 'input';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nObject.assign(HookInput.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  addEvents: function(){\n    this.eventWrapper.mousedown = this.mousedown.bind(this);\n    this.eventWrapper.input = this.input.bind(this);\n    this.eventWrapper.keyup = this.keyup.bind(this);\n    this.eventWrapper.keydown = this.keydown.bind(this);\n\n    this.trigger.addEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.addEventListener('input', this.eventWrapper.input);\n    this.trigger.addEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.addEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  removeEvents: function() {\n    this.hasRemovedEvents = true;\n\n    this.trigger.removeEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.removeEventListener('input', this.eventWrapper.input);\n    this.trigger.removeEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.removeEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  input: function(e) {\n    if(this.hasRemovedEvents) return;\n\n    this.list.show();\n\n    const inputEvent = new CustomEvent('input.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(inputEvent);\n  },\n\n  mousedown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    const mouseEvent = new CustomEvent('mousedown.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(mouseEvent);\n  },\n\n  keyup: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keyup.dl');\n  },\n\n  keydown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keydown.dl');\n  },\n\n  keyEvent: function(e, eventName) {\n    this.list.show();\n\n    const keyEvent = new CustomEvent(eventName, {\n      detail: {\n        hook: this,\n        text: e.target.value,\n        which: e.which,\n        key: e.key,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(keyEvent);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n\n    this.list.destroy();\n  }\n});\n\nexport default HookInput;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_input.js","import DropLab from './droplab';\nimport constants from './constants';\nimport Keyboard from './keyboard';\n\nconst DATA_TRIGGER = constants.DATA_TRIGGER;\nconst keyboard = Keyboard();\n\nconst setup = function () {\n  window.DropLab = DropLab();\n};\n\nsetup();\n\nexport default setup\n\n\n\n// WEBPACK FOOTER //\n// ./src/index.js"],"sourceRoot":""} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca","webpack:///./src/constants.js","webpack:///./~/custom-event-polyfill/custom-event-polyfill.js","webpack:///./src/hook.js","webpack:///./src/utils.js","webpack:///./src/droplab.js","webpack:///./src/dropdown.js","webpack:///./src/hook_button.js","webpack:///./src/hook_input.js","webpack:///./src/keyboard.js","webpack:///./src/index.js"],"names":["DATA_TRIGGER","DATA_DROPDOWN","SELECTED_CLASS","ACTIVE_CLASS","Hook","trigger","list","plugins","config","type","event","id","Object","assign","prototype","addEvents","constructor","utils","toCamelCase","attr","camelize","split","slice","join","t","s","d","p","hasOwnProperty","call","replace","RegExp","str","letter","index","toLowerCase","toUpperCase","closest","thisTag","stopTag","tagName","parentNode","isDropDownParts","target","hasAttribute","DropLab","ready","hooks","queuedData","eventWrapper","loadStatic","dropdownTriggers","apply","document","querySelectorAll","addHooks","addData","args","arguments","applyArgs","setData","destroy","forEach","hook","removeEvents","methodName","push","_addData","data","_processData","_setData","Array","isArray","documentClicked","bind","addEventListener","e","hide","removeEventListener","changeHookList","availableTrigger","getElementById","i","dataset","dropdownActive","splice","addHook","availableHook","querySelector","availableList","Element","HookObject","setConfig","obj","fireReady","readyEvent","CustomEvent","detail","dropdown","dispatchEvent","init","DropDown","currentIndex","hidden","items","getItems","initTemplateString","initialState","innerHTML","templateString","length","outerHTML","clickEvent","selected","addSelectedClass","preventDefault","listEvent","removeSelectedClasses","classList","add","item","remove","toggle","show","render","concat","children","map","renderChildren","renderableList","html","template","createElement","setImagesSrc","firstChild","style","display","droplab_hidden","images","image","src","getAttribute","removeAttribute","HookButton","addPlugins","create","plugin","clicked","buttonEvent","bubbles","cancelable","restoreInitialState","removePlugins","HookInput","mousedown","input","keyup","keydown","hasRemovedEvents","inputEvent","text","value","mouseEvent","keyEvent","eventName","which","key","Keyboard","currentKey","currentFocus","isUpArrow","isDownArrow","removeHighlight","itemElements","listItems","listItem","setMenuForArrows","el","filterDropdownEl","filterDropdownBottom","offsetHeight","elOffsetTop","offsetTop","scrollTop","selectItem","currentItem","typedOn"],"mappings":"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","file":"./dist/droplab.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 14);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","const DATA_TRIGGER = 'data-dropdown-trigger';\nconst DATA_DROPDOWN = 'data-dropdown';\nconst SELECTED_CLASS = 'droplab-item-selected';\nconst ACTIVE_CLASS = 'droplab-item-active';\n\nexport {\n  DATA_TRIGGER,\n  DATA_DROPDOWN,\n  SELECTED_CLASS,\n  ACTIVE_CLASS,\n};\n\n\n\n// WEBPACK FOOTER //\n// ./src/constants.js","// Polyfill for creating CustomEvents on IE9/10/11\n\n// code pulled from:\n// https://github.com/d4tocchini/customevent-polyfill\n// https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent#Polyfill\n\ntry {\n    var ce = new window.CustomEvent('test');\n    ce.preventDefault();\n    if (ce.defaultPrevented !== true) {\n        // IE has problems with .preventDefault() on custom events\n        // http://stackoverflow.com/questions/23349191\n        throw new Error('Could not prevent default');\n    }\n} catch(e) {\n  var CustomEvent = function(event, params) {\n    var evt, origPrevent;\n    params = params || {\n      bubbles: false,\n      cancelable: false,\n      detail: undefined\n    };\n\n    evt = document.createEvent(\"CustomEvent\");\n    evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);\n    origPrevent = evt.preventDefault;\n    evt.preventDefault = function () {\n      origPrevent.call(this);\n      try {\n        Object.defineProperty(this, 'defaultPrevented', {\n          get: function () {\n            return true;\n          }\n        });\n      } catch(e) {\n        this.defaultPrevented = true;\n      }\n    };\n    return evt;\n  };\n\n  CustomEvent.prototype = window.Event.prototype;\n  window.CustomEvent = CustomEvent; // expose definition to window\n}\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./~/custom-event-polyfill/custom-event-polyfill.js\n// module id = 1\n// module chunks = 0 1","import DropDown from './dropdown';\n\nvar Hook = function(trigger, list, plugins, config){\n  this.trigger = trigger;\n  this.list = new DropDown(list);\n  this.type = 'Hook';\n  this.event = 'click';\n  this.plugins = plugins || [];\n  this.config = config || {};\n  this.id = trigger.id;\n};\n\nObject.assign(Hook.prototype, {\n\n  addEvents: function(){},\n\n  constructor: Hook,\n});\n\nexport default Hook;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook.js","import { DATA_TRIGGER, DATA_DROPDOWN } from './constants';\n\nconst utils = {\n  toCamelCase(attr) {\n    return this.camelize(attr.split('-').slice(1).join(' '));\n  },\n\n  t(s, d) {\n    for (const p in d) {\n      if (Object.prototype.hasOwnProperty.call(d, p)) {\n        s = s.replace(new RegExp(`{{${p}}}`, 'g'), d[p]);\n      }\n    }\n    return s;\n  },\n\n  camelize(str) {\n    return str.replace(/(?:^\\w|[A-Z]|\\b\\w)/g, (letter, index) => {\n      return index === 0 ? letter.toLowerCase() : letter.toUpperCase();\n    }).replace(/\\s+/g, '');\n  },\n\n  closest(thisTag, stopTag) {\n    while (thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML') {\n      thisTag = thisTag.parentNode;\n    }\n    return thisTag;\n  },\n\n  isDropDownParts(target) {\n    if (!target || target.tagName === 'HTML') return false;\n    return target.hasAttribute(DATA_TRIGGER) || target.hasAttribute(DATA_DROPDOWN);\n  },\n};\n\n\nexport default utils;\n\n\n\n// WEBPACK FOOTER //\n// ./src/utils.js","import 'custom-event-polyfill';\nimport HookButton from './hook_button';\nimport HookInput from './hook_input';\nimport utils from './utils';\nimport Keyboard from './keyboard';\nimport { DATA_TRIGGER } from './constants';\n\nvar DropLab = function() {\n  this.ready = false;\n  this.hooks = [];\n  this.queuedData = [];\n  this.config = {};\n\n  this.eventWrapper = {};\n};\n\nObject.assign(DropLab.prototype, {\n  loadStatic: function(){\n    var dropdownTriggers = [].slice.apply(document.querySelectorAll(`[${DATA_TRIGGER}]`));\n    this.addHooks(dropdownTriggers);\n  },\n\n  addData: function () {\n    var args = [].slice.apply(arguments);\n    this.applyArgs(args, '_addData');\n  },\n\n  setData: function() {\n    var args = [].slice.apply(arguments);\n    this.applyArgs(args, '_setData');\n  },\n\n  destroy: function() {\n    this.hooks.forEach(hook => hook.destroy());\n    this.hooks = [];\n    this.removeEvents();\n  },\n\n  applyArgs: function(args, methodName) {\n    if (this.ready) return this[methodName].apply(this, args);\n\n    this.queuedData = this.queuedData || [];\n    this.queuedData.push(args);\n  },\n\n  _addData: function(trigger, data) {\n    this._processData(trigger, data, 'addData');\n  },\n\n  _setData: function(trigger, data) {\n    this._processData(trigger, data, 'setData');\n  },\n\n  _processData: function(trigger, data, methodName) {\n    this.hooks.forEach((hook) => {\n      if (Array.isArray(trigger)) hook.list[methodName](trigger);\n\n      if (hook.trigger.id === trigger) hook.list[methodName](data);\n    });\n  },\n\n  addEvents: function() {\n    this.eventWrapper.documentClicked = this.documentClicked.bind(this)\n    document.addEventListener('click', this.eventWrapper.documentClicked);\n  },\n\n  documentClicked: function(e) {\n    let thisTag = e.target;\n\n    if (thisTag.tagName !== 'UL') thisTag = utils.closest(thisTag, 'UL');\n    if (utils.isDropDownParts(thisTag, this.hooks) || utils.isDropDownParts(e.target, this.hooks)) return;\n\n    this.hooks.forEach(hook => hook.list.hide());\n  },\n\n  removeEvents: function(){\n    document.removeEventListener('click', this.eventWrapper.documentClicked);\n  },\n\n  changeHookList: function(trigger, list, plugins, config) {\n    const availableTrigger =  typeof trigger === 'string' ? document.getElementById(trigger) : trigger;\n\n\n    this.hooks.forEach((hook, i) => {\n      hook.list.list.dataset.dropdownActive = false;\n\n      if (hook.trigger !== availableTrigger) return;\n\n      hook.destroy();\n      this.hooks.splice(i, 1);\n      this.addHook(availableTrigger, list, plugins, config);\n    });\n  },\n\n  addHook: function(hook, list, plugins, config) {\n    const availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook;\n    let availableList;\n\n    if (typeof list === 'string') {\n      availableList = document.querySelector(list);\n    } else if (list instanceof Element) {\n      availableList = list;\n    } else {\n      availableList = document.querySelector(hook.dataset[utils.toCamelCase(DATA_TRIGGER)]);\n    }\n\n    availableList.dataset.dropdownActive = true;\n\n    const HookObject = availableHook.tagName === 'INPUT' ? HookInput : HookButton;\n    this.hooks.push(new HookObject(availableHook, availableList, plugins, config));\n\n    return this;\n  },\n\n  addHooks: function(hooks, plugins, config) {\n    hooks.forEach(hook => this.addHook(hook, null, plugins, config));\n    return this;\n  },\n\n  setConfig: function(obj){\n    this.config = obj;\n  },\n\n  fireReady: function() {\n    const readyEvent = new CustomEvent('ready.dl', {\n      detail: {\n        dropdown: this,\n      },\n    });\n    document.dispatchEvent(readyEvent);\n\n    this.ready = true;\n  },\n\n  init: function (hook, list, plugins, config) {\n    hook ? this.addHook(hook, list, plugins, config) : this.loadStatic();\n\n    this.addEvents();\n\n    Keyboard();\n\n    this.fireReady();\n\n    this.queuedData.forEach(data => this.addData(data));\n    this.queuedData = [];\n\n    return this;\n  },\n});\n\nexport default DropLab;\n\n\n\n// WEBPACK FOOTER //\n// ./src/droplab.js","import 'custom-event-polyfill';\nimport utils from './utils';\nimport { SELECTED_CLASS } from '../src/constants';\n\nvar DropDown = function(list) {\n  this.currentIndex = 0;\n  this.hidden = true;\n  this.list = typeof list === 'string' ? document.querySelector(list) : list;\n  this.items = [];\n\n  this.eventWrapper = {};\n\n  this.getItems();\n  this.initTemplateString();\n  this.addEvents();\n\n  this.initialState = list.innerHTML;\n};\n\nObject.assign(DropDown.prototype, {\n  getItems: function() {\n    this.items = [].slice.call(this.list.querySelectorAll('li'));\n    return this.items;\n  },\n\n  initTemplateString: function() {\n    var items = this.items || this.getItems();\n\n    var templateString = '';\n    if (items.length > 0) templateString = items[items.length - 1].outerHTML;\n    this.templateString = templateString;\n\n    return this.templateString;\n  },\n\n  clickEvent: function(e) {\n    var selected = utils.closest(e.target, 'LI');\n    if (!selected) return;\n\n    this.addSelectedClass(selected);\n\n    e.preventDefault();\n    this.hide();\n\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: this,\n        selected: selected,\n        data: e.target.dataset,\n      },\n    });\n    this.list.dispatchEvent(listEvent);\n  },\n\n  addSelectedClass: function (selected) {\n    this.removeSelectedClasses();\n    selected.classList.add(SELECTED_CLASS);\n  },\n\n  removeSelectedClasses: function () {\n    const items = this.items || this.getItems();\n\n    items.forEach(item => item.classList.remove(SELECTED_CLASS));\n  },\n\n  addEvents: function() {\n    this.eventWrapper.clickEvent = this.clickEvent.bind(this)\n    this.list.addEventListener('click', this.eventWrapper.clickEvent);\n  },\n\n  toggle: function() {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  setData: function(data) {\n    this.data = data;\n    this.render(data);\n  },\n\n  addData: function(data) {\n    this.data = (this.data || []).concat(data);\n    this.render(this.data);\n  },\n\n  render: function(data) {\n    const children = data ? data.map(this.renderChildren.bind(this)) : [];\n    const renderableList = this.list.querySelector('ul[data-dynamic]') || this.list;\n\n    renderableList.innerHTML = children.join('');\n  },\n\n  renderChildren: function(data) {\n    var html = utils.t(this.templateString, data);\n    var template = document.createElement('div');\n\n    template.innerHTML = html;\n    this.setImagesSrc(template);\n    template.firstChild.style.display = data.droplab_hidden ? 'none' : 'block';\n\n    return template.firstChild.outerHTML;\n  },\n\n  setImagesSrc: function(template) {\n    const images = [].slice.call(template.querySelectorAll('img[data-src]'));\n\n    images.forEach((image) => {\n      image.src = image.getAttribute('data-src');\n      image.removeAttribute('data-src');\n    });\n  },\n\n  show: function() {\n    if (!this.hidden) return;\n    this.list.style.display = 'block';\n    this.currentIndex = 0;\n    this.hidden = false;\n  },\n\n  hide: function() {\n    if (this.hidden) return;\n    this.list.style.display = 'none';\n    this.currentIndex = 0;\n    this.hidden = true;\n  },\n\n  toggle: function () {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  destroy: function() {\n    this.hide();\n    this.list.removeEventListener('click', this.eventWrapper.clickEvent);\n  }\n});\n\nexport default DropDown;\n\n\n\n// WEBPACK FOOTER //\n// ./src/dropdown.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookButton = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'button';\n  this.event = 'click';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nHookButton.prototype = Object.create(Hook.prototype);\n\nObject.assign(HookButton.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  clicked: function(e){\n    var buttonEvent = new CustomEvent('click.dl', {\n      detail: {\n        hook: this,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(buttonEvent);\n\n    this.list.toggle();\n  },\n\n  addEvents: function(){\n    this.eventWrapper.clicked = this.clicked.bind(this);\n    this.trigger.addEventListener('click', this.eventWrapper.clicked);\n  },\n\n  removeEvents: function(){\n    this.trigger.removeEventListener('click', this.eventWrapper.clicked);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n  },\n\n  constructor: HookButton,\n});\n\n\nexport default HookButton;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_button.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookInput = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'input';\n  this.event = 'input';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nObject.assign(HookInput.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  addEvents: function(){\n    this.eventWrapper.mousedown = this.mousedown.bind(this);\n    this.eventWrapper.input = this.input.bind(this);\n    this.eventWrapper.keyup = this.keyup.bind(this);\n    this.eventWrapper.keydown = this.keydown.bind(this);\n\n    this.trigger.addEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.addEventListener('input', this.eventWrapper.input);\n    this.trigger.addEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.addEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  removeEvents: function() {\n    this.hasRemovedEvents = true;\n\n    this.trigger.removeEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.removeEventListener('input', this.eventWrapper.input);\n    this.trigger.removeEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.removeEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  input: function(e) {\n    if(this.hasRemovedEvents) return;\n\n    this.list.show();\n\n    const inputEvent = new CustomEvent('input.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(inputEvent);\n  },\n\n  mousedown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    const mouseEvent = new CustomEvent('mousedown.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(mouseEvent);\n  },\n\n  keyup: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keyup.dl');\n  },\n\n  keydown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keydown.dl');\n  },\n\n  keyEvent: function(e, eventName) {\n    this.list.show();\n\n    const keyEvent = new CustomEvent(eventName, {\n      detail: {\n        hook: this,\n        text: e.target.value,\n        which: e.which,\n        key: e.key,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(keyEvent);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n\n    this.list.destroy();\n  }\n});\n\nexport default HookInput;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_input.js","import { ACTIVE_CLASS } from './constants';\n\nconst Keyboard = function () {\n  var currentKey;\n  var currentFocus;\n  var isUpArrow = false;\n  var isDownArrow = false;\n  var removeHighlight = function removeHighlight(list) {\n    var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0);\n    var listItems = [];\n    for(var i = 0; i < itemElements.length; i++) {\n      var listItem = itemElements[i];\n      listItem.classList.remove(ACTIVE_CLASS);\n\n      if (listItem.style.display !== 'none') {\n        listItems.push(listItem);\n      }\n    }\n    return listItems;\n  };\n\n  var setMenuForArrows = function setMenuForArrows(list) {\n    var listItems = removeHighlight(list);\n    if(list.currentIndex>0){\n      if(!listItems[list.currentIndex-1]){\n        list.currentIndex = list.currentIndex-1;\n      }\n\n      if (listItems[list.currentIndex-1]) {\n        var el = listItems[list.currentIndex-1];\n        var filterDropdownEl = el.closest('.filter-dropdown');\n        el.classList.add(ACTIVE_CLASS);\n\n        if (filterDropdownEl) {\n          var filterDropdownBottom = filterDropdownEl.offsetHeight;\n          var elOffsetTop = el.offsetTop - 30;\n\n          if (elOffsetTop > filterDropdownBottom) {\n            filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom;\n          }\n        }\n      }\n    }\n  };\n\n  var mousedown = function mousedown(e) {\n    var list = e.detail.hook.list;\n    removeHighlight(list);\n    list.show();\n    list.currentIndex = 0;\n    isUpArrow = false;\n    isDownArrow = false;\n  };\n  var selectItem = function selectItem(list) {\n    var listItems = removeHighlight(list);\n    var currentItem = listItems[list.currentIndex-1];\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: list,\n        selected: currentItem,\n        data: currentItem.dataset,\n      },\n    });\n    list.list.dispatchEvent(listEvent);\n    list.hide();\n  }\n\n  var keydown = function keydown(e){\n    var typedOn = e.target;\n    var list = e.detail.hook.list;\n    var currentIndex = list.currentIndex;\n    isUpArrow = false;\n    isDownArrow = false;\n\n    if(e.detail.which){\n      currentKey = e.detail.which;\n      if(currentKey === 13){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 38) {\n        isUpArrow = true;\n      }\n      if(currentKey === 40) {\n        isDownArrow = true;\n      }\n    } else if(e.detail.key) {\n      currentKey = e.detail.key;\n      if(currentKey === 'Enter'){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 'ArrowUp') {\n        isUpArrow = true;\n      }\n      if(currentKey === 'ArrowDown') {\n        isDownArrow = true;\n      }\n    }\n    if(isUpArrow){ currentIndex--; }\n    if(isDownArrow){ currentIndex++; }\n    if(currentIndex < 0){ currentIndex = 0; }\n    list.currentIndex = currentIndex;\n    setMenuForArrows(e.detail.hook.list);\n  };\n\n  document.addEventListener('mousedown.dl', mousedown);\n  document.addEventListener('keydown.dl', keydown);\n};\n\nexport default Keyboard;\n\n\n\n// WEBPACK FOOTER //\n// ./src/keyboard.js","export * from './droplab';\n\n\n\n// WEBPACK FOOTER //\n// ./src/index.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/ajax.js b/app/assets/javascripts/droplab/plugins/ajax.js index e68983416ec..afc423b7f0e 100644 --- a/app/assets/javascripts/droplab/plugins/ajax.js +++ b/app/assets/javascripts/droplab/plugins/ajax.js @@ -63,12 +63,12 @@ /******/ __webpack_require__.p = ""; /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 10); +/******/ return __webpack_require__(__webpack_require__.s = 5); /******/ }) /************************************************************************/ /******/ ({ -/***/ 10: +/***/ 5: /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -149,11 +149,9 @@ var droplabAjax = { } }; -window.droplabAjax = droplabAjax; - exports.default = droplabAjax; /***/ }) /******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c?ec5f***","webpack:///./src/plugins/ajax.js"],"names":["droplabAjaxException","message","droplabAjax","_loadUrlData","url","self","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","data","JSON","parse","responseText","cache","send","_loadData","config","loadingTemplate","dataLoadingTemplate","hook","list","querySelector","outerHTML","listTemplate","destroyed","method","call","init","endpoint","dynamicList","document","createElement","innerHTML","setAttribute","then","d","catch","e","destroy","window"],"mappings":"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","file":"./dist/plugins/ajax.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 10);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","function droplabAjaxException(message) {\n  this.message = message;\n}\n\nconst droplabAjax = {\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n  _loadData: function _loadData(data, config, self) {\n    if (config.loadingTemplate) {\n      var dataLoadingTemplate = self.hook.list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) dataLoadingTemplate.outerHTML = self.listTemplate;\n    }\n\n    if (!self.destroyed) self.hook.list[config.method].call(self.hook.list, data);\n  },\n  init: function init(hook) {\n    var self = this;\n    self.destroyed = false;\n    self.cache = self.cache || {};\n    var config = hook.config.droplabAjax;\n    this.hook = hook;\n    if (!config || !config.endpoint || !config.method) {\n      return;\n    }\n    if (config.method !== 'setData' && config.method !== 'addData') {\n      return;\n    }\n    if (config.loadingTemplate) {\n      var dynamicList = hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', '');\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (self.cache[config.endpoint]) {\n      self._loadData(self.cache[config.endpoint], config, self);\n    } else {\n      this._loadUrlData(config.endpoint)\n        .then(function(d) {\n          self._loadData(d, config, self);\n        }).catch(function(e) {\n          throw new droplabAjaxException(e.message || e);\n        });\n    }\n  },\n  destroy: function() {\n    this.destroyed = true;\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nwindow.droplabAjax = droplabAjax;\n\nexport default droplabAjax;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax.js"],"sourceRoot":""} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca?0abf********","webpack:///./src/plugins/ajax/ajax.js?2178"],"names":["droplabAjaxException","message","droplabAjax","_loadUrlData","url","self","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","data","JSON","parse","responseText","cache","send","_loadData","config","loadingTemplate","dataLoadingTemplate","hook","list","querySelector","outerHTML","listTemplate","destroyed","method","call","init","endpoint","dynamicList","document","createElement","innerHTML","setAttribute","then","d","catch","e","destroy"],"mappings":"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","file":"./dist/plugins/ajax.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 5);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","function droplabAjaxException(message) {\n  this.message = message;\n}\n\nconst droplabAjax = {\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n  _loadData: function _loadData(data, config, self) {\n    if (config.loadingTemplate) {\n      var dataLoadingTemplate = self.hook.list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) dataLoadingTemplate.outerHTML = self.listTemplate;\n    }\n\n    if (!self.destroyed) self.hook.list[config.method].call(self.hook.list, data);\n  },\n  init: function init(hook) {\n    var self = this;\n    self.destroyed = false;\n    self.cache = self.cache || {};\n    var config = hook.config.droplabAjax;\n    this.hook = hook;\n    if (!config || !config.endpoint || !config.method) {\n      return;\n    }\n    if (config.method !== 'setData' && config.method !== 'addData') {\n      return;\n    }\n    if (config.loadingTemplate) {\n      var dynamicList = hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', '');\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (self.cache[config.endpoint]) {\n      self._loadData(self.cache[config.endpoint], config, self);\n    } else {\n      this._loadUrlData(config.endpoint)\n        .then(function(d) {\n          self._loadData(d, config, self);\n        }).catch(function(e) {\n          throw new droplabAjaxException(e.message || e);\n        });\n    }\n  },\n  destroy: function() {\n    this.destroyed = true;\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nexport default droplabAjax;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax/ajax.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/ajax_filter.js b/app/assets/javascripts/droplab/plugins/ajax_filter.js index b5892694e60..3e6532c7709 100644 --- a/app/assets/javascripts/droplab/plugins/ajax_filter.js +++ b/app/assets/javascripts/droplab/plugins/ajax_filter.js @@ -63,12 +63,12 @@ /******/ __webpack_require__.p = ""; /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 11); +/******/ return __webpack_require__(__webpack_require__.s = 6); /******/ }) /************************************************************************/ /******/ ({ -/***/ 11: +/***/ 6: /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -206,11 +206,9 @@ var droplabAjaxFilter = { } }; -window.droplabAjaxFilter = droplabAjaxFilter; - exports.default = droplabAjaxFilter; /***/ }) /******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c?ec5f**","webpack:///./src/plugins/ajax_filter.js"],"names":["droplabAjaxFilter","init","hook","destroyed","notLoading","eventWrapper","debounceTrigger","bind","trigger","addEventListener","loading","e","NON_CHARACTER_KEYS","invalidKeyPressed","indexOf","detail","which","keyCode","focusEvent","type","timeout","clearTimeout","setTimeout","getEntireList","config","searchValue","value","endpoint","searchKey","searchValueFunction","loadingTemplate","list","data","undefined","length","dynamicList","querySelector","document","createElement","innerHTML","setAttribute","listTemplate","outerHTML","show","params","self","cache","url","buildParams","urlCachedData","_loadData","_loadUrlData","then","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","JSON","parse","responseText","send","dataLoadingTemplate","hookListChildren","children","onlyDynamicList","hasAttribute","hide","setData","call","currentIndex","paramsArray","Object","keys","map","param","join","destroy","removeEventListener","window"],"mappings":"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","file":"./dist/plugins/ajax_filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 11);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","const droplabAjaxFilter = {\n  init: function(hook) {\n    this.destroyed = false;\n    this.hook = hook;\n    this.notLoading();\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceTrigger = this.debounceTrigger.bind(this);\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.addEventListener('focus', this.eventWrapper.debounceTrigger);\n\n    this.trigger(true);\n  },\n\n  notLoading: function notLoading() {\n    this.loading = false;\n  },\n\n  debounceTrigger: function debounceTrigger(e) {\n    var NON_CHARACTER_KEYS = [16, 17, 18, 20, 37, 38, 39, 40, 91, 93];\n    var invalidKeyPressed = NON_CHARACTER_KEYS.indexOf(e.detail.which || e.detail.keyCode) > -1;\n    var focusEvent = e.type === 'focus';\n    if (invalidKeyPressed || this.loading) {\n      return;\n    }\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n    this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200);\n  },\n\n  trigger: function trigger(getEntireList) {\n    var config = this.hook.config.droplabAjaxFilter;\n    var searchValue = this.trigger.value;\n    if (!config || !config.endpoint || !config.searchKey) {\n      return;\n    }\n    if (config.searchValueFunction) {\n      searchValue = config.searchValueFunction();\n    }\n    if (config.loadingTemplate && this.hook.list.data === undefined ||\n      this.hook.list.data.length === 0) {\n      var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', true);\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (getEntireList) {\n      searchValue = '';\n    }\n    if (config.searchKey === searchValue) {\n      return this.list.show();\n    }\n    this.loading = true;\n    var params = config.params || {};\n    params[config.searchKey] = searchValue;\n    var self = this;\n    self.cache = self.cache || {};\n    var url = config.endpoint + this.buildParams(params);\n    var urlCachedData = self.cache[url];\n    if (urlCachedData) {\n      self._loadData(urlCachedData, config, self);\n    } else {\n      this._loadUrlData(url)\n        .then(function(data) {\n          self._loadData(data, config, self);\n        });\n    }\n  },\n\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n\n  _loadData: function _loadData(data, config, self) {\n    const list = self.hook.list;\n    if (config.loadingTemplate && list.data === undefined ||\n      list.data.length === 0) {\n      const dataLoadingTemplate = list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) {\n        dataLoadingTemplate.outerHTML = self.listTemplate;\n      }\n    }\n    if (!self.destroyed) {\n      var hookListChildren = list.list.children;\n      var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic');\n      if (onlyDynamicList && data.length === 0) {\n        list.hide();\n      }\n      list.setData.call(list, data);\n    }\n    self.notLoading();\n    list.currentIndex = 0;\n  },\n\n  buildParams: function(params) {\n    if (!params) return '';\n    var paramsArray = Object.keys(params).map(function(param) {\n      return param + '=' + (params[param] || '');\n    });\n    return '?' + paramsArray.join('&');\n  },\n\n  destroy: function destroy() {\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n\n    this.destroyed = true;\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.removeEventListener('focus', this.eventWrapper.debounceTrigger);\n  }\n};\n\nwindow.droplabAjaxFilter = droplabAjaxFilter;\n\nexport default droplabAjaxFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax_filter.js"],"sourceRoot":""} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca?0abf*******","webpack:///./src/plugins/ajax_filter/ajax_filter.js?c3e5"],"names":["droplabAjaxFilter","init","hook","destroyed","notLoading","eventWrapper","debounceTrigger","bind","trigger","addEventListener","loading","e","NON_CHARACTER_KEYS","invalidKeyPressed","indexOf","detail","which","keyCode","focusEvent","type","timeout","clearTimeout","setTimeout","getEntireList","config","searchValue","value","endpoint","searchKey","searchValueFunction","loadingTemplate","list","data","undefined","length","dynamicList","querySelector","document","createElement","innerHTML","setAttribute","listTemplate","outerHTML","show","params","self","cache","url","buildParams","urlCachedData","_loadData","_loadUrlData","then","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","JSON","parse","responseText","send","dataLoadingTemplate","hookListChildren","children","onlyDynamicList","hasAttribute","hide","setData","call","currentIndex","paramsArray","Object","keys","map","param","join","destroy","removeEventListener"],"mappings":"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","file":"./dist/plugins/ajax_filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 6);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","const droplabAjaxFilter = {\n  init: function(hook) {\n    this.destroyed = false;\n    this.hook = hook;\n    this.notLoading();\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceTrigger = this.debounceTrigger.bind(this);\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.addEventListener('focus', this.eventWrapper.debounceTrigger);\n\n    this.trigger(true);\n  },\n\n  notLoading: function notLoading() {\n    this.loading = false;\n  },\n\n  debounceTrigger: function debounceTrigger(e) {\n    var NON_CHARACTER_KEYS = [16, 17, 18, 20, 37, 38, 39, 40, 91, 93];\n    var invalidKeyPressed = NON_CHARACTER_KEYS.indexOf(e.detail.which || e.detail.keyCode) > -1;\n    var focusEvent = e.type === 'focus';\n    if (invalidKeyPressed || this.loading) {\n      return;\n    }\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n    this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200);\n  },\n\n  trigger: function trigger(getEntireList) {\n    var config = this.hook.config.droplabAjaxFilter;\n    var searchValue = this.trigger.value;\n    if (!config || !config.endpoint || !config.searchKey) {\n      return;\n    }\n    if (config.searchValueFunction) {\n      searchValue = config.searchValueFunction();\n    }\n    if (config.loadingTemplate && this.hook.list.data === undefined ||\n      this.hook.list.data.length === 0) {\n      var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', true);\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (getEntireList) {\n      searchValue = '';\n    }\n    if (config.searchKey === searchValue) {\n      return this.list.show();\n    }\n    this.loading = true;\n    var params = config.params || {};\n    params[config.searchKey] = searchValue;\n    var self = this;\n    self.cache = self.cache || {};\n    var url = config.endpoint + this.buildParams(params);\n    var urlCachedData = self.cache[url];\n    if (urlCachedData) {\n      self._loadData(urlCachedData, config, self);\n    } else {\n      this._loadUrlData(url)\n        .then(function(data) {\n          self._loadData(data, config, self);\n        });\n    }\n  },\n\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n\n  _loadData: function _loadData(data, config, self) {\n    const list = self.hook.list;\n    if (config.loadingTemplate && list.data === undefined ||\n      list.data.length === 0) {\n      const dataLoadingTemplate = list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) {\n        dataLoadingTemplate.outerHTML = self.listTemplate;\n      }\n    }\n    if (!self.destroyed) {\n      var hookListChildren = list.list.children;\n      var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic');\n      if (onlyDynamicList && data.length === 0) {\n        list.hide();\n      }\n      list.setData.call(list, data);\n    }\n    self.notLoading();\n    list.currentIndex = 0;\n  },\n\n  buildParams: function(params) {\n    if (!params) return '';\n    var paramsArray = Object.keys(params).map(function(param) {\n      return param + '=' + (params[param] || '');\n    });\n    return '?' + paramsArray.join('&');\n  },\n\n  destroy: function destroy() {\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n\n    this.destroyed = true;\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.removeEventListener('focus', this.eventWrapper.debounceTrigger);\n  }\n};\n\nexport default droplabAjaxFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax_filter/ajax_filter.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/filter.js b/app/assets/javascripts/droplab/plugins/filter.js index 183d137b3a3..3d81fbd7d2f 100644 --- a/app/assets/javascripts/droplab/plugins/filter.js +++ b/app/assets/javascripts/droplab/plugins/filter.js @@ -63,12 +63,12 @@ /******/ __webpack_require__.p = ""; /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 12); +/******/ return __webpack_require__(__webpack_require__.s = 7); /******/ }) /************************************************************************/ /******/ ({ -/***/ 12: +/***/ 7: /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -150,10 +150,12 @@ var droplabFilter = { this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this); this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown); + this.hook.trigger.addEventListener('mousedown.dl', this.eventWrapper.debounceKeydown); }, destroy: function destroy() { this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown); + this.hook.trigger.removeEventListener('mousedown.dl', this.eventWrapper.debounceKeydown); var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); if (this.listTemplate && dynamicList) { @@ -162,11 +164,9 @@ var droplabFilter = { } }; -window.droplabFilter = droplabFilter; - exports.default = droplabFilter; /***/ }) /******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap f37672b7f528b472a44c?ec5f*","webpack:///./src/plugins/filter.js"],"names":["droplabFilter","keydown","e","hiddenCount","dataHiddenCount","list","detail","hook","data","value","trigger","toLowerCase","config","matches","filterFunction","o","droplab_hidden","template","indexOf","filter","length","map","render","currentIndex","debounceKeydown","which","keyCode","timeout","clearTimeout","setTimeout","bind","init","eventWrapper","addEventListener","destroy","removeEventListener","dynamicList","querySelector","listTemplate","outerHTML","window"],"mappings":";AAAA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;;AAEA;AACA,mDAA2C,cAAc;;AAEzD;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAK;AACL;AACA;;AAEA;AACA;AACA;AACA,mCAA2B,0BAA0B,EAAE;AACvD,yCAAiC,eAAe;AAChD;AACA;AACA;;AAEA;AACA,8DAAsD,+DAA+D;;AAErH;AACA;;AAEA;AACA;;;;;;;;;;;;;;AChEA,IAAMA,gBAAgB;AACpBC,WAAS,iBAASC,CAAT,EAAW;AAClB,QAAIC,cAAc,CAAlB;AACA,QAAIC,kBAAkB,CAAtB;;AAEA,QAAIC,OAAOH,EAAEI,MAAF,CAASC,IAAT,CAAcF,IAAzB;AACA,QAAIG,OAAOH,KAAKG,IAAhB;AACA,QAAIC,QAAQP,EAAEI,MAAF,CAASC,IAAT,CAAcG,OAAd,CAAsBD,KAAtB,CAA4BE,WAA5B,EAAZ;AACA,QAAIC,SAASV,EAAEI,MAAF,CAASC,IAAT,CAAcK,MAAd,CAAqBZ,aAAlC;AACA,QAAIa,UAAU,EAAd;AACA,QAAIC,cAAJ;AACA;AACA,QAAG,CAACN,IAAJ,EAAS;AACP;AACD;;AAED,QAAII,UAAUA,OAAOE,cAAjB,IAAmC,OAAOF,OAAOE,cAAd,KAAiC,UAAxE,EAAoF;AAClFA,uBAAiBF,OAAOE,cAAxB;AACD,KAFD,MAEO;AACLA,uBAAiB,wBAASC,CAAT,EAAW;AAC1B;AACAA,UAAEC,cAAF,GAAmBD,EAAEH,OAAOK,QAAT,EAAmBN,WAAnB,GAAiCO,OAAjC,CAAyCT,KAAzC,MAAoD,CAAC,CAAxE;AACA,eAAOM,CAAP;AACD,OAJD;AAKD;;AAEDX,sBAAkBI,KAAKW,MAAL,CAAY,UAASJ,CAAT,EAAY;AACxC,aAAO,CAACA,EAAEC,cAAV;AACD,KAFiB,EAEfI,MAFH;;AAIAP,cAAUL,KAAKa,GAAL,CAAS,UAASN,CAAT,EAAY;AAC7B,aAAOD,eAAeC,CAAf,EAAkBN,KAAlB,CAAP;AACD,KAFS,CAAV;;AAIAN,kBAAcU,QAAQM,MAAR,CAAe,UAASJ,CAAT,EAAY;AACvC,aAAO,CAACA,EAAEC,cAAV;AACD,KAFa,EAEXI,MAFH;;AAIA,QAAIhB,oBAAoBD,WAAxB,EAAqC;AACnCE,WAAKiB,MAAL,CAAYT,OAAZ;AACAR,WAAKkB,YAAL,GAAoB,CAApB;AACD;AACF,GA1CmB;;AA4CpBC,mBAAiB,SAASA,eAAT,CAAyBtB,CAAzB,EAA4B;AAC3C,QAAI,CACF,EADE,EACE;AACJ,MAFE,EAEE;AACJ,MAHE,EAGE;AACJ,MAJE,EAIE;AACJ,MALE,EAKE;AACJ,MANE,EAME;AACJ,MAPE,EAOE;AACJ,MARE,EAQE;AACJ,MATE,EASE;AACJ,MAVE,EAUE;AACJ,MAXE,EAWE;AACJ,MAZE,EAaFgB,OAbE,CAaMhB,EAAEI,MAAF,CAASmB,KAAT,IAAkBvB,EAAEI,MAAF,CAASoB,OAbjC,IAa4C,CAAC,CAbjD,EAaoD;;AAEpD,QAAI,KAAKC,OAAT,EAAkBC,aAAa,KAAKD,OAAlB;AAClB,SAAKA,OAAL,GAAeE,WAAW,KAAK5B,OAAL,CAAa6B,IAAb,CAAkB,IAAlB,EAAwB5B,CAAxB,CAAX,EAAuC,GAAvC,CAAf;AACD,GA9DmB;;AAgEpB6B,QAAM,SAASA,IAAT,CAAcxB,IAAd,EAAoB;AACxB,QAAIK,SAASL,KAAKK,MAAL,CAAYZ,aAAzB;;AAEA,QAAI,CAACY,MAAD,IAAW,CAACA,OAAOK,QAAvB,EAAiC;;AAEjC,SAAKV,IAAL,GAAYA,IAAZ;;AAEA,SAAKyB,YAAL,GAAoB,EAApB;AACA,SAAKA,YAAL,CAAkBR,eAAlB,GAAoC,KAAKA,eAAL,CAAqBM,IAArB,CAA0B,IAA1B,CAApC;;AAEA,SAAKvB,IAAL,CAAUG,OAAV,CAAkBuB,gBAAlB,CAAmC,YAAnC,EAAiD,KAAKD,YAAL,CAAkBR,eAAnE;AACD,GA3EmB;;AA6EpBU,WAAS,SAASA,OAAT,GAAmB;AAC1B,SAAK3B,IAAL,CAAUG,OAAV,CAAkByB,mBAAlB,CAAsC,YAAtC,EAAoD,KAAKH,YAAL,CAAkBR,eAAtE;;AAEA,QAAIY,cAAc,KAAK7B,IAAL,CAAUF,IAAV,CAAeA,IAAf,CAAoBgC,aAApB,CAAkC,gBAAlC,CAAlB;AACA,QAAI,KAAKC,YAAL,IAAqBF,WAAzB,EAAsC;AACpCA,kBAAYG,SAAZ,GAAwB,KAAKD,YAA7B;AACD;AACF;AApFmB,CAAtB;;AAuFAE,OAAOxC,aAAP,GAAuBA,aAAvB;;kBAEeA,a","file":"./dist/plugins/filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 12);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f37672b7f528b472a44c","const droplabFilter = {\n  keydown: function(e){\n    var hiddenCount = 0;\n    var dataHiddenCount = 0;\n\n    var list = e.detail.hook.list;\n    var data = list.data;\n    var value = e.detail.hook.trigger.value.toLowerCase();\n    var config = e.detail.hook.config.droplabFilter;\n    var matches = [];\n    var filterFunction;\n    // will only work on dynamically set data\n    if(!data){\n      return;\n    }\n\n    if (config && config.filterFunction && typeof config.filterFunction === 'function') {\n      filterFunction = config.filterFunction;\n    } else {\n      filterFunction = function(o){\n        // cheap string search\n        o.droplab_hidden = o[config.template].toLowerCase().indexOf(value) === -1;\n        return o;\n      };\n    }\n\n    dataHiddenCount = data.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    matches = data.map(function(o) {\n      return filterFunction(o, value);\n    });\n\n    hiddenCount = matches.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    if (dataHiddenCount !== hiddenCount) {\n      list.render(matches);\n      list.currentIndex = 0;\n    }\n  },\n\n  debounceKeydown: function debounceKeydown(e) {\n    if ([\n      13, // enter\n      16, // shift\n      17, // ctrl\n      18, // alt\n      20, // caps lock\n      37, // left arrow\n      38, // up arrow\n      39, // right arrow\n      40, // down arrow\n      91, // left window\n      92, // right window\n      93, // select\n    ].indexOf(e.detail.which || e.detail.keyCode) > -1) return;\n\n    if (this.timeout) clearTimeout(this.timeout);\n    this.timeout = setTimeout(this.keydown.bind(this, e), 200);\n  },\n\n  init: function init(hook) {\n    var config = hook.config.droplabFilter;\n\n    if (!config || !config.template) return;\n\n    this.hook = hook;\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this);\n\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n  },\n\n  destroy: function destroy() {\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nwindow.droplabFilter = droplabFilter;\n\nexport default droplabFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/filter.js"],"sourceRoot":""} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca?0abf******","webpack:///./src/plugins/filter/filter.js?f41a"],"names":["droplabFilter","keydown","e","hiddenCount","dataHiddenCount","list","detail","hook","data","value","trigger","toLowerCase","config","matches","filterFunction","o","droplab_hidden","template","indexOf","filter","length","map","render","currentIndex","debounceKeydown","which","keyCode","timeout","clearTimeout","setTimeout","bind","init","eventWrapper","addEventListener","destroy","removeEventListener","dynamicList","querySelector","listTemplate","outerHTML"],"mappings":"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","file":"./dist/plugins/filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 7);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","const droplabFilter = {\n  keydown: function(e){\n    var hiddenCount = 0;\n    var dataHiddenCount = 0;\n\n    var list = e.detail.hook.list;\n    var data = list.data;\n    var value = e.detail.hook.trigger.value.toLowerCase();\n    var config = e.detail.hook.config.droplabFilter;\n    var matches = [];\n    var filterFunction;\n    // will only work on dynamically set data\n    if(!data){\n      return;\n    }\n\n    if (config && config.filterFunction && typeof config.filterFunction === 'function') {\n      filterFunction = config.filterFunction;\n    } else {\n      filterFunction = function(o){\n        // cheap string search\n        o.droplab_hidden = o[config.template].toLowerCase().indexOf(value) === -1;\n        return o;\n      };\n    }\n\n    dataHiddenCount = data.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    matches = data.map(function(o) {\n      return filterFunction(o, value);\n    });\n\n    hiddenCount = matches.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    if (dataHiddenCount !== hiddenCount) {\n      list.render(matches);\n      list.currentIndex = 0;\n    }\n  },\n\n  debounceKeydown: function debounceKeydown(e) {\n    if ([\n      13, // enter\n      16, // shift\n      17, // ctrl\n      18, // alt\n      20, // caps lock\n      37, // left arrow\n      38, // up arrow\n      39, // right arrow\n      40, // down arrow\n      91, // left window\n      92, // right window\n      93, // select\n    ].indexOf(e.detail.which || e.detail.keyCode) > -1) return;\n\n    if (this.timeout) clearTimeout(this.timeout);\n    this.timeout = setTimeout(this.keydown.bind(this, e), 200);\n  },\n\n  init: function init(hook) {\n    var config = hook.config.droplabFilter;\n\n    if (!config || !config.template) return;\n\n    this.hook = hook;\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this);\n\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n    this.hook.trigger.addEventListener('mousedown.dl', this.eventWrapper.debounceKeydown);\n  },\n\n  destroy: function destroy() {\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n    this.hook.trigger.removeEventListener('mousedown.dl', this.eventWrapper.debounceKeydown);\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nexport default droplabFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/filter/filter.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/input_setter.js b/app/assets/javascripts/droplab/plugins/input_setter.js index ffc9af0476d..2ee9a796634 100644 --- a/app/assets/javascripts/droplab/plugins/input_setter.js +++ b/app/assets/javascripts/droplab/plugins/input_setter.js @@ -63,12 +63,12 @@ /******/ __webpack_require__.p = ""; /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 13); +/******/ return __webpack_require__(__webpack_require__.s = 8); /******/ }) /************************************************************************/ /******/ ({ -/***/ 13: +/***/ 8: /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -119,11 +119,9 @@ var droplabInputSetter = { } }; -window.droplabInputSetter = droplabInputSetter; - exports.default = droplabInputSetter; /***/ }) /******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vd2VicGFjay9ib290c3RyYXAgZjM3NjcyYjdmNTI4YjQ3MmE0NGM/ZWM1ZiIsIndlYnBhY2s6Ly8vLi9zcmMvcGx1Z2lucy9pbnB1dF9zZXR0ZXIuanMiXSwibmFtZXMiOlsiZHJvcGxhYklucHV0U2V0dGVyIiwiaW5pdCIsImhvb2siLCJjb25maWciLCJldmVudFdyYXBwZXIiLCJhZGRFdmVudHMiLCJzZXRJbnB1dHMiLCJiaW5kIiwibGlzdCIsImFkZEV2ZW50TGlzdGVuZXIiLCJyZW1vdmVFdmVudHMiLCJyZW1vdmVFdmVudExpc3RlbmVyIiwiZSIsInNlbGVjdGVkSXRlbSIsImRldGFpbCIsInNlbGVjdGVkIiwiQXJyYXkiLCJpc0FycmF5IiwiZm9yRWFjaCIsInNldElucHV0IiwiaW5wdXQiLCJ0cmlnZ2VyIiwibmV3VmFsdWUiLCJnZXRBdHRyaWJ1dGUiLCJ2YWx1ZUF0dHJpYnV0ZSIsInRhZ05hbWUiLCJ2YWx1ZSIsInRleHRDb250ZW50IiwiZGVzdHJveSIsIndpbmRvdyJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBO0FBQ0E7O0FBRUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOztBQUVBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBO0FBQ0E7OztBQUdBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBLG1EQUEyQyxjQUFjOztBQUV6RDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBLGFBQUs7QUFDTDtBQUNBOztBQUVBO0FBQ0E7QUFDQTtBQUNBLG1DQUEyQiwwQkFBMEIsRUFBRTtBQUN2RCx5Q0FBaUMsZUFBZTtBQUNoRDtBQUNBO0FBQ0E7O0FBRUE7QUFDQSw4REFBc0QsK0RBQStEOztBQUVySDtBQUNBOztBQUVBO0FBQ0E7Ozs7Ozs7Ozs7Ozs7O0FDaEVBLElBQU1BLHFCQUFxQjtBQUN6QkMsTUFEeUIsZ0JBQ3BCQyxJQURvQixFQUNkO0FBQ1QsU0FBS0EsSUFBTCxHQUFZQSxJQUFaO0FBQ0EsU0FBS0MsTUFBTCxHQUFjRCxLQUFLQyxNQUFMLENBQVlILGtCQUFaLEtBQW1DLEtBQUtFLElBQUwsQ0FBVUMsTUFBVixDQUFpQkgsa0JBQWpCLEdBQXNDLEVBQXpFLENBQWQ7O0FBRUEsU0FBS0ksWUFBTCxHQUFvQixFQUFwQjs7QUFFQSxTQUFLQyxTQUFMO0FBQ0QsR0FSd0I7QUFVekJBLFdBVnlCLHVCQVViO0FBQ1YsU0FBS0QsWUFBTCxDQUFrQkUsU0FBbEIsR0FBOEIsS0FBS0EsU0FBTCxDQUFlQyxJQUFmLENBQW9CLElBQXBCLENBQTlCO0FBQ0EsU0FBS0wsSUFBTCxDQUFVTSxJQUFWLENBQWVBLElBQWYsQ0FBb0JDLGdCQUFwQixDQUFxQyxVQUFyQyxFQUFpRCxLQUFLTCxZQUFMLENBQWtCRSxTQUFuRTtBQUNELEdBYndCO0FBZXpCSSxjQWZ5QiwwQkFlVjtBQUNiLFNBQUtSLElBQUwsQ0FBVU0sSUFBVixDQUFlQSxJQUFmLENBQW9CRyxtQkFBcEIsQ0FBd0MsVUFBeEMsRUFBb0QsS0FBS1AsWUFBTCxDQUFrQkUsU0FBdEU7QUFDRCxHQWpCd0I7QUFtQnpCQSxXQW5CeUIscUJBbUJmTSxDQW5CZSxFQW1CWjtBQUFBOztBQUNYLFFBQU1DLGVBQWVELEVBQUVFLE1BQUYsQ0FBU0MsUUFBOUI7O0FBRUEsUUFBSSxDQUFDQyxNQUFNQyxPQUFOLENBQWMsS0FBS2QsTUFBbkIsQ0FBTCxFQUFpQyxLQUFLQSxNQUFMLEdBQWMsQ0FBQyxLQUFLQSxNQUFOLENBQWQ7O0FBRWpDLFNBQUtBLE1BQUwsQ0FBWWUsT0FBWixDQUFvQjtBQUFBLGFBQVUsTUFBS0MsUUFBTCxDQUFjaEIsTUFBZCxFQUFzQlUsWUFBdEIsQ0FBVjtBQUFBLEtBQXBCO0FBQ0QsR0F6QndCO0FBMkJ6Qk0sVUEzQnlCLG9CQTJCaEJoQixNQTNCZ0IsRUEyQlJVLFlBM0JRLEVBMkJNO0FBQzdCLFFBQU1PLFFBQVFqQixPQUFPaUIsS0FBUCxJQUFnQixLQUFLbEIsSUFBTCxDQUFVbUIsT0FBeEM7QUFDQSxRQUFNQyxXQUFXVCxhQUFhVSxZQUFiLENBQTBCcEIsT0FBT3FCLGNBQWpDLENBQWpCOztBQUVBLFFBQUlKLE1BQU1LLE9BQU4sS0FBa0IsT0FBdEIsRUFBK0I7QUFDN0JMLFlBQU1NLEtBQU4sR0FBY0osUUFBZDtBQUNELEtBRkQsTUFFTztBQUNMRixZQUFNTyxXQUFOLEdBQW9CTCxRQUFwQjtBQUNEO0FBQ0YsR0FwQ3dCO0FBc0N6Qk0sU0F0Q3lCLHFCQXNDZjtBQUNSLFNBQUtsQixZQUFMO0FBQ0Q7QUF4Q3dCLENBQTNCOztBQTJDQW1CLE9BQU83QixrQkFBUCxHQUE0QkEsa0JBQTVCOztrQkFFZUEsa0IiLCJmaWxlIjoiLi9kaXN0L3BsdWdpbnMvaW5wdXRfc2V0dGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiIFx0Ly8gVGhlIG1vZHVsZSBjYWNoZVxuIFx0dmFyIGluc3RhbGxlZE1vZHVsZXMgPSB7fTtcblxuIFx0Ly8gVGhlIHJlcXVpcmUgZnVuY3Rpb25cbiBcdGZ1bmN0aW9uIF9fd2VicGFja19yZXF1aXJlX18obW9kdWxlSWQpIHtcblxuIFx0XHQvLyBDaGVjayBpZiBtb2R1bGUgaXMgaW4gY2FjaGVcbiBcdFx0aWYoaW5zdGFsbGVkTW9kdWxlc1ttb2R1bGVJZF0pXG4gXHRcdFx0cmV0dXJuIGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdLmV4cG9ydHM7XG5cbiBcdFx0Ly8gQ3JlYXRlIGEgbmV3IG1vZHVsZSAoYW5kIHB1dCBpdCBpbnRvIHRoZSBjYWNoZSlcbiBcdFx0dmFyIG1vZHVsZSA9IGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdID0ge1xuIFx0XHRcdGk6IG1vZHVsZUlkLFxuIFx0XHRcdGw6IGZhbHNlLFxuIFx0XHRcdGV4cG9ydHM6IHt9XG4gXHRcdH07XG5cbiBcdFx0Ly8gRXhlY3V0ZSB0aGUgbW9kdWxlIGZ1bmN0aW9uXG4gXHRcdG1vZHVsZXNbbW9kdWxlSWRdLmNhbGwobW9kdWxlLmV4cG9ydHMsIG1vZHVsZSwgbW9kdWxlLmV4cG9ydHMsIF9fd2VicGFja19yZXF1aXJlX18pO1xuXG4gXHRcdC8vIEZsYWcgdGhlIG1vZHVsZSBhcyBsb2FkZWRcbiBcdFx0bW9kdWxlLmwgPSB0cnVlO1xuXG4gXHRcdC8vIFJldHVybiB0aGUgZXhwb3J0cyBvZiB0aGUgbW9kdWxlXG4gXHRcdHJldHVybiBtb2R1bGUuZXhwb3J0cztcbiBcdH1cblxuXG4gXHQvLyBleHBvc2UgdGhlIG1vZHVsZXMgb2JqZWN0IChfX3dlYnBhY2tfbW9kdWxlc19fKVxuIFx0X193ZWJwYWNrX3JlcXVpcmVfXy5tID0gbW9kdWxlcztcblxuIFx0Ly8gZXhwb3NlIHRoZSBtb2R1bGUgY2FjaGVcbiBcdF9fd2VicGFja19yZXF1aXJlX18uYyA9IGluc3RhbGxlZE1vZHVsZXM7XG5cbiBcdC8vIGlkZW50aXR5IGZ1bmN0aW9uIGZvciBjYWxsaW5nIGhhcm1vbnkgaW1wb3J0cyB3aXRoIHRoZSBjb3JyZWN0IGNvbnRleHRcbiBcdF9fd2VicGFja19yZXF1aXJlX18uaSA9IGZ1bmN0aW9uKHZhbHVlKSB7IHJldHVybiB2YWx1ZTsgfTtcblxuIFx0Ly8gZGVmaW5lIGdldHRlciBmdW5jdGlvbiBmb3IgaGFybW9ueSBleHBvcnRzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQgPSBmdW5jdGlvbihleHBvcnRzLCBuYW1lLCBnZXR0ZXIpIHtcbiBcdFx0aWYoIV9fd2VicGFja19yZXF1aXJlX18ubyhleHBvcnRzLCBuYW1lKSkge1xuIFx0XHRcdE9iamVjdC5kZWZpbmVQcm9wZXJ0eShleHBvcnRzLCBuYW1lLCB7XG4gXHRcdFx0XHRjb25maWd1cmFibGU6IGZhbHNlLFxuIFx0XHRcdFx0ZW51bWVyYWJsZTogdHJ1ZSxcbiBcdFx0XHRcdGdldDogZ2V0dGVyXG4gXHRcdFx0fSk7XG4gXHRcdH1cbiBcdH07XG5cbiBcdC8vIGdldERlZmF1bHRFeHBvcnQgZnVuY3Rpb24gZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBub24taGFybW9ueSBtb2R1bGVzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLm4gPSBmdW5jdGlvbihtb2R1bGUpIHtcbiBcdFx0dmFyIGdldHRlciA9IG1vZHVsZSAmJiBtb2R1bGUuX19lc01vZHVsZSA/XG4gXHRcdFx0ZnVuY3Rpb24gZ2V0RGVmYXVsdCgpIHsgcmV0dXJuIG1vZHVsZVsnZGVmYXVsdCddOyB9IDpcbiBcdFx0XHRmdW5jdGlvbiBnZXRNb2R1bGVFeHBvcnRzKCkgeyByZXR1cm4gbW9kdWxlOyB9O1xuIFx0XHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQoZ2V0dGVyLCAnYScsIGdldHRlcik7XG4gXHRcdHJldHVybiBnZXR0ZXI7XG4gXHR9O1xuXG4gXHQvLyBPYmplY3QucHJvdG90eXBlLmhhc093blByb3BlcnR5LmNhbGxcbiBcdF9fd2VicGFja19yZXF1aXJlX18ubyA9IGZ1bmN0aW9uKG9iamVjdCwgcHJvcGVydHkpIHsgcmV0dXJuIE9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbChvYmplY3QsIHByb3BlcnR5KTsgfTtcblxuIFx0Ly8gX193ZWJwYWNrX3B1YmxpY19wYXRoX19cbiBcdF9fd2VicGFja19yZXF1aXJlX18ucCA9IFwiXCI7XG5cbiBcdC8vIExvYWQgZW50cnkgbW9kdWxlIGFuZCByZXR1cm4gZXhwb3J0c1xuIFx0cmV0dXJuIF9fd2VicGFja19yZXF1aXJlX18oX193ZWJwYWNrX3JlcXVpcmVfXy5zID0gMTMpO1xuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIHdlYnBhY2svYm9vdHN0cmFwIGYzNzY3MmI3ZjUyOGI0NzJhNDRjIiwiY29uc3QgZHJvcGxhYklucHV0U2V0dGVyID0ge1xuICBpbml0KGhvb2spIHtcbiAgICB0aGlzLmhvb2sgPSBob29rO1xuICAgIHRoaXMuY29uZmlnID0gaG9vay5jb25maWcuZHJvcGxhYklucHV0U2V0dGVyIHx8ICh0aGlzLmhvb2suY29uZmlnLmRyb3BsYWJJbnB1dFNldHRlciA9IHt9KTtcblxuICAgIHRoaXMuZXZlbnRXcmFwcGVyID0ge307XG5cbiAgICB0aGlzLmFkZEV2ZW50cygpO1xuICB9LFxuXG4gIGFkZEV2ZW50cygpIHtcbiAgICB0aGlzLmV2ZW50V3JhcHBlci5zZXRJbnB1dHMgPSB0aGlzLnNldElucHV0cy5iaW5kKHRoaXMpO1xuICAgIHRoaXMuaG9vay5saXN0Lmxpc3QuYWRkRXZlbnRMaXN0ZW5lcignY2xpY2suZGwnLCB0aGlzLmV2ZW50V3JhcHBlci5zZXRJbnB1dHMpO1xuICB9LFxuXG4gIHJlbW92ZUV2ZW50cygpIHtcbiAgICB0aGlzLmhvb2subGlzdC5saXN0LnJlbW92ZUV2ZW50TGlzdGVuZXIoJ2NsaWNrLmRsJywgdGhpcy5ldmVudFdyYXBwZXIuc2V0SW5wdXRzKTtcbiAgfSxcblxuICBzZXRJbnB1dHMoZSkge1xuICAgIGNvbnN0IHNlbGVjdGVkSXRlbSA9IGUuZGV0YWlsLnNlbGVjdGVkO1xuXG4gICAgaWYgKCFBcnJheS5pc0FycmF5KHRoaXMuY29uZmlnKSkgdGhpcy5jb25maWcgPSBbdGhpcy5jb25maWddO1xuXG4gICAgdGhpcy5jb25maWcuZm9yRWFjaChjb25maWcgPT4gdGhpcy5zZXRJbnB1dChjb25maWcsIHNlbGVjdGVkSXRlbSkpO1xuICB9LFxuXG4gIHNldElucHV0KGNvbmZpZywgc2VsZWN0ZWRJdGVtKSB7XG4gICAgY29uc3QgaW5wdXQgPSBjb25maWcuaW5wdXQgfHwgdGhpcy5ob29rLnRyaWdnZXI7XG4gICAgY29uc3QgbmV3VmFsdWUgPSBzZWxlY3RlZEl0ZW0uZ2V0QXR0cmlidXRlKGNvbmZpZy52YWx1ZUF0dHJpYnV0ZSk7XG5cbiAgICBpZiAoaW5wdXQudGFnTmFtZSA9PT0gJ0lOUFVUJykge1xuICAgICAgaW5wdXQudmFsdWUgPSBuZXdWYWx1ZTtcbiAgICB9IGVsc2Uge1xuICAgICAgaW5wdXQudGV4dENvbnRlbnQgPSBuZXdWYWx1ZTtcbiAgICB9XG4gIH0sXG5cbiAgZGVzdHJveSgpIHtcbiAgICB0aGlzLnJlbW92ZUV2ZW50cygpO1xuICB9LFxufTtcblxud2luZG93LmRyb3BsYWJJbnB1dFNldHRlciA9IGRyb3BsYWJJbnB1dFNldHRlcjtcblxuZXhwb3J0IGRlZmF1bHQgZHJvcGxhYklucHV0U2V0dGVyO1xuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIC4vc3JjL3BsdWdpbnMvaW5wdXRfc2V0dGVyLmpzIl0sInNvdXJjZVJvb3QiOiIifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vd2VicGFjay9ib290c3RyYXAgOTMzZmY3ZDVlZDM5M2RjNjNiY2E/MGFiZioqKioqIiwid2VicGFjazovLy8uL3NyYy9wbHVnaW5zL2lucHV0X3NldHRlci9pbnB1dF9zZXR0ZXIuanM/NTY5NyJdLCJuYW1lcyI6WyJkcm9wbGFiSW5wdXRTZXR0ZXIiLCJpbml0IiwiaG9vayIsImNvbmZpZyIsImV2ZW50V3JhcHBlciIsImFkZEV2ZW50cyIsInNldElucHV0cyIsImJpbmQiLCJsaXN0IiwiYWRkRXZlbnRMaXN0ZW5lciIsInJlbW92ZUV2ZW50cyIsInJlbW92ZUV2ZW50TGlzdGVuZXIiLCJlIiwic2VsZWN0ZWRJdGVtIiwiZGV0YWlsIiwic2VsZWN0ZWQiLCJBcnJheSIsImlzQXJyYXkiLCJmb3JFYWNoIiwic2V0SW5wdXQiLCJpbnB1dCIsInRyaWdnZXIiLCJuZXdWYWx1ZSIsImdldEF0dHJpYnV0ZSIsInZhbHVlQXR0cmlidXRlIiwidGFnTmFtZSIsInZhbHVlIiwidGV4dENvbnRlbnQiLCJkZXN0cm95Il0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTs7QUFFQTtBQUNBOztBQUVBO0FBQ0E7QUFDQTs7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBOztBQUVBO0FBQ0E7QUFDQTs7O0FBR0E7QUFDQTs7QUFFQTtBQUNBOztBQUVBO0FBQ0EsbURBQTJDLGNBQWM7O0FBRXpEO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EsYUFBSztBQUNMO0FBQ0E7O0FBRUE7QUFDQTtBQUNBO0FBQ0EsbUNBQTJCLDBCQUEwQixFQUFFO0FBQ3ZELHlDQUFpQyxlQUFlO0FBQ2hEO0FBQ0E7QUFDQTs7QUFFQTtBQUNBLDhEQUFzRCwrREFBK0Q7O0FBRXJIO0FBQ0E7O0FBRUE7QUFDQTs7Ozs7Ozs7Ozs7Ozs7QUNoRUEsSUFBTUEscUJBQXFCO0FBQ3pCQyxNQUR5QixnQkFDcEJDLElBRG9CLEVBQ2Q7QUFDVCxTQUFLQSxJQUFMLEdBQVlBLElBQVo7QUFDQSxTQUFLQyxNQUFMLEdBQWNELEtBQUtDLE1BQUwsQ0FBWUgsa0JBQVosS0FBbUMsS0FBS0UsSUFBTCxDQUFVQyxNQUFWLENBQWlCSCxrQkFBakIsR0FBc0MsRUFBekUsQ0FBZDs7QUFFQSxTQUFLSSxZQUFMLEdBQW9CLEVBQXBCOztBQUVBLFNBQUtDLFNBQUw7QUFDRCxHQVJ3QjtBQVV6QkEsV0FWeUIsdUJBVWI7QUFDVixTQUFLRCxZQUFMLENBQWtCRSxTQUFsQixHQUE4QixLQUFLQSxTQUFMLENBQWVDLElBQWYsQ0FBb0IsSUFBcEIsQ0FBOUI7QUFDQSxTQUFLTCxJQUFMLENBQVVNLElBQVYsQ0FBZUEsSUFBZixDQUFvQkMsZ0JBQXBCLENBQXFDLFVBQXJDLEVBQWlELEtBQUtMLFlBQUwsQ0FBa0JFLFNBQW5FO0FBQ0QsR0Fid0I7QUFlekJJLGNBZnlCLDBCQWVWO0FBQ2IsU0FBS1IsSUFBTCxDQUFVTSxJQUFWLENBQWVBLElBQWYsQ0FBb0JHLG1CQUFwQixDQUF3QyxVQUF4QyxFQUFvRCxLQUFLUCxZQUFMLENBQWtCRSxTQUF0RTtBQUNELEdBakJ3QjtBQW1CekJBLFdBbkJ5QixxQkFtQmZNLENBbkJlLEVBbUJaO0FBQUE7O0FBQ1gsUUFBTUMsZUFBZUQsRUFBRUUsTUFBRixDQUFTQyxRQUE5Qjs7QUFFQSxRQUFJLENBQUNDLE1BQU1DLE9BQU4sQ0FBYyxLQUFLZCxNQUFuQixDQUFMLEVBQWlDLEtBQUtBLE1BQUwsR0FBYyxDQUFDLEtBQUtBLE1BQU4sQ0FBZDs7QUFFakMsU0FBS0EsTUFBTCxDQUFZZSxPQUFaLENBQW9CO0FBQUEsYUFBVSxNQUFLQyxRQUFMLENBQWNoQixNQUFkLEVBQXNCVSxZQUF0QixDQUFWO0FBQUEsS0FBcEI7QUFDRCxHQXpCd0I7QUEyQnpCTSxVQTNCeUIsb0JBMkJoQmhCLE1BM0JnQixFQTJCUlUsWUEzQlEsRUEyQk07QUFDN0IsUUFBTU8sUUFBUWpCLE9BQU9pQixLQUFQLElBQWdCLEtBQUtsQixJQUFMLENBQVVtQixPQUF4QztBQUNBLFFBQU1DLFdBQVdULGFBQWFVLFlBQWIsQ0FBMEJwQixPQUFPcUIsY0FBakMsQ0FBakI7O0FBRUEsUUFBSUosTUFBTUssT0FBTixLQUFrQixPQUF0QixFQUErQjtBQUM3QkwsWUFBTU0sS0FBTixHQUFjSixRQUFkO0FBQ0QsS0FGRCxNQUVPO0FBQ0xGLFlBQU1PLFdBQU4sR0FBb0JMLFFBQXBCO0FBQ0Q7QUFDRixHQXBDd0I7QUFzQ3pCTSxTQXRDeUIscUJBc0NmO0FBQ1IsU0FBS2xCLFlBQUw7QUFDRDtBQXhDd0IsQ0FBM0I7O2tCQTJDZVYsa0IiLCJmaWxlIjoiLi9kaXN0L3BsdWdpbnMvaW5wdXRfc2V0dGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiIFx0Ly8gVGhlIG1vZHVsZSBjYWNoZVxuIFx0dmFyIGluc3RhbGxlZE1vZHVsZXMgPSB7fTtcblxuIFx0Ly8gVGhlIHJlcXVpcmUgZnVuY3Rpb25cbiBcdGZ1bmN0aW9uIF9fd2VicGFja19yZXF1aXJlX18obW9kdWxlSWQpIHtcblxuIFx0XHQvLyBDaGVjayBpZiBtb2R1bGUgaXMgaW4gY2FjaGVcbiBcdFx0aWYoaW5zdGFsbGVkTW9kdWxlc1ttb2R1bGVJZF0pXG4gXHRcdFx0cmV0dXJuIGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdLmV4cG9ydHM7XG5cbiBcdFx0Ly8gQ3JlYXRlIGEgbmV3IG1vZHVsZSAoYW5kIHB1dCBpdCBpbnRvIHRoZSBjYWNoZSlcbiBcdFx0dmFyIG1vZHVsZSA9IGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdID0ge1xuIFx0XHRcdGk6IG1vZHVsZUlkLFxuIFx0XHRcdGw6IGZhbHNlLFxuIFx0XHRcdGV4cG9ydHM6IHt9XG4gXHRcdH07XG5cbiBcdFx0Ly8gRXhlY3V0ZSB0aGUgbW9kdWxlIGZ1bmN0aW9uXG4gXHRcdG1vZHVsZXNbbW9kdWxlSWRdLmNhbGwobW9kdWxlLmV4cG9ydHMsIG1vZHVsZSwgbW9kdWxlLmV4cG9ydHMsIF9fd2VicGFja19yZXF1aXJlX18pO1xuXG4gXHRcdC8vIEZsYWcgdGhlIG1vZHVsZSBhcyBsb2FkZWRcbiBcdFx0bW9kdWxlLmwgPSB0cnVlO1xuXG4gXHRcdC8vIFJldHVybiB0aGUgZXhwb3J0cyBvZiB0aGUgbW9kdWxlXG4gXHRcdHJldHVybiBtb2R1bGUuZXhwb3J0cztcbiBcdH1cblxuXG4gXHQvLyBleHBvc2UgdGhlIG1vZHVsZXMgb2JqZWN0IChfX3dlYnBhY2tfbW9kdWxlc19fKVxuIFx0X193ZWJwYWNrX3JlcXVpcmVfXy5tID0gbW9kdWxlcztcblxuIFx0Ly8gZXhwb3NlIHRoZSBtb2R1bGUgY2FjaGVcbiBcdF9fd2VicGFja19yZXF1aXJlX18uYyA9IGluc3RhbGxlZE1vZHVsZXM7XG5cbiBcdC8vIGlkZW50aXR5IGZ1bmN0aW9uIGZvciBjYWxsaW5nIGhhcm1vbnkgaW1wb3J0cyB3aXRoIHRoZSBjb3JyZWN0IGNvbnRleHRcbiBcdF9fd2VicGFja19yZXF1aXJlX18uaSA9IGZ1bmN0aW9uKHZhbHVlKSB7IHJldHVybiB2YWx1ZTsgfTtcblxuIFx0Ly8gZGVmaW5lIGdldHRlciBmdW5jdGlvbiBmb3IgaGFybW9ueSBleHBvcnRzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQgPSBmdW5jdGlvbihleHBvcnRzLCBuYW1lLCBnZXR0ZXIpIHtcbiBcdFx0aWYoIV9fd2VicGFja19yZXF1aXJlX18ubyhleHBvcnRzLCBuYW1lKSkge1xuIFx0XHRcdE9iamVjdC5kZWZpbmVQcm9wZXJ0eShleHBvcnRzLCBuYW1lLCB7XG4gXHRcdFx0XHRjb25maWd1cmFibGU6IGZhbHNlLFxuIFx0XHRcdFx0ZW51bWVyYWJsZTogdHJ1ZSxcbiBcdFx0XHRcdGdldDogZ2V0dGVyXG4gXHRcdFx0fSk7XG4gXHRcdH1cbiBcdH07XG5cbiBcdC8vIGdldERlZmF1bHRFeHBvcnQgZnVuY3Rpb24gZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBub24taGFybW9ueSBtb2R1bGVzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLm4gPSBmdW5jdGlvbihtb2R1bGUpIHtcbiBcdFx0dmFyIGdldHRlciA9IG1vZHVsZSAmJiBtb2R1bGUuX19lc01vZHVsZSA/XG4gXHRcdFx0ZnVuY3Rpb24gZ2V0RGVmYXVsdCgpIHsgcmV0dXJuIG1vZHVsZVsnZGVmYXVsdCddOyB9IDpcbiBcdFx0XHRmdW5jdGlvbiBnZXRNb2R1bGVFeHBvcnRzKCkgeyByZXR1cm4gbW9kdWxlOyB9O1xuIFx0XHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQoZ2V0dGVyLCAnYScsIGdldHRlcik7XG4gXHRcdHJldHVybiBnZXR0ZXI7XG4gXHR9O1xuXG4gXHQvLyBPYmplY3QucHJvdG90eXBlLmhhc093blByb3BlcnR5LmNhbGxcbiBcdF9fd2VicGFja19yZXF1aXJlX18ubyA9IGZ1bmN0aW9uKG9iamVjdCwgcHJvcGVydHkpIHsgcmV0dXJuIE9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbChvYmplY3QsIHByb3BlcnR5KTsgfTtcblxuIFx0Ly8gX193ZWJwYWNrX3B1YmxpY19wYXRoX19cbiBcdF9fd2VicGFja19yZXF1aXJlX18ucCA9IFwiXCI7XG5cbiBcdC8vIExvYWQgZW50cnkgbW9kdWxlIGFuZCByZXR1cm4gZXhwb3J0c1xuIFx0cmV0dXJuIF9fd2VicGFja19yZXF1aXJlX18oX193ZWJwYWNrX3JlcXVpcmVfXy5zID0gOCk7XG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gd2VicGFjay9ib290c3RyYXAgOTMzZmY3ZDVlZDM5M2RjNjNiY2EiLCJjb25zdCBkcm9wbGFiSW5wdXRTZXR0ZXIgPSB7XG4gIGluaXQoaG9vaykge1xuICAgIHRoaXMuaG9vayA9IGhvb2s7XG4gICAgdGhpcy5jb25maWcgPSBob29rLmNvbmZpZy5kcm9wbGFiSW5wdXRTZXR0ZXIgfHwgKHRoaXMuaG9vay5jb25maWcuZHJvcGxhYklucHV0U2V0dGVyID0ge30pO1xuXG4gICAgdGhpcy5ldmVudFdyYXBwZXIgPSB7fTtcblxuICAgIHRoaXMuYWRkRXZlbnRzKCk7XG4gIH0sXG5cbiAgYWRkRXZlbnRzKCkge1xuICAgIHRoaXMuZXZlbnRXcmFwcGVyLnNldElucHV0cyA9IHRoaXMuc2V0SW5wdXRzLmJpbmQodGhpcyk7XG4gICAgdGhpcy5ob29rLmxpc3QubGlzdC5hZGRFdmVudExpc3RlbmVyKCdjbGljay5kbCcsIHRoaXMuZXZlbnRXcmFwcGVyLnNldElucHV0cyk7XG4gIH0sXG5cbiAgcmVtb3ZlRXZlbnRzKCkge1xuICAgIHRoaXMuaG9vay5saXN0Lmxpc3QucmVtb3ZlRXZlbnRMaXN0ZW5lcignY2xpY2suZGwnLCB0aGlzLmV2ZW50V3JhcHBlci5zZXRJbnB1dHMpO1xuICB9LFxuXG4gIHNldElucHV0cyhlKSB7XG4gICAgY29uc3Qgc2VsZWN0ZWRJdGVtID0gZS5kZXRhaWwuc2VsZWN0ZWQ7XG5cbiAgICBpZiAoIUFycmF5LmlzQXJyYXkodGhpcy5jb25maWcpKSB0aGlzLmNvbmZpZyA9IFt0aGlzLmNvbmZpZ107XG5cbiAgICB0aGlzLmNvbmZpZy5mb3JFYWNoKGNvbmZpZyA9PiB0aGlzLnNldElucHV0KGNvbmZpZywgc2VsZWN0ZWRJdGVtKSk7XG4gIH0sXG5cbiAgc2V0SW5wdXQoY29uZmlnLCBzZWxlY3RlZEl0ZW0pIHtcbiAgICBjb25zdCBpbnB1dCA9IGNvbmZpZy5pbnB1dCB8fCB0aGlzLmhvb2sudHJpZ2dlcjtcbiAgICBjb25zdCBuZXdWYWx1ZSA9IHNlbGVjdGVkSXRlbS5nZXRBdHRyaWJ1dGUoY29uZmlnLnZhbHVlQXR0cmlidXRlKTtcblxuICAgIGlmIChpbnB1dC50YWdOYW1lID09PSAnSU5QVVQnKSB7XG4gICAgICBpbnB1dC52YWx1ZSA9IG5ld1ZhbHVlO1xuICAgIH0gZWxzZSB7XG4gICAgICBpbnB1dC50ZXh0Q29udGVudCA9IG5ld1ZhbHVlO1xuICAgIH1cbiAgfSxcblxuICBkZXN0cm95KCkge1xuICAgIHRoaXMucmVtb3ZlRXZlbnRzKCk7XG4gIH0sXG59O1xuXG5leHBvcnQgZGVmYXVsdCBkcm9wbGFiSW5wdXRTZXR0ZXI7XG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gLi9zcmMvcGx1Z2lucy9pbnB1dF9zZXR0ZXIvaW5wdXRfc2V0dGVyLmpzIl0sInNvdXJjZVJvb3QiOiIifQ== \ No newline at end of file diff --git a/app/assets/javascripts/filtered_search/dropdown_hint.js b/app/assets/javascripts/filtered_search/dropdown_hint.js index 475aef219da..d3401dd0838 100644 --- a/app/assets/javascripts/filtered_search/dropdown_hint.js +++ b/app/assets/javascripts/filtered_search/dropdown_hint.js @@ -1,6 +1,6 @@ -require('./filtered_search_dropdown'); +import droplabFilter from '../droplab/plugins/filter'; -/* global droplabFilter */ +require('./filtered_search_dropdown'); (() => { class DropdownHint extends gl.FilteredSearchDropdown { diff --git a/app/assets/javascripts/filtered_search/dropdown_non_user.js b/app/assets/javascripts/filtered_search/dropdown_non_user.js index 9ee805a08cb..c30e673f8ba 100644 --- a/app/assets/javascripts/filtered_search/dropdown_non_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_non_user.js @@ -1,7 +1,7 @@ -require('./filtered_search_dropdown'); +import droplabAjax from '../droplab/plugins/ajax'; +import droplabFilter from '../droplab/plugins/filter'; -/* global droplabAjax */ -/* global droplabFilter */ +require('./filtered_search_dropdown'); (() => { class DropdownNonUser extends gl.FilteredSearchDropdown { diff --git a/app/assets/javascripts/filtered_search/dropdown_user.js b/app/assets/javascripts/filtered_search/dropdown_user.js index 04e2afad02f..fe95ccb41f8 100644 --- a/app/assets/javascripts/filtered_search/dropdown_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_user.js @@ -1,6 +1,6 @@ -require('./filtered_search_dropdown'); +import droplabAjaxFilter from '../droplab/plugins/ajax_filter'; -/* global droplabAjaxFilter */ +require('./filtered_search_dropdown'); (() => { class DropdownUser extends gl.FilteredSearchDropdown { diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js index 5fbe0450bb8..29aa4c1bb44 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js +++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js @@ -1,4 +1,4 @@ -/* global DropLab */ +import DropLab from '../droplab/droplab'; import FilteredSearchContainer from './container'; (() => { diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index c9b4716cc64..177cf66b37d 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -75,12 +75,6 @@ import './u2f/error'; import './u2f/register'; import './u2f/util'; -// droplab -import './droplab/droplab'; -import './droplab/plugins/ajax'; -import './droplab/plugins/ajax_filter'; -import './droplab/plugins/filter'; - // everything else import './abuse_reports'; import './activities'; From 8bdfee8ba5fb0a8f48501e63274c8f9ce5708007 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Sat, 25 Mar 2017 15:44:25 +0000 Subject: [PATCH 07/70] Prep for moving droplab to npm --- .babelrc | 1 - .eslintignore | 1 - app/assets/javascripts/droplab/droplab.js | 953 ------------------ .../javascripts/droplab/plugins/ajax.js | 157 --- .../droplab/plugins/ajax_filter.js | 214 ---- .../javascripts/droplab/plugins/filter.js | 172 ---- .../droplab/plugins/input_setter.js | 127 --- .../filtered_search/dropdown_hint.js | 8 +- .../filtered_search/dropdown_non_user.js | 12 +- .../filtered_search/dropdown_user.js | 8 +- .../filtered_search_dropdown_manager.js | 2 +- yarn.lock | 932 +++++++++-------- 12 files changed, 537 insertions(+), 2050 deletions(-) delete mode 100644 app/assets/javascripts/droplab/droplab.js delete mode 100644 app/assets/javascripts/droplab/plugins/ajax.js delete mode 100644 app/assets/javascripts/droplab/plugins/ajax_filter.js delete mode 100644 app/assets/javascripts/droplab/plugins/filter.js delete mode 100644 app/assets/javascripts/droplab/plugins/input_setter.js diff --git a/.babelrc b/.babelrc index ee4c391da30..2bae7ca9fbf 100644 --- a/.babelrc +++ b/.babelrc @@ -8,7 +8,6 @@ "plugins": [ ["istanbul", { "exclude": [ - "app/assets/javascripts/droplab/**/*", "spec/javascripts/**/*" ] }], diff --git a/.eslintignore b/.eslintignore index fe0766d8a44..c742b08c005 100644 --- a/.eslintignore +++ b/.eslintignore @@ -5,6 +5,5 @@ /public/ /tmp/ /vendor/ -/app/assets/javascripts/droplab karma.config.js webpack.config.js diff --git a/app/assets/javascripts/droplab/droplab.js b/app/assets/javascripts/droplab/droplab.js deleted file mode 100644 index d1d8447d165..00000000000 --- a/app/assets/javascripts/droplab/droplab.js +++ /dev/null @@ -1,953 +0,0 @@ -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) -/******/ return installedModules[moduleId].exports; -/******/ -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // identity function for calling harmony imports with the correct context -/******/ __webpack_require__.i = function(value) { return value; }; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { -/******/ configurable: false, -/******/ enumerable: true, -/******/ get: getter -/******/ }); -/******/ } -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 14); -/******/ }) -/************************************************************************/ -/******/ ([ -/* 0 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -var DATA_TRIGGER = 'data-dropdown-trigger'; -var DATA_DROPDOWN = 'data-dropdown'; -var SELECTED_CLASS = 'droplab-item-selected'; -var ACTIVE_CLASS = 'droplab-item-active'; - -exports.DATA_TRIGGER = DATA_TRIGGER; -exports.DATA_DROPDOWN = DATA_DROPDOWN; -exports.SELECTED_CLASS = SELECTED_CLASS; -exports.ACTIVE_CLASS = ACTIVE_CLASS; - -/***/ }), -/* 1 */ -/***/ (function(module, exports) { - -// Polyfill for creating CustomEvents on IE9/10/11 - -// code pulled from: -// https://github.com/d4tocchini/customevent-polyfill -// https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent#Polyfill - -try { - var ce = new window.CustomEvent('test'); - ce.preventDefault(); - if (ce.defaultPrevented !== true) { - // IE has problems with .preventDefault() on custom events - // http://stackoverflow.com/questions/23349191 - throw new Error('Could not prevent default'); - } -} catch(e) { - var CustomEvent = function(event, params) { - var evt, origPrevent; - params = params || { - bubbles: false, - cancelable: false, - detail: undefined - }; - - evt = document.createEvent("CustomEvent"); - evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail); - origPrevent = evt.preventDefault; - evt.preventDefault = function () { - origPrevent.call(this); - try { - Object.defineProperty(this, 'defaultPrevented', { - get: function () { - return true; - } - }); - } catch(e) { - this.defaultPrevented = true; - } - }; - return evt; - }; - - CustomEvent.prototype = window.Event.prototype; - window.CustomEvent = CustomEvent; // expose definition to window -} - - -/***/ }), -/* 2 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _dropdown = __webpack_require__(9); - -var _dropdown2 = _interopRequireDefault(_dropdown); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var Hook = function Hook(trigger, list, plugins, config) { - this.trigger = trigger; - this.list = new _dropdown2.default(list); - this.type = 'Hook'; - this.event = 'click'; - this.plugins = plugins || []; - this.config = config || {}; - this.id = trigger.id; -}; - -Object.assign(Hook.prototype, { - - addEvents: function addEvents() {}, - - constructor: Hook -}); - -exports.default = Hook; - -/***/ }), -/* 3 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _constants = __webpack_require__(0); - -var utils = { - toCamelCase: function toCamelCase(attr) { - return this.camelize(attr.split('-').slice(1).join(' ')); - }, - t: function t(s, d) { - for (var p in d) { - if (Object.prototype.hasOwnProperty.call(d, p)) { - s = s.replace(new RegExp('{{' + p + '}}', 'g'), d[p]); - } - } - return s; - }, - camelize: function camelize(str) { - return str.replace(/(?:^\w|[A-Z]|\b\w)/g, function (letter, index) { - return index === 0 ? letter.toLowerCase() : letter.toUpperCase(); - }).replace(/\s+/g, ''); - }, - closest: function closest(thisTag, stopTag) { - while (thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML') { - thisTag = thisTag.parentNode; - } - return thisTag; - }, - isDropDownParts: function isDropDownParts(target) { - if (!target || target.tagName === 'HTML') return false; - return target.hasAttribute(_constants.DATA_TRIGGER) || target.hasAttribute(_constants.DATA_DROPDOWN); - } -}; - -exports.default = utils; - -/***/ }), -/* 4 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -__webpack_require__(1); - -var _hook_button = __webpack_require__(10); - -var _hook_button2 = _interopRequireDefault(_hook_button); - -var _hook_input = __webpack_require__(11); - -var _hook_input2 = _interopRequireDefault(_hook_input); - -var _utils = __webpack_require__(3); - -var _utils2 = _interopRequireDefault(_utils); - -var _keyboard = __webpack_require__(12); - -var _keyboard2 = _interopRequireDefault(_keyboard); - -var _constants = __webpack_require__(0); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var DropLab = function DropLab() { - this.ready = false; - this.hooks = []; - this.queuedData = []; - this.config = {}; - - this.eventWrapper = {}; -}; - -Object.assign(DropLab.prototype, { - loadStatic: function loadStatic() { - var dropdownTriggers = [].slice.apply(document.querySelectorAll('[' + _constants.DATA_TRIGGER + ']')); - this.addHooks(dropdownTriggers); - }, - - addData: function addData() { - var args = [].slice.apply(arguments); - this.applyArgs(args, '_addData'); - }, - - setData: function setData() { - var args = [].slice.apply(arguments); - this.applyArgs(args, '_setData'); - }, - - destroy: function destroy() { - this.hooks.forEach(function (hook) { - return hook.destroy(); - }); - this.hooks = []; - this.removeEvents(); - }, - - applyArgs: function applyArgs(args, methodName) { - if (this.ready) return this[methodName].apply(this, args); - - this.queuedData = this.queuedData || []; - this.queuedData.push(args); - }, - - _addData: function _addData(trigger, data) { - this._processData(trigger, data, 'addData'); - }, - - _setData: function _setData(trigger, data) { - this._processData(trigger, data, 'setData'); - }, - - _processData: function _processData(trigger, data, methodName) { - this.hooks.forEach(function (hook) { - if (Array.isArray(trigger)) hook.list[methodName](trigger); - - if (hook.trigger.id === trigger) hook.list[methodName](data); - }); - }, - - addEvents: function addEvents() { - this.eventWrapper.documentClicked = this.documentClicked.bind(this); - document.addEventListener('click', this.eventWrapper.documentClicked); - }, - - documentClicked: function documentClicked(e) { - var thisTag = e.target; - - if (thisTag.tagName !== 'UL') thisTag = _utils2.default.closest(thisTag, 'UL'); - if (_utils2.default.isDropDownParts(thisTag, this.hooks) || _utils2.default.isDropDownParts(e.target, this.hooks)) return; - - this.hooks.forEach(function (hook) { - return hook.list.hide(); - }); - }, - - removeEvents: function removeEvents() { - document.removeEventListener('click', this.eventWrapper.documentClicked); - }, - - changeHookList: function changeHookList(trigger, list, plugins, config) { - var _this = this; - - var availableTrigger = typeof trigger === 'string' ? document.getElementById(trigger) : trigger; - - this.hooks.forEach(function (hook, i) { - hook.list.list.dataset.dropdownActive = false; - - if (hook.trigger !== availableTrigger) return; - - hook.destroy(); - _this.hooks.splice(i, 1); - _this.addHook(availableTrigger, list, plugins, config); - }); - }, - - addHook: function addHook(hook, list, plugins, config) { - var availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook; - var availableList = void 0; - - if (typeof list === 'string') { - availableList = document.querySelector(list); - } else if (list instanceof Element) { - availableList = list; - } else { - availableList = document.querySelector(hook.dataset[_utils2.default.toCamelCase(_constants.DATA_TRIGGER)]); - } - - availableList.dataset.dropdownActive = true; - - var HookObject = availableHook.tagName === 'INPUT' ? _hook_input2.default : _hook_button2.default; - this.hooks.push(new HookObject(availableHook, availableList, plugins, config)); - - return this; - }, - - addHooks: function addHooks(hooks, plugins, config) { - var _this2 = this; - - hooks.forEach(function (hook) { - return _this2.addHook(hook, null, plugins, config); - }); - return this; - }, - - setConfig: function setConfig(obj) { - this.config = obj; - }, - - fireReady: function fireReady() { - var readyEvent = new CustomEvent('ready.dl', { - detail: { - dropdown: this - } - }); - document.dispatchEvent(readyEvent); - - this.ready = true; - }, - - init: function init(hook, list, plugins, config) { - var _this3 = this; - - hook ? this.addHook(hook, list, plugins, config) : this.loadStatic(); - - this.addEvents(); - - (0, _keyboard2.default)(); - - this.fireReady(); - - this.queuedData.forEach(function (data) { - return _this3.addData(data); - }); - this.queuedData = []; - - return this; - } -}); - -exports.default = DropLab; - -/***/ }), -/* 5 */, -/* 6 */, -/* 7 */, -/* 8 */, -/* 9 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _Object$assign; - -__webpack_require__(1); - -var _utils = __webpack_require__(3); - -var _utils2 = _interopRequireDefault(_utils); - -var _constants = __webpack_require__(0); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -var DropDown = function DropDown(list) { - this.currentIndex = 0; - this.hidden = true; - this.list = typeof list === 'string' ? document.querySelector(list) : list; - this.items = []; - - this.eventWrapper = {}; - - this.getItems(); - this.initTemplateString(); - this.addEvents(); - - this.initialState = list.innerHTML; -}; - -Object.assign(DropDown.prototype, (_Object$assign = { - getItems: function getItems() { - this.items = [].slice.call(this.list.querySelectorAll('li')); - return this.items; - }, - - initTemplateString: function initTemplateString() { - var items = this.items || this.getItems(); - - var templateString = ''; - if (items.length > 0) templateString = items[items.length - 1].outerHTML; - this.templateString = templateString; - - return this.templateString; - }, - - clickEvent: function clickEvent(e) { - var selected = _utils2.default.closest(e.target, 'LI'); - if (!selected) return; - - this.addSelectedClass(selected); - - e.preventDefault(); - this.hide(); - - var listEvent = new CustomEvent('click.dl', { - detail: { - list: this, - selected: selected, - data: e.target.dataset - } - }); - this.list.dispatchEvent(listEvent); - }, - - addSelectedClass: function addSelectedClass(selected) { - this.removeSelectedClasses(); - selected.classList.add(_constants.SELECTED_CLASS); - }, - - removeSelectedClasses: function removeSelectedClasses() { - var items = this.items || this.getItems(); - - items.forEach(function (item) { - return item.classList.remove(_constants.SELECTED_CLASS); - }); - }, - - addEvents: function addEvents() { - this.eventWrapper.clickEvent = this.clickEvent.bind(this); - this.list.addEventListener('click', this.eventWrapper.clickEvent); - }, - - toggle: function toggle() { - this.hidden ? this.show() : this.hide(); - }, - - setData: function setData(data) { - this.data = data; - this.render(data); - }, - - addData: function addData(data) { - this.data = (this.data || []).concat(data); - this.render(this.data); - }, - - render: function render(data) { - var children = data ? data.map(this.renderChildren.bind(this)) : []; - var renderableList = this.list.querySelector('ul[data-dynamic]') || this.list; - - renderableList.innerHTML = children.join(''); - }, - - renderChildren: function renderChildren(data) { - var html = _utils2.default.t(this.templateString, data); - var template = document.createElement('div'); - - template.innerHTML = html; - this.setImagesSrc(template); - template.firstChild.style.display = data.droplab_hidden ? 'none' : 'block'; - - return template.firstChild.outerHTML; - }, - - setImagesSrc: function setImagesSrc(template) { - var images = [].slice.call(template.querySelectorAll('img[data-src]')); - - images.forEach(function (image) { - image.src = image.getAttribute('data-src'); - image.removeAttribute('data-src'); - }); - }, - - show: function show() { - if (!this.hidden) return; - this.list.style.display = 'block'; - this.currentIndex = 0; - this.hidden = false; - }, - - hide: function hide() { - if (this.hidden) return; - this.list.style.display = 'none'; - this.currentIndex = 0; - this.hidden = true; - } - -}, _defineProperty(_Object$assign, 'toggle', function toggle() { - this.hidden ? this.show() : this.hide(); -}), _defineProperty(_Object$assign, 'destroy', function destroy() { - this.hide(); - this.list.removeEventListener('click', this.eventWrapper.clickEvent); -}), _Object$assign)); - -exports.default = DropDown; - -/***/ }), -/* 10 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -__webpack_require__(1); - -var _hook = __webpack_require__(2); - -var _hook2 = _interopRequireDefault(_hook); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var HookButton = function HookButton(trigger, list, plugins, config) { - _hook2.default.call(this, trigger, list, plugins, config); - - this.type = 'button'; - this.event = 'click'; - - this.eventWrapper = {}; - - this.addEvents(); - this.addPlugins(); -}; - -HookButton.prototype = Object.create(_hook2.default.prototype); - -Object.assign(HookButton.prototype, { - addPlugins: function addPlugins() { - var _this = this; - - this.plugins.forEach(function (plugin) { - return plugin.init(_this); - }); - }, - - clicked: function clicked(e) { - var buttonEvent = new CustomEvent('click.dl', { - detail: { - hook: this - }, - bubbles: true, - cancelable: true - }); - e.target.dispatchEvent(buttonEvent); - - this.list.toggle(); - }, - - addEvents: function addEvents() { - this.eventWrapper.clicked = this.clicked.bind(this); - this.trigger.addEventListener('click', this.eventWrapper.clicked); - }, - - removeEvents: function removeEvents() { - this.trigger.removeEventListener('click', this.eventWrapper.clicked); - }, - - restoreInitialState: function restoreInitialState() { - this.list.list.innerHTML = this.list.initialState; - }, - - removePlugins: function removePlugins() { - this.plugins.forEach(function (plugin) { - return plugin.destroy(); - }); - }, - - destroy: function destroy() { - this.restoreInitialState(); - - this.removeEvents(); - this.removePlugins(); - }, - - constructor: HookButton -}); - -exports.default = HookButton; - -/***/ }), -/* 11 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -__webpack_require__(1); - -var _hook = __webpack_require__(2); - -var _hook2 = _interopRequireDefault(_hook); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -var HookInput = function HookInput(trigger, list, plugins, config) { - _hook2.default.call(this, trigger, list, plugins, config); - - this.type = 'input'; - this.event = 'input'; - - this.eventWrapper = {}; - - this.addEvents(); - this.addPlugins(); -}; - -Object.assign(HookInput.prototype, { - addPlugins: function addPlugins() { - var _this = this; - - this.plugins.forEach(function (plugin) { - return plugin.init(_this); - }); - }, - - addEvents: function addEvents() { - this.eventWrapper.mousedown = this.mousedown.bind(this); - this.eventWrapper.input = this.input.bind(this); - this.eventWrapper.keyup = this.keyup.bind(this); - this.eventWrapper.keydown = this.keydown.bind(this); - - this.trigger.addEventListener('mousedown', this.eventWrapper.mousedown); - this.trigger.addEventListener('input', this.eventWrapper.input); - this.trigger.addEventListener('keyup', this.eventWrapper.keyup); - this.trigger.addEventListener('keydown', this.eventWrapper.keydown); - }, - - removeEvents: function removeEvents() { - this.hasRemovedEvents = true; - - this.trigger.removeEventListener('mousedown', this.eventWrapper.mousedown); - this.trigger.removeEventListener('input', this.eventWrapper.input); - this.trigger.removeEventListener('keyup', this.eventWrapper.keyup); - this.trigger.removeEventListener('keydown', this.eventWrapper.keydown); - }, - - input: function input(e) { - if (this.hasRemovedEvents) return; - - this.list.show(); - - var inputEvent = new CustomEvent('input.dl', { - detail: { - hook: this, - text: e.target.value - }, - bubbles: true, - cancelable: true - }); - e.target.dispatchEvent(inputEvent); - }, - - mousedown: function mousedown(e) { - if (this.hasRemovedEvents) return; - - var mouseEvent = new CustomEvent('mousedown.dl', { - detail: { - hook: this, - text: e.target.value - }, - bubbles: true, - cancelable: true - }); - e.target.dispatchEvent(mouseEvent); - }, - - keyup: function keyup(e) { - if (this.hasRemovedEvents) return; - - this.keyEvent(e, 'keyup.dl'); - }, - - keydown: function keydown(e) { - if (this.hasRemovedEvents) return; - - this.keyEvent(e, 'keydown.dl'); - }, - - keyEvent: function keyEvent(e, eventName) { - this.list.show(); - - var keyEvent = new CustomEvent(eventName, { - detail: { - hook: this, - text: e.target.value, - which: e.which, - key: e.key - }, - bubbles: true, - cancelable: true - }); - e.target.dispatchEvent(keyEvent); - }, - - restoreInitialState: function restoreInitialState() { - this.list.list.innerHTML = this.list.initialState; - }, - - removePlugins: function removePlugins() { - this.plugins.forEach(function (plugin) { - return plugin.destroy(); - }); - }, - - destroy: function destroy() { - this.restoreInitialState(); - - this.removeEvents(); - this.removePlugins(); - - this.list.destroy(); - } -}); - -exports.default = HookInput; - -/***/ }), -/* 12 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _constants = __webpack_require__(0); - -var Keyboard = function Keyboard() { - var currentKey; - var currentFocus; - var isUpArrow = false; - var isDownArrow = false; - var removeHighlight = function removeHighlight(list) { - var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0); - var listItems = []; - for (var i = 0; i < itemElements.length; i++) { - var listItem = itemElements[i]; - listItem.classList.remove(_constants.ACTIVE_CLASS); - - if (listItem.style.display !== 'none') { - listItems.push(listItem); - } - } - return listItems; - }; - - var setMenuForArrows = function setMenuForArrows(list) { - var listItems = removeHighlight(list); - if (list.currentIndex > 0) { - if (!listItems[list.currentIndex - 1]) { - list.currentIndex = list.currentIndex - 1; - } - - if (listItems[list.currentIndex - 1]) { - var el = listItems[list.currentIndex - 1]; - var filterDropdownEl = el.closest('.filter-dropdown'); - el.classList.add(_constants.ACTIVE_CLASS); - - if (filterDropdownEl) { - var filterDropdownBottom = filterDropdownEl.offsetHeight; - var elOffsetTop = el.offsetTop - 30; - - if (elOffsetTop > filterDropdownBottom) { - filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom; - } - } - } - } - }; - - var mousedown = function mousedown(e) { - var list = e.detail.hook.list; - removeHighlight(list); - list.show(); - list.currentIndex = 0; - isUpArrow = false; - isDownArrow = false; - }; - var selectItem = function selectItem(list) { - var listItems = removeHighlight(list); - var currentItem = listItems[list.currentIndex - 1]; - var listEvent = new CustomEvent('click.dl', { - detail: { - list: list, - selected: currentItem, - data: currentItem.dataset - } - }); - list.list.dispatchEvent(listEvent); - list.hide(); - }; - - var keydown = function keydown(e) { - var typedOn = e.target; - var list = e.detail.hook.list; - var currentIndex = list.currentIndex; - isUpArrow = false; - isDownArrow = false; - - if (e.detail.which) { - currentKey = e.detail.which; - if (currentKey === 13) { - selectItem(e.detail.hook.list); - return; - } - if (currentKey === 38) { - isUpArrow = true; - } - if (currentKey === 40) { - isDownArrow = true; - } - } else if (e.detail.key) { - currentKey = e.detail.key; - if (currentKey === 'Enter') { - selectItem(e.detail.hook.list); - return; - } - if (currentKey === 'ArrowUp') { - isUpArrow = true; - } - if (currentKey === 'ArrowDown') { - isDownArrow = true; - } - } - if (isUpArrow) { - currentIndex--; - } - if (isDownArrow) { - currentIndex++; - } - if (currentIndex < 0) { - currentIndex = 0; - } - list.currentIndex = currentIndex; - setMenuForArrows(e.detail.hook.list); - }; - - document.addEventListener('mousedown.dl', mousedown); - document.addEventListener('keydown.dl', keydown); -}; - -exports.default = Keyboard; - -/***/ }), -/* 13 */, -/* 14 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _droplab = __webpack_require__(4); - -Object.keys(_droplab).forEach(function (key) { - if (key === "default" || key === "__esModule") return; - Object.defineProperty(exports, key, { - enumerable: true, - get: function get() { - return _droplab[key]; - } - }); -}); - -/***/ }) -/******/ ]); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca","webpack:///./src/constants.js","webpack:///./~/custom-event-polyfill/custom-event-polyfill.js","webpack:///./src/hook.js","webpack:///./src/utils.js","webpack:///./src/droplab.js","webpack:///./src/dropdown.js","webpack:///./src/hook_button.js","webpack:///./src/hook_input.js","webpack:///./src/keyboard.js","webpack:///./src/index.js"],"names":["DATA_TRIGGER","DATA_DROPDOWN","SELECTED_CLASS","ACTIVE_CLASS","Hook","trigger","list","plugins","config","type","event","id","Object","assign","prototype","addEvents","constructor","utils","toCamelCase","attr","camelize","split","slice","join","t","s","d","p","hasOwnProperty","call","replace","RegExp","str","letter","index","toLowerCase","toUpperCase","closest","thisTag","stopTag","tagName","parentNode","isDropDownParts","target","hasAttribute","DropLab","ready","hooks","queuedData","eventWrapper","loadStatic","dropdownTriggers","apply","document","querySelectorAll","addHooks","addData","args","arguments","applyArgs","setData","destroy","forEach","hook","removeEvents","methodName","push","_addData","data","_processData","_setData","Array","isArray","documentClicked","bind","addEventListener","e","hide","removeEventListener","changeHookList","availableTrigger","getElementById","i","dataset","dropdownActive","splice","addHook","availableHook","querySelector","availableList","Element","HookObject","setConfig","obj","fireReady","readyEvent","CustomEvent","detail","dropdown","dispatchEvent","init","DropDown","currentIndex","hidden","items","getItems","initTemplateString","initialState","innerHTML","templateString","length","outerHTML","clickEvent","selected","addSelectedClass","preventDefault","listEvent","removeSelectedClasses","classList","add","item","remove","toggle","show","render","concat","children","map","renderChildren","renderableList","html","template","createElement","setImagesSrc","firstChild","style","display","droplab_hidden","images","image","src","getAttribute","removeAttribute","HookButton","addPlugins","create","plugin","clicked","buttonEvent","bubbles","cancelable","restoreInitialState","removePlugins","HookInput","mousedown","input","keyup","keydown","hasRemovedEvents","inputEvent","text","value","mouseEvent","keyEvent","eventName","which","key","Keyboard","currentKey","currentFocus","isUpArrow","isDownArrow","removeHighlight","itemElements","listItems","listItem","setMenuForArrows","el","filterDropdownEl","filterDropdownBottom","offsetHeight","elOffsetTop","offsetTop","scrollTop","selectItem","currentItem","typedOn"],"mappings":"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","file":"./dist/droplab.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 14);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","const DATA_TRIGGER = 'data-dropdown-trigger';\nconst DATA_DROPDOWN = 'data-dropdown';\nconst SELECTED_CLASS = 'droplab-item-selected';\nconst ACTIVE_CLASS = 'droplab-item-active';\n\nexport {\n  DATA_TRIGGER,\n  DATA_DROPDOWN,\n  SELECTED_CLASS,\n  ACTIVE_CLASS,\n};\n\n\n\n// WEBPACK FOOTER //\n// ./src/constants.js","// Polyfill for creating CustomEvents on IE9/10/11\n\n// code pulled from:\n// https://github.com/d4tocchini/customevent-polyfill\n// https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent#Polyfill\n\ntry {\n    var ce = new window.CustomEvent('test');\n    ce.preventDefault();\n    if (ce.defaultPrevented !== true) {\n        // IE has problems with .preventDefault() on custom events\n        // http://stackoverflow.com/questions/23349191\n        throw new Error('Could not prevent default');\n    }\n} catch(e) {\n  var CustomEvent = function(event, params) {\n    var evt, origPrevent;\n    params = params || {\n      bubbles: false,\n      cancelable: false,\n      detail: undefined\n    };\n\n    evt = document.createEvent(\"CustomEvent\");\n    evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);\n    origPrevent = evt.preventDefault;\n    evt.preventDefault = function () {\n      origPrevent.call(this);\n      try {\n        Object.defineProperty(this, 'defaultPrevented', {\n          get: function () {\n            return true;\n          }\n        });\n      } catch(e) {\n        this.defaultPrevented = true;\n      }\n    };\n    return evt;\n  };\n\n  CustomEvent.prototype = window.Event.prototype;\n  window.CustomEvent = CustomEvent; // expose definition to window\n}\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./~/custom-event-polyfill/custom-event-polyfill.js\n// module id = 1\n// module chunks = 0 1","import DropDown from './dropdown';\n\nvar Hook = function(trigger, list, plugins, config){\n  this.trigger = trigger;\n  this.list = new DropDown(list);\n  this.type = 'Hook';\n  this.event = 'click';\n  this.plugins = plugins || [];\n  this.config = config || {};\n  this.id = trigger.id;\n};\n\nObject.assign(Hook.prototype, {\n\n  addEvents: function(){},\n\n  constructor: Hook,\n});\n\nexport default Hook;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook.js","import { DATA_TRIGGER, DATA_DROPDOWN } from './constants';\n\nconst utils = {\n  toCamelCase(attr) {\n    return this.camelize(attr.split('-').slice(1).join(' '));\n  },\n\n  t(s, d) {\n    for (const p in d) {\n      if (Object.prototype.hasOwnProperty.call(d, p)) {\n        s = s.replace(new RegExp(`{{${p}}}`, 'g'), d[p]);\n      }\n    }\n    return s;\n  },\n\n  camelize(str) {\n    return str.replace(/(?:^\\w|[A-Z]|\\b\\w)/g, (letter, index) => {\n      return index === 0 ? letter.toLowerCase() : letter.toUpperCase();\n    }).replace(/\\s+/g, '');\n  },\n\n  closest(thisTag, stopTag) {\n    while (thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML') {\n      thisTag = thisTag.parentNode;\n    }\n    return thisTag;\n  },\n\n  isDropDownParts(target) {\n    if (!target || target.tagName === 'HTML') return false;\n    return target.hasAttribute(DATA_TRIGGER) || target.hasAttribute(DATA_DROPDOWN);\n  },\n};\n\n\nexport default utils;\n\n\n\n// WEBPACK FOOTER //\n// ./src/utils.js","import 'custom-event-polyfill';\nimport HookButton from './hook_button';\nimport HookInput from './hook_input';\nimport utils from './utils';\nimport Keyboard from './keyboard';\nimport { DATA_TRIGGER } from './constants';\n\nvar DropLab = function() {\n  this.ready = false;\n  this.hooks = [];\n  this.queuedData = [];\n  this.config = {};\n\n  this.eventWrapper = {};\n};\n\nObject.assign(DropLab.prototype, {\n  loadStatic: function(){\n    var dropdownTriggers = [].slice.apply(document.querySelectorAll(`[${DATA_TRIGGER}]`));\n    this.addHooks(dropdownTriggers);\n  },\n\n  addData: function () {\n    var args = [].slice.apply(arguments);\n    this.applyArgs(args, '_addData');\n  },\n\n  setData: function() {\n    var args = [].slice.apply(arguments);\n    this.applyArgs(args, '_setData');\n  },\n\n  destroy: function() {\n    this.hooks.forEach(hook => hook.destroy());\n    this.hooks = [];\n    this.removeEvents();\n  },\n\n  applyArgs: function(args, methodName) {\n    if (this.ready) return this[methodName].apply(this, args);\n\n    this.queuedData = this.queuedData || [];\n    this.queuedData.push(args);\n  },\n\n  _addData: function(trigger, data) {\n    this._processData(trigger, data, 'addData');\n  },\n\n  _setData: function(trigger, data) {\n    this._processData(trigger, data, 'setData');\n  },\n\n  _processData: function(trigger, data, methodName) {\n    this.hooks.forEach((hook) => {\n      if (Array.isArray(trigger)) hook.list[methodName](trigger);\n\n      if (hook.trigger.id === trigger) hook.list[methodName](data);\n    });\n  },\n\n  addEvents: function() {\n    this.eventWrapper.documentClicked = this.documentClicked.bind(this)\n    document.addEventListener('click', this.eventWrapper.documentClicked);\n  },\n\n  documentClicked: function(e) {\n    let thisTag = e.target;\n\n    if (thisTag.tagName !== 'UL') thisTag = utils.closest(thisTag, 'UL');\n    if (utils.isDropDownParts(thisTag, this.hooks) || utils.isDropDownParts(e.target, this.hooks)) return;\n\n    this.hooks.forEach(hook => hook.list.hide());\n  },\n\n  removeEvents: function(){\n    document.removeEventListener('click', this.eventWrapper.documentClicked);\n  },\n\n  changeHookList: function(trigger, list, plugins, config) {\n    const availableTrigger =  typeof trigger === 'string' ? document.getElementById(trigger) : trigger;\n\n\n    this.hooks.forEach((hook, i) => {\n      hook.list.list.dataset.dropdownActive = false;\n\n      if (hook.trigger !== availableTrigger) return;\n\n      hook.destroy();\n      this.hooks.splice(i, 1);\n      this.addHook(availableTrigger, list, plugins, config);\n    });\n  },\n\n  addHook: function(hook, list, plugins, config) {\n    const availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook;\n    let availableList;\n\n    if (typeof list === 'string') {\n      availableList = document.querySelector(list);\n    } else if (list instanceof Element) {\n      availableList = list;\n    } else {\n      availableList = document.querySelector(hook.dataset[utils.toCamelCase(DATA_TRIGGER)]);\n    }\n\n    availableList.dataset.dropdownActive = true;\n\n    const HookObject = availableHook.tagName === 'INPUT' ? HookInput : HookButton;\n    this.hooks.push(new HookObject(availableHook, availableList, plugins, config));\n\n    return this;\n  },\n\n  addHooks: function(hooks, plugins, config) {\n    hooks.forEach(hook => this.addHook(hook, null, plugins, config));\n    return this;\n  },\n\n  setConfig: function(obj){\n    this.config = obj;\n  },\n\n  fireReady: function() {\n    const readyEvent = new CustomEvent('ready.dl', {\n      detail: {\n        dropdown: this,\n      },\n    });\n    document.dispatchEvent(readyEvent);\n\n    this.ready = true;\n  },\n\n  init: function (hook, list, plugins, config) {\n    hook ? this.addHook(hook, list, plugins, config) : this.loadStatic();\n\n    this.addEvents();\n\n    Keyboard();\n\n    this.fireReady();\n\n    this.queuedData.forEach(data => this.addData(data));\n    this.queuedData = [];\n\n    return this;\n  },\n});\n\nexport default DropLab;\n\n\n\n// WEBPACK FOOTER //\n// ./src/droplab.js","import 'custom-event-polyfill';\nimport utils from './utils';\nimport { SELECTED_CLASS } from '../src/constants';\n\nvar DropDown = function(list) {\n  this.currentIndex = 0;\n  this.hidden = true;\n  this.list = typeof list === 'string' ? document.querySelector(list) : list;\n  this.items = [];\n\n  this.eventWrapper = {};\n\n  this.getItems();\n  this.initTemplateString();\n  this.addEvents();\n\n  this.initialState = list.innerHTML;\n};\n\nObject.assign(DropDown.prototype, {\n  getItems: function() {\n    this.items = [].slice.call(this.list.querySelectorAll('li'));\n    return this.items;\n  },\n\n  initTemplateString: function() {\n    var items = this.items || this.getItems();\n\n    var templateString = '';\n    if (items.length > 0) templateString = items[items.length - 1].outerHTML;\n    this.templateString = templateString;\n\n    return this.templateString;\n  },\n\n  clickEvent: function(e) {\n    var selected = utils.closest(e.target, 'LI');\n    if (!selected) return;\n\n    this.addSelectedClass(selected);\n\n    e.preventDefault();\n    this.hide();\n\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: this,\n        selected: selected,\n        data: e.target.dataset,\n      },\n    });\n    this.list.dispatchEvent(listEvent);\n  },\n\n  addSelectedClass: function (selected) {\n    this.removeSelectedClasses();\n    selected.classList.add(SELECTED_CLASS);\n  },\n\n  removeSelectedClasses: function () {\n    const items = this.items || this.getItems();\n\n    items.forEach(item => item.classList.remove(SELECTED_CLASS));\n  },\n\n  addEvents: function() {\n    this.eventWrapper.clickEvent = this.clickEvent.bind(this)\n    this.list.addEventListener('click', this.eventWrapper.clickEvent);\n  },\n\n  toggle: function() {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  setData: function(data) {\n    this.data = data;\n    this.render(data);\n  },\n\n  addData: function(data) {\n    this.data = (this.data || []).concat(data);\n    this.render(this.data);\n  },\n\n  render: function(data) {\n    const children = data ? data.map(this.renderChildren.bind(this)) : [];\n    const renderableList = this.list.querySelector('ul[data-dynamic]') || this.list;\n\n    renderableList.innerHTML = children.join('');\n  },\n\n  renderChildren: function(data) {\n    var html = utils.t(this.templateString, data);\n    var template = document.createElement('div');\n\n    template.innerHTML = html;\n    this.setImagesSrc(template);\n    template.firstChild.style.display = data.droplab_hidden ? 'none' : 'block';\n\n    return template.firstChild.outerHTML;\n  },\n\n  setImagesSrc: function(template) {\n    const images = [].slice.call(template.querySelectorAll('img[data-src]'));\n\n    images.forEach((image) => {\n      image.src = image.getAttribute('data-src');\n      image.removeAttribute('data-src');\n    });\n  },\n\n  show: function() {\n    if (!this.hidden) return;\n    this.list.style.display = 'block';\n    this.currentIndex = 0;\n    this.hidden = false;\n  },\n\n  hide: function() {\n    if (this.hidden) return;\n    this.list.style.display = 'none';\n    this.currentIndex = 0;\n    this.hidden = true;\n  },\n\n  toggle: function () {\n    this.hidden ? this.show() : this.hide();\n  },\n\n  destroy: function() {\n    this.hide();\n    this.list.removeEventListener('click', this.eventWrapper.clickEvent);\n  }\n});\n\nexport default DropDown;\n\n\n\n// WEBPACK FOOTER //\n// ./src/dropdown.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookButton = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'button';\n  this.event = 'click';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nHookButton.prototype = Object.create(Hook.prototype);\n\nObject.assign(HookButton.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  clicked: function(e){\n    var buttonEvent = new CustomEvent('click.dl', {\n      detail: {\n        hook: this,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(buttonEvent);\n\n    this.list.toggle();\n  },\n\n  addEvents: function(){\n    this.eventWrapper.clicked = this.clicked.bind(this);\n    this.trigger.addEventListener('click', this.eventWrapper.clicked);\n  },\n\n  removeEvents: function(){\n    this.trigger.removeEventListener('click', this.eventWrapper.clicked);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n  },\n\n  constructor: HookButton,\n});\n\n\nexport default HookButton;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_button.js","import 'custom-event-polyfill';\nimport Hook from './hook';\n\nvar HookInput = function(trigger, list, plugins, config) {\n  Hook.call(this, trigger, list, plugins, config);\n\n  this.type = 'input';\n  this.event = 'input';\n\n  this.eventWrapper = {};\n\n  this.addEvents();\n  this.addPlugins();\n};\n\nObject.assign(HookInput.prototype, {\n  addPlugins: function() {\n    this.plugins.forEach(plugin => plugin.init(this));\n  },\n\n  addEvents: function(){\n    this.eventWrapper.mousedown = this.mousedown.bind(this);\n    this.eventWrapper.input = this.input.bind(this);\n    this.eventWrapper.keyup = this.keyup.bind(this);\n    this.eventWrapper.keydown = this.keydown.bind(this);\n\n    this.trigger.addEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.addEventListener('input', this.eventWrapper.input);\n    this.trigger.addEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.addEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  removeEvents: function() {\n    this.hasRemovedEvents = true;\n\n    this.trigger.removeEventListener('mousedown', this.eventWrapper.mousedown);\n    this.trigger.removeEventListener('input', this.eventWrapper.input);\n    this.trigger.removeEventListener('keyup', this.eventWrapper.keyup);\n    this.trigger.removeEventListener('keydown', this.eventWrapper.keydown);\n  },\n\n  input: function(e) {\n    if(this.hasRemovedEvents) return;\n\n    this.list.show();\n\n    const inputEvent = new CustomEvent('input.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true\n    });\n    e.target.dispatchEvent(inputEvent);\n  },\n\n  mousedown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    const mouseEvent = new CustomEvent('mousedown.dl', {\n      detail: {\n        hook: this,\n        text: e.target.value,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(mouseEvent);\n  },\n\n  keyup: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keyup.dl');\n  },\n\n  keydown: function(e) {\n    if (this.hasRemovedEvents) return;\n\n    this.keyEvent(e, 'keydown.dl');\n  },\n\n  keyEvent: function(e, eventName) {\n    this.list.show();\n\n    const keyEvent = new CustomEvent(eventName, {\n      detail: {\n        hook: this,\n        text: e.target.value,\n        which: e.which,\n        key: e.key,\n      },\n      bubbles: true,\n      cancelable: true,\n    });\n    e.target.dispatchEvent(keyEvent);\n  },\n\n  restoreInitialState: function() {\n    this.list.list.innerHTML = this.list.initialState;\n  },\n\n  removePlugins: function() {\n    this.plugins.forEach(plugin => plugin.destroy());\n  },\n\n  destroy: function() {\n    this.restoreInitialState();\n\n    this.removeEvents();\n    this.removePlugins();\n\n    this.list.destroy();\n  }\n});\n\nexport default HookInput;\n\n\n\n// WEBPACK FOOTER //\n// ./src/hook_input.js","import { ACTIVE_CLASS } from './constants';\n\nconst Keyboard = function () {\n  var currentKey;\n  var currentFocus;\n  var isUpArrow = false;\n  var isDownArrow = false;\n  var removeHighlight = function removeHighlight(list) {\n    var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0);\n    var listItems = [];\n    for(var i = 0; i < itemElements.length; i++) {\n      var listItem = itemElements[i];\n      listItem.classList.remove(ACTIVE_CLASS);\n\n      if (listItem.style.display !== 'none') {\n        listItems.push(listItem);\n      }\n    }\n    return listItems;\n  };\n\n  var setMenuForArrows = function setMenuForArrows(list) {\n    var listItems = removeHighlight(list);\n    if(list.currentIndex>0){\n      if(!listItems[list.currentIndex-1]){\n        list.currentIndex = list.currentIndex-1;\n      }\n\n      if (listItems[list.currentIndex-1]) {\n        var el = listItems[list.currentIndex-1];\n        var filterDropdownEl = el.closest('.filter-dropdown');\n        el.classList.add(ACTIVE_CLASS);\n\n        if (filterDropdownEl) {\n          var filterDropdownBottom = filterDropdownEl.offsetHeight;\n          var elOffsetTop = el.offsetTop - 30;\n\n          if (elOffsetTop > filterDropdownBottom) {\n            filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom;\n          }\n        }\n      }\n    }\n  };\n\n  var mousedown = function mousedown(e) {\n    var list = e.detail.hook.list;\n    removeHighlight(list);\n    list.show();\n    list.currentIndex = 0;\n    isUpArrow = false;\n    isDownArrow = false;\n  };\n  var selectItem = function selectItem(list) {\n    var listItems = removeHighlight(list);\n    var currentItem = listItems[list.currentIndex-1];\n    var listEvent = new CustomEvent('click.dl', {\n      detail: {\n        list: list,\n        selected: currentItem,\n        data: currentItem.dataset,\n      },\n    });\n    list.list.dispatchEvent(listEvent);\n    list.hide();\n  }\n\n  var keydown = function keydown(e){\n    var typedOn = e.target;\n    var list = e.detail.hook.list;\n    var currentIndex = list.currentIndex;\n    isUpArrow = false;\n    isDownArrow = false;\n\n    if(e.detail.which){\n      currentKey = e.detail.which;\n      if(currentKey === 13){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 38) {\n        isUpArrow = true;\n      }\n      if(currentKey === 40) {\n        isDownArrow = true;\n      }\n    } else if(e.detail.key) {\n      currentKey = e.detail.key;\n      if(currentKey === 'Enter'){\n        selectItem(e.detail.hook.list);\n        return;\n      }\n      if(currentKey === 'ArrowUp') {\n        isUpArrow = true;\n      }\n      if(currentKey === 'ArrowDown') {\n        isDownArrow = true;\n      }\n    }\n    if(isUpArrow){ currentIndex--; }\n    if(isDownArrow){ currentIndex++; }\n    if(currentIndex < 0){ currentIndex = 0; }\n    list.currentIndex = currentIndex;\n    setMenuForArrows(e.detail.hook.list);\n  };\n\n  document.addEventListener('mousedown.dl', mousedown);\n  document.addEventListener('keydown.dl', keydown);\n};\n\nexport default Keyboard;\n\n\n\n// WEBPACK FOOTER //\n// ./src/keyboard.js","export * from './droplab';\n\n\n\n// WEBPACK FOOTER //\n// ./src/index.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/ajax.js b/app/assets/javascripts/droplab/plugins/ajax.js deleted file mode 100644 index afc423b7f0e..00000000000 --- a/app/assets/javascripts/droplab/plugins/ajax.js +++ /dev/null @@ -1,157 +0,0 @@ -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) -/******/ return installedModules[moduleId].exports; -/******/ -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // identity function for calling harmony imports with the correct context -/******/ __webpack_require__.i = function(value) { return value; }; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { -/******/ configurable: false, -/******/ enumerable: true, -/******/ get: getter -/******/ }); -/******/ } -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 5); -/******/ }) -/************************************************************************/ -/******/ ({ - -/***/ 5: -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -function droplabAjaxException(message) { - this.message = message; -} - -var droplabAjax = { - _loadUrlData: function _loadUrlData(url) { - var self = this; - return new Promise(function (resolve, reject) { - var xhr = new XMLHttpRequest(); - xhr.open('GET', url, true); - xhr.onreadystatechange = function () { - if (xhr.readyState === XMLHttpRequest.DONE) { - if (xhr.status === 200) { - var data = JSON.parse(xhr.responseText); - self.cache[url] = data; - return resolve(data); - } else { - return reject([xhr.responseText, xhr.status]); - } - } - }; - xhr.send(); - }); - }, - _loadData: function _loadData(data, config, self) { - if (config.loadingTemplate) { - var dataLoadingTemplate = self.hook.list.list.querySelector('[data-loading-template]'); - if (dataLoadingTemplate) dataLoadingTemplate.outerHTML = self.listTemplate; - } - - if (!self.destroyed) self.hook.list[config.method].call(self.hook.list, data); - }, - init: function init(hook) { - var self = this; - self.destroyed = false; - self.cache = self.cache || {}; - var config = hook.config.droplabAjax; - this.hook = hook; - if (!config || !config.endpoint || !config.method) { - return; - } - if (config.method !== 'setData' && config.method !== 'addData') { - return; - } - if (config.loadingTemplate) { - var dynamicList = hook.list.list.querySelector('[data-dynamic]'); - var loadingTemplate = document.createElement('div'); - loadingTemplate.innerHTML = config.loadingTemplate; - loadingTemplate.setAttribute('data-loading-template', ''); - this.listTemplate = dynamicList.outerHTML; - dynamicList.outerHTML = loadingTemplate.outerHTML; - } - if (self.cache[config.endpoint]) { - self._loadData(self.cache[config.endpoint], config, self); - } else { - this._loadUrlData(config.endpoint).then(function (d) { - self._loadData(d, config, self); - }).catch(function (e) { - throw new droplabAjaxException(e.message || e); - }); - } - }, - destroy: function destroy() { - this.destroyed = true; - - var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); - if (this.listTemplate && dynamicList) { - dynamicList.outerHTML = this.listTemplate; - } - } -}; - -exports.default = droplabAjax; - -/***/ }) - -/******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca?0abf********","webpack:///./src/plugins/ajax/ajax.js?2178"],"names":["droplabAjaxException","message","droplabAjax","_loadUrlData","url","self","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","data","JSON","parse","responseText","cache","send","_loadData","config","loadingTemplate","dataLoadingTemplate","hook","list","querySelector","outerHTML","listTemplate","destroyed","method","call","init","endpoint","dynamicList","document","createElement","innerHTML","setAttribute","then","d","catch","e","destroy"],"mappings":"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","file":"./dist/plugins/ajax.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 5);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","function droplabAjaxException(message) {\n  this.message = message;\n}\n\nconst droplabAjax = {\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n  _loadData: function _loadData(data, config, self) {\n    if (config.loadingTemplate) {\n      var dataLoadingTemplate = self.hook.list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) dataLoadingTemplate.outerHTML = self.listTemplate;\n    }\n\n    if (!self.destroyed) self.hook.list[config.method].call(self.hook.list, data);\n  },\n  init: function init(hook) {\n    var self = this;\n    self.destroyed = false;\n    self.cache = self.cache || {};\n    var config = hook.config.droplabAjax;\n    this.hook = hook;\n    if (!config || !config.endpoint || !config.method) {\n      return;\n    }\n    if (config.method !== 'setData' && config.method !== 'addData') {\n      return;\n    }\n    if (config.loadingTemplate) {\n      var dynamicList = hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', '');\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (self.cache[config.endpoint]) {\n      self._loadData(self.cache[config.endpoint], config, self);\n    } else {\n      this._loadUrlData(config.endpoint)\n        .then(function(d) {\n          self._loadData(d, config, self);\n        }).catch(function(e) {\n          throw new droplabAjaxException(e.message || e);\n        });\n    }\n  },\n  destroy: function() {\n    this.destroyed = true;\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nexport default droplabAjax;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax/ajax.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/ajax_filter.js b/app/assets/javascripts/droplab/plugins/ajax_filter.js deleted file mode 100644 index 3e6532c7709..00000000000 --- a/app/assets/javascripts/droplab/plugins/ajax_filter.js +++ /dev/null @@ -1,214 +0,0 @@ -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) -/******/ return installedModules[moduleId].exports; -/******/ -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // identity function for calling harmony imports with the correct context -/******/ __webpack_require__.i = function(value) { return value; }; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { -/******/ configurable: false, -/******/ enumerable: true, -/******/ get: getter -/******/ }); -/******/ } -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 6); -/******/ }) -/************************************************************************/ -/******/ ({ - -/***/ 6: -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -var droplabAjaxFilter = { - init: function init(hook) { - this.destroyed = false; - this.hook = hook; - this.notLoading(); - - this.eventWrapper = {}; - this.eventWrapper.debounceTrigger = this.debounceTrigger.bind(this); - this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceTrigger); - this.hook.trigger.addEventListener('focus', this.eventWrapper.debounceTrigger); - - this.trigger(true); - }, - - notLoading: function notLoading() { - this.loading = false; - }, - - debounceTrigger: function debounceTrigger(e) { - var NON_CHARACTER_KEYS = [16, 17, 18, 20, 37, 38, 39, 40, 91, 93]; - var invalidKeyPressed = NON_CHARACTER_KEYS.indexOf(e.detail.which || e.detail.keyCode) > -1; - var focusEvent = e.type === 'focus'; - if (invalidKeyPressed || this.loading) { - return; - } - if (this.timeout) { - clearTimeout(this.timeout); - } - this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200); - }, - - trigger: function trigger(getEntireList) { - var config = this.hook.config.droplabAjaxFilter; - var searchValue = this.trigger.value; - if (!config || !config.endpoint || !config.searchKey) { - return; - } - if (config.searchValueFunction) { - searchValue = config.searchValueFunction(); - } - if (config.loadingTemplate && this.hook.list.data === undefined || this.hook.list.data.length === 0) { - var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); - var loadingTemplate = document.createElement('div'); - loadingTemplate.innerHTML = config.loadingTemplate; - loadingTemplate.setAttribute('data-loading-template', true); - this.listTemplate = dynamicList.outerHTML; - dynamicList.outerHTML = loadingTemplate.outerHTML; - } - if (getEntireList) { - searchValue = ''; - } - if (config.searchKey === searchValue) { - return this.list.show(); - } - this.loading = true; - var params = config.params || {}; - params[config.searchKey] = searchValue; - var self = this; - self.cache = self.cache || {}; - var url = config.endpoint + this.buildParams(params); - var urlCachedData = self.cache[url]; - if (urlCachedData) { - self._loadData(urlCachedData, config, self); - } else { - this._loadUrlData(url).then(function (data) { - self._loadData(data, config, self); - }); - } - }, - - _loadUrlData: function _loadUrlData(url) { - var self = this; - return new Promise(function (resolve, reject) { - var xhr = new XMLHttpRequest(); - xhr.open('GET', url, true); - xhr.onreadystatechange = function () { - if (xhr.readyState === XMLHttpRequest.DONE) { - if (xhr.status === 200) { - var data = JSON.parse(xhr.responseText); - self.cache[url] = data; - return resolve(data); - } else { - return reject([xhr.responseText, xhr.status]); - } - } - }; - xhr.send(); - }); - }, - - _loadData: function _loadData(data, config, self) { - var list = self.hook.list; - if (config.loadingTemplate && list.data === undefined || list.data.length === 0) { - var dataLoadingTemplate = list.list.querySelector('[data-loading-template]'); - if (dataLoadingTemplate) { - dataLoadingTemplate.outerHTML = self.listTemplate; - } - } - if (!self.destroyed) { - var hookListChildren = list.list.children; - var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic'); - if (onlyDynamicList && data.length === 0) { - list.hide(); - } - list.setData.call(list, data); - } - self.notLoading(); - list.currentIndex = 0; - }, - - buildParams: function buildParams(params) { - if (!params) return ''; - var paramsArray = Object.keys(params).map(function (param) { - return param + '=' + (params[param] || ''); - }); - return '?' + paramsArray.join('&'); - }, - - destroy: function destroy() { - if (this.timeout) { - clearTimeout(this.timeout); - } - - this.destroyed = true; - this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceTrigger); - this.hook.trigger.removeEventListener('focus', this.eventWrapper.debounceTrigger); - } -}; - -exports.default = droplabAjaxFilter; - -/***/ }) - -/******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca?0abf*******","webpack:///./src/plugins/ajax_filter/ajax_filter.js?c3e5"],"names":["droplabAjaxFilter","init","hook","destroyed","notLoading","eventWrapper","debounceTrigger","bind","trigger","addEventListener","loading","e","NON_CHARACTER_KEYS","invalidKeyPressed","indexOf","detail","which","keyCode","focusEvent","type","timeout","clearTimeout","setTimeout","getEntireList","config","searchValue","value","endpoint","searchKey","searchValueFunction","loadingTemplate","list","data","undefined","length","dynamicList","querySelector","document","createElement","innerHTML","setAttribute","listTemplate","outerHTML","show","params","self","cache","url","buildParams","urlCachedData","_loadData","_loadUrlData","then","Promise","resolve","reject","xhr","XMLHttpRequest","open","onreadystatechange","readyState","DONE","status","JSON","parse","responseText","send","dataLoadingTemplate","hookListChildren","children","onlyDynamicList","hasAttribute","hide","setData","call","currentIndex","paramsArray","Object","keys","map","param","join","destroy","removeEventListener"],"mappings":"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","file":"./dist/plugins/ajax_filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 6);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","const droplabAjaxFilter = {\n  init: function(hook) {\n    this.destroyed = false;\n    this.hook = hook;\n    this.notLoading();\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceTrigger = this.debounceTrigger.bind(this);\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.addEventListener('focus', this.eventWrapper.debounceTrigger);\n\n    this.trigger(true);\n  },\n\n  notLoading: function notLoading() {\n    this.loading = false;\n  },\n\n  debounceTrigger: function debounceTrigger(e) {\n    var NON_CHARACTER_KEYS = [16, 17, 18, 20, 37, 38, 39, 40, 91, 93];\n    var invalidKeyPressed = NON_CHARACTER_KEYS.indexOf(e.detail.which || e.detail.keyCode) > -1;\n    var focusEvent = e.type === 'focus';\n    if (invalidKeyPressed || this.loading) {\n      return;\n    }\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n    this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200);\n  },\n\n  trigger: function trigger(getEntireList) {\n    var config = this.hook.config.droplabAjaxFilter;\n    var searchValue = this.trigger.value;\n    if (!config || !config.endpoint || !config.searchKey) {\n      return;\n    }\n    if (config.searchValueFunction) {\n      searchValue = config.searchValueFunction();\n    }\n    if (config.loadingTemplate && this.hook.list.data === undefined ||\n      this.hook.list.data.length === 0) {\n      var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n      var loadingTemplate = document.createElement('div');\n      loadingTemplate.innerHTML = config.loadingTemplate;\n      loadingTemplate.setAttribute('data-loading-template', true);\n      this.listTemplate = dynamicList.outerHTML;\n      dynamicList.outerHTML = loadingTemplate.outerHTML;\n    }\n    if (getEntireList) {\n      searchValue = '';\n    }\n    if (config.searchKey === searchValue) {\n      return this.list.show();\n    }\n    this.loading = true;\n    var params = config.params || {};\n    params[config.searchKey] = searchValue;\n    var self = this;\n    self.cache = self.cache || {};\n    var url = config.endpoint + this.buildParams(params);\n    var urlCachedData = self.cache[url];\n    if (urlCachedData) {\n      self._loadData(urlCachedData, config, self);\n    } else {\n      this._loadUrlData(url)\n        .then(function(data) {\n          self._loadData(data, config, self);\n        });\n    }\n  },\n\n  _loadUrlData: function _loadUrlData(url) {\n    var self = this;\n    return new Promise(function(resolve, reject) {\n      var xhr = new XMLHttpRequest;\n      xhr.open('GET', url, true);\n      xhr.onreadystatechange = function () {\n        if(xhr.readyState === XMLHttpRequest.DONE) {\n          if (xhr.status === 200) {\n            var data = JSON.parse(xhr.responseText);\n            self.cache[url] = data;\n            return resolve(data);\n          } else {\n            return reject([xhr.responseText, xhr.status]);\n          }\n        }\n      };\n      xhr.send();\n    });\n  },\n\n  _loadData: function _loadData(data, config, self) {\n    const list = self.hook.list;\n    if (config.loadingTemplate && list.data === undefined ||\n      list.data.length === 0) {\n      const dataLoadingTemplate = list.list.querySelector('[data-loading-template]');\n      if (dataLoadingTemplate) {\n        dataLoadingTemplate.outerHTML = self.listTemplate;\n      }\n    }\n    if (!self.destroyed) {\n      var hookListChildren = list.list.children;\n      var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic');\n      if (onlyDynamicList && data.length === 0) {\n        list.hide();\n      }\n      list.setData.call(list, data);\n    }\n    self.notLoading();\n    list.currentIndex = 0;\n  },\n\n  buildParams: function(params) {\n    if (!params) return '';\n    var paramsArray = Object.keys(params).map(function(param) {\n      return param + '=' + (params[param] || '');\n    });\n    return '?' + paramsArray.join('&');\n  },\n\n  destroy: function destroy() {\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n\n    this.destroyed = true;\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceTrigger);\n    this.hook.trigger.removeEventListener('focus', this.eventWrapper.debounceTrigger);\n  }\n};\n\nexport default droplabAjaxFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/ajax_filter/ajax_filter.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/filter.js b/app/assets/javascripts/droplab/plugins/filter.js deleted file mode 100644 index 3d81fbd7d2f..00000000000 --- a/app/assets/javascripts/droplab/plugins/filter.js +++ /dev/null @@ -1,172 +0,0 @@ -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) -/******/ return installedModules[moduleId].exports; -/******/ -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // identity function for calling harmony imports with the correct context -/******/ __webpack_require__.i = function(value) { return value; }; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { -/******/ configurable: false, -/******/ enumerable: true, -/******/ get: getter -/******/ }); -/******/ } -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 7); -/******/ }) -/************************************************************************/ -/******/ ({ - -/***/ 7: -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -var droplabFilter = { - keydown: function keydown(e) { - var hiddenCount = 0; - var dataHiddenCount = 0; - - var list = e.detail.hook.list; - var data = list.data; - var value = e.detail.hook.trigger.value.toLowerCase(); - var config = e.detail.hook.config.droplabFilter; - var matches = []; - var filterFunction; - // will only work on dynamically set data - if (!data) { - return; - } - - if (config && config.filterFunction && typeof config.filterFunction === 'function') { - filterFunction = config.filterFunction; - } else { - filterFunction = function filterFunction(o) { - // cheap string search - o.droplab_hidden = o[config.template].toLowerCase().indexOf(value) === -1; - return o; - }; - } - - dataHiddenCount = data.filter(function (o) { - return !o.droplab_hidden; - }).length; - - matches = data.map(function (o) { - return filterFunction(o, value); - }); - - hiddenCount = matches.filter(function (o) { - return !o.droplab_hidden; - }).length; - - if (dataHiddenCount !== hiddenCount) { - list.render(matches); - list.currentIndex = 0; - } - }, - - debounceKeydown: function debounceKeydown(e) { - if ([13, // enter - 16, // shift - 17, // ctrl - 18, // alt - 20, // caps lock - 37, // left arrow - 38, // up arrow - 39, // right arrow - 40, // down arrow - 91, // left window - 92, // right window - 93].indexOf(e.detail.which || e.detail.keyCode) > -1) return; - - if (this.timeout) clearTimeout(this.timeout); - this.timeout = setTimeout(this.keydown.bind(this, e), 200); - }, - - init: function init(hook) { - var config = hook.config.droplabFilter; - - if (!config || !config.template) return; - - this.hook = hook; - - this.eventWrapper = {}; - this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this); - - this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown); - this.hook.trigger.addEventListener('mousedown.dl', this.eventWrapper.debounceKeydown); - }, - - destroy: function destroy() { - this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown); - this.hook.trigger.removeEventListener('mousedown.dl', this.eventWrapper.debounceKeydown); - - var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); - if (this.listTemplate && dynamicList) { - dynamicList.outerHTML = this.listTemplate; - } - } -}; - -exports.default = droplabFilter; - -/***/ }) - -/******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap 933ff7d5ed393dc63bca?0abf******","webpack:///./src/plugins/filter/filter.js?f41a"],"names":["droplabFilter","keydown","e","hiddenCount","dataHiddenCount","list","detail","hook","data","value","trigger","toLowerCase","config","matches","filterFunction","o","droplab_hidden","template","indexOf","filter","length","map","render","currentIndex","debounceKeydown","which","keyCode","timeout","clearTimeout","setTimeout","bind","init","eventWrapper","addEventListener","destroy","removeEventListener","dynamicList","querySelector","listTemplate","outerHTML"],"mappings":"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","file":"./dist/plugins/filter.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 7);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 933ff7d5ed393dc63bca","const droplabFilter = {\n  keydown: function(e){\n    var hiddenCount = 0;\n    var dataHiddenCount = 0;\n\n    var list = e.detail.hook.list;\n    var data = list.data;\n    var value = e.detail.hook.trigger.value.toLowerCase();\n    var config = e.detail.hook.config.droplabFilter;\n    var matches = [];\n    var filterFunction;\n    // will only work on dynamically set data\n    if(!data){\n      return;\n    }\n\n    if (config && config.filterFunction && typeof config.filterFunction === 'function') {\n      filterFunction = config.filterFunction;\n    } else {\n      filterFunction = function(o){\n        // cheap string search\n        o.droplab_hidden = o[config.template].toLowerCase().indexOf(value) === -1;\n        return o;\n      };\n    }\n\n    dataHiddenCount = data.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    matches = data.map(function(o) {\n      return filterFunction(o, value);\n    });\n\n    hiddenCount = matches.filter(function(o) {\n      return !o.droplab_hidden;\n    }).length;\n\n    if (dataHiddenCount !== hiddenCount) {\n      list.render(matches);\n      list.currentIndex = 0;\n    }\n  },\n\n  debounceKeydown: function debounceKeydown(e) {\n    if ([\n      13, // enter\n      16, // shift\n      17, // ctrl\n      18, // alt\n      20, // caps lock\n      37, // left arrow\n      38, // up arrow\n      39, // right arrow\n      40, // down arrow\n      91, // left window\n      92, // right window\n      93, // select\n    ].indexOf(e.detail.which || e.detail.keyCode) > -1) return;\n\n    if (this.timeout) clearTimeout(this.timeout);\n    this.timeout = setTimeout(this.keydown.bind(this, e), 200);\n  },\n\n  init: function init(hook) {\n    var config = hook.config.droplabFilter;\n\n    if (!config || !config.template) return;\n\n    this.hook = hook;\n\n    this.eventWrapper = {};\n    this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this);\n\n    this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n    this.hook.trigger.addEventListener('mousedown.dl', this.eventWrapper.debounceKeydown);\n  },\n\n  destroy: function destroy() {\n    this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown);\n    this.hook.trigger.removeEventListener('mousedown.dl', this.eventWrapper.debounceKeydown);\n\n    var dynamicList = this.hook.list.list.querySelector('[data-dynamic]');\n    if (this.listTemplate && dynamicList) {\n      dynamicList.outerHTML = this.listTemplate;\n    }\n  }\n};\n\nexport default droplabFilter;\n\n\n\n// WEBPACK FOOTER //\n// ./src/plugins/filter/filter.js"],"sourceRoot":""} \ No newline at end of file diff --git a/app/assets/javascripts/droplab/plugins/input_setter.js b/app/assets/javascripts/droplab/plugins/input_setter.js deleted file mode 100644 index 2ee9a796634..00000000000 --- a/app/assets/javascripts/droplab/plugins/input_setter.js +++ /dev/null @@ -1,127 +0,0 @@ -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) -/******/ return installedModules[moduleId].exports; -/******/ -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // identity function for calling harmony imports with the correct context -/******/ __webpack_require__.i = function(value) { return value; }; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { -/******/ configurable: false, -/******/ enumerable: true, -/******/ get: getter -/******/ }); -/******/ } -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 8); -/******/ }) -/************************************************************************/ -/******/ ({ - -/***/ 8: -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -var droplabInputSetter = { - init: function init(hook) { - this.hook = hook; - this.config = hook.config.droplabInputSetter || (this.hook.config.droplabInputSetter = {}); - - this.eventWrapper = {}; - - this.addEvents(); - }, - addEvents: function addEvents() { - this.eventWrapper.setInputs = this.setInputs.bind(this); - this.hook.list.list.addEventListener('click.dl', this.eventWrapper.setInputs); - }, - removeEvents: function removeEvents() { - this.hook.list.list.removeEventListener('click.dl', this.eventWrapper.setInputs); - }, - setInputs: function setInputs(e) { - var _this = this; - - var selectedItem = e.detail.selected; - - if (!Array.isArray(this.config)) this.config = [this.config]; - - this.config.forEach(function (config) { - return _this.setInput(config, selectedItem); - }); - }, - setInput: function setInput(config, selectedItem) { - var input = config.input || this.hook.trigger; - var newValue = selectedItem.getAttribute(config.valueAttribute); - - if (input.tagName === 'INPUT') { - input.value = newValue; - } else { - input.textContent = newValue; - } - }, - destroy: function destroy() { - this.removeEvents(); - } -}; - -exports.default = droplabInputSetter; - -/***/ }) - -/******/ }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vd2VicGFjay9ib290c3RyYXAgOTMzZmY3ZDVlZDM5M2RjNjNiY2E/MGFiZioqKioqIiwid2VicGFjazovLy8uL3NyYy9wbHVnaW5zL2lucHV0X3NldHRlci9pbnB1dF9zZXR0ZXIuanM/NTY5NyJdLCJuYW1lcyI6WyJkcm9wbGFiSW5wdXRTZXR0ZXIiLCJpbml0IiwiaG9vayIsImNvbmZpZyIsImV2ZW50V3JhcHBlciIsImFkZEV2ZW50cyIsInNldElucHV0cyIsImJpbmQiLCJsaXN0IiwiYWRkRXZlbnRMaXN0ZW5lciIsInJlbW92ZUV2ZW50cyIsInJlbW92ZUV2ZW50TGlzdGVuZXIiLCJlIiwic2VsZWN0ZWRJdGVtIiwiZGV0YWlsIiwic2VsZWN0ZWQiLCJBcnJheSIsImlzQXJyYXkiLCJmb3JFYWNoIiwic2V0SW5wdXQiLCJpbnB1dCIsInRyaWdnZXIiLCJuZXdWYWx1ZSIsImdldEF0dHJpYnV0ZSIsInZhbHVlQXR0cmlidXRlIiwidGFnTmFtZSIsInZhbHVlIiwidGV4dENvbnRlbnQiLCJkZXN0cm95Il0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTs7QUFFQTtBQUNBOztBQUVBO0FBQ0E7QUFDQTs7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7O0FBRUE7QUFDQTs7QUFFQTtBQUNBOztBQUVBO0FBQ0E7QUFDQTs7O0FBR0E7QUFDQTs7QUFFQTtBQUNBOztBQUVBO0FBQ0EsbURBQTJDLGNBQWM7O0FBRXpEO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0EsYUFBSztBQUNMO0FBQ0E7O0FBRUE7QUFDQTtBQUNBO0FBQ0EsbUNBQTJCLDBCQUEwQixFQUFFO0FBQ3ZELHlDQUFpQyxlQUFlO0FBQ2hEO0FBQ0E7QUFDQTs7QUFFQTtBQUNBLDhEQUFzRCwrREFBK0Q7O0FBRXJIO0FBQ0E7O0FBRUE7QUFDQTs7Ozs7Ozs7Ozs7Ozs7QUNoRUEsSUFBTUEscUJBQXFCO0FBQ3pCQyxNQUR5QixnQkFDcEJDLElBRG9CLEVBQ2Q7QUFDVCxTQUFLQSxJQUFMLEdBQVlBLElBQVo7QUFDQSxTQUFLQyxNQUFMLEdBQWNELEtBQUtDLE1BQUwsQ0FBWUgsa0JBQVosS0FBbUMsS0FBS0UsSUFBTCxDQUFVQyxNQUFWLENBQWlCSCxrQkFBakIsR0FBc0MsRUFBekUsQ0FBZDs7QUFFQSxTQUFLSSxZQUFMLEdBQW9CLEVBQXBCOztBQUVBLFNBQUtDLFNBQUw7QUFDRCxHQVJ3QjtBQVV6QkEsV0FWeUIsdUJBVWI7QUFDVixTQUFLRCxZQUFMLENBQWtCRSxTQUFsQixHQUE4QixLQUFLQSxTQUFMLENBQWVDLElBQWYsQ0FBb0IsSUFBcEIsQ0FBOUI7QUFDQSxTQUFLTCxJQUFMLENBQVVNLElBQVYsQ0FBZUEsSUFBZixDQUFvQkMsZ0JBQXBCLENBQXFDLFVBQXJDLEVBQWlELEtBQUtMLFlBQUwsQ0FBa0JFLFNBQW5FO0FBQ0QsR0Fid0I7QUFlekJJLGNBZnlCLDBCQWVWO0FBQ2IsU0FBS1IsSUFBTCxDQUFVTSxJQUFWLENBQWVBLElBQWYsQ0FBb0JHLG1CQUFwQixDQUF3QyxVQUF4QyxFQUFvRCxLQUFLUCxZQUFMLENBQWtCRSxTQUF0RTtBQUNELEdBakJ3QjtBQW1CekJBLFdBbkJ5QixxQkFtQmZNLENBbkJlLEVBbUJaO0FBQUE7O0FBQ1gsUUFBTUMsZUFBZUQsRUFBRUUsTUFBRixDQUFTQyxRQUE5Qjs7QUFFQSxRQUFJLENBQUNDLE1BQU1DLE9BQU4sQ0FBYyxLQUFLZCxNQUFuQixDQUFMLEVBQWlDLEtBQUtBLE1BQUwsR0FBYyxDQUFDLEtBQUtBLE1BQU4sQ0FBZDs7QUFFakMsU0FBS0EsTUFBTCxDQUFZZSxPQUFaLENBQW9CO0FBQUEsYUFBVSxNQUFLQyxRQUFMLENBQWNoQixNQUFkLEVBQXNCVSxZQUF0QixDQUFWO0FBQUEsS0FBcEI7QUFDRCxHQXpCd0I7QUEyQnpCTSxVQTNCeUIsb0JBMkJoQmhCLE1BM0JnQixFQTJCUlUsWUEzQlEsRUEyQk07QUFDN0IsUUFBTU8sUUFBUWpCLE9BQU9pQixLQUFQLElBQWdCLEtBQUtsQixJQUFMLENBQVVtQixPQUF4QztBQUNBLFFBQU1DLFdBQVdULGFBQWFVLFlBQWIsQ0FBMEJwQixPQUFPcUIsY0FBakMsQ0FBakI7O0FBRUEsUUFBSUosTUFBTUssT0FBTixLQUFrQixPQUF0QixFQUErQjtBQUM3QkwsWUFBTU0sS0FBTixHQUFjSixRQUFkO0FBQ0QsS0FGRCxNQUVPO0FBQ0xGLFlBQU1PLFdBQU4sR0FBb0JMLFFBQXBCO0FBQ0Q7QUFDRixHQXBDd0I7QUFzQ3pCTSxTQXRDeUIscUJBc0NmO0FBQ1IsU0FBS2xCLFlBQUw7QUFDRDtBQXhDd0IsQ0FBM0I7O2tCQTJDZVYsa0IiLCJmaWxlIjoiLi9kaXN0L3BsdWdpbnMvaW5wdXRfc2V0dGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiIFx0Ly8gVGhlIG1vZHVsZSBjYWNoZVxuIFx0dmFyIGluc3RhbGxlZE1vZHVsZXMgPSB7fTtcblxuIFx0Ly8gVGhlIHJlcXVpcmUgZnVuY3Rpb25cbiBcdGZ1bmN0aW9uIF9fd2VicGFja19yZXF1aXJlX18obW9kdWxlSWQpIHtcblxuIFx0XHQvLyBDaGVjayBpZiBtb2R1bGUgaXMgaW4gY2FjaGVcbiBcdFx0aWYoaW5zdGFsbGVkTW9kdWxlc1ttb2R1bGVJZF0pXG4gXHRcdFx0cmV0dXJuIGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdLmV4cG9ydHM7XG5cbiBcdFx0Ly8gQ3JlYXRlIGEgbmV3IG1vZHVsZSAoYW5kIHB1dCBpdCBpbnRvIHRoZSBjYWNoZSlcbiBcdFx0dmFyIG1vZHVsZSA9IGluc3RhbGxlZE1vZHVsZXNbbW9kdWxlSWRdID0ge1xuIFx0XHRcdGk6IG1vZHVsZUlkLFxuIFx0XHRcdGw6IGZhbHNlLFxuIFx0XHRcdGV4cG9ydHM6IHt9XG4gXHRcdH07XG5cbiBcdFx0Ly8gRXhlY3V0ZSB0aGUgbW9kdWxlIGZ1bmN0aW9uXG4gXHRcdG1vZHVsZXNbbW9kdWxlSWRdLmNhbGwobW9kdWxlLmV4cG9ydHMsIG1vZHVsZSwgbW9kdWxlLmV4cG9ydHMsIF9fd2VicGFja19yZXF1aXJlX18pO1xuXG4gXHRcdC8vIEZsYWcgdGhlIG1vZHVsZSBhcyBsb2FkZWRcbiBcdFx0bW9kdWxlLmwgPSB0cnVlO1xuXG4gXHRcdC8vIFJldHVybiB0aGUgZXhwb3J0cyBvZiB0aGUgbW9kdWxlXG4gXHRcdHJldHVybiBtb2R1bGUuZXhwb3J0cztcbiBcdH1cblxuXG4gXHQvLyBleHBvc2UgdGhlIG1vZHVsZXMgb2JqZWN0IChfX3dlYnBhY2tfbW9kdWxlc19fKVxuIFx0X193ZWJwYWNrX3JlcXVpcmVfXy5tID0gbW9kdWxlcztcblxuIFx0Ly8gZXhwb3NlIHRoZSBtb2R1bGUgY2FjaGVcbiBcdF9fd2VicGFja19yZXF1aXJlX18uYyA9IGluc3RhbGxlZE1vZHVsZXM7XG5cbiBcdC8vIGlkZW50aXR5IGZ1bmN0aW9uIGZvciBjYWxsaW5nIGhhcm1vbnkgaW1wb3J0cyB3aXRoIHRoZSBjb3JyZWN0IGNvbnRleHRcbiBcdF9fd2VicGFja19yZXF1aXJlX18uaSA9IGZ1bmN0aW9uKHZhbHVlKSB7IHJldHVybiB2YWx1ZTsgfTtcblxuIFx0Ly8gZGVmaW5lIGdldHRlciBmdW5jdGlvbiBmb3IgaGFybW9ueSBleHBvcnRzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQgPSBmdW5jdGlvbihleHBvcnRzLCBuYW1lLCBnZXR0ZXIpIHtcbiBcdFx0aWYoIV9fd2VicGFja19yZXF1aXJlX18ubyhleHBvcnRzLCBuYW1lKSkge1xuIFx0XHRcdE9iamVjdC5kZWZpbmVQcm9wZXJ0eShleHBvcnRzLCBuYW1lLCB7XG4gXHRcdFx0XHRjb25maWd1cmFibGU6IGZhbHNlLFxuIFx0XHRcdFx0ZW51bWVyYWJsZTogdHJ1ZSxcbiBcdFx0XHRcdGdldDogZ2V0dGVyXG4gXHRcdFx0fSk7XG4gXHRcdH1cbiBcdH07XG5cbiBcdC8vIGdldERlZmF1bHRFeHBvcnQgZnVuY3Rpb24gZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBub24taGFybW9ueSBtb2R1bGVzXG4gXHRfX3dlYnBhY2tfcmVxdWlyZV9fLm4gPSBmdW5jdGlvbihtb2R1bGUpIHtcbiBcdFx0dmFyIGdldHRlciA9IG1vZHVsZSAmJiBtb2R1bGUuX19lc01vZHVsZSA/XG4gXHRcdFx0ZnVuY3Rpb24gZ2V0RGVmYXVsdCgpIHsgcmV0dXJuIG1vZHVsZVsnZGVmYXVsdCddOyB9IDpcbiBcdFx0XHRmdW5jdGlvbiBnZXRNb2R1bGVFeHBvcnRzKCkgeyByZXR1cm4gbW9kdWxlOyB9O1xuIFx0XHRfX3dlYnBhY2tfcmVxdWlyZV9fLmQoZ2V0dGVyLCAnYScsIGdldHRlcik7XG4gXHRcdHJldHVybiBnZXR0ZXI7XG4gXHR9O1xuXG4gXHQvLyBPYmplY3QucHJvdG90eXBlLmhhc093blByb3BlcnR5LmNhbGxcbiBcdF9fd2VicGFja19yZXF1aXJlX18ubyA9IGZ1bmN0aW9uKG9iamVjdCwgcHJvcGVydHkpIHsgcmV0dXJuIE9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbChvYmplY3QsIHByb3BlcnR5KTsgfTtcblxuIFx0Ly8gX193ZWJwYWNrX3B1YmxpY19wYXRoX19cbiBcdF9fd2VicGFja19yZXF1aXJlX18ucCA9IFwiXCI7XG5cbiBcdC8vIExvYWQgZW50cnkgbW9kdWxlIGFuZCByZXR1cm4gZXhwb3J0c1xuIFx0cmV0dXJuIF9fd2VicGFja19yZXF1aXJlX18oX193ZWJwYWNrX3JlcXVpcmVfXy5zID0gOCk7XG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gd2VicGFjay9ib290c3RyYXAgOTMzZmY3ZDVlZDM5M2RjNjNiY2EiLCJjb25zdCBkcm9wbGFiSW5wdXRTZXR0ZXIgPSB7XG4gIGluaXQoaG9vaykge1xuICAgIHRoaXMuaG9vayA9IGhvb2s7XG4gICAgdGhpcy5jb25maWcgPSBob29rLmNvbmZpZy5kcm9wbGFiSW5wdXRTZXR0ZXIgfHwgKHRoaXMuaG9vay5jb25maWcuZHJvcGxhYklucHV0U2V0dGVyID0ge30pO1xuXG4gICAgdGhpcy5ldmVudFdyYXBwZXIgPSB7fTtcblxuICAgIHRoaXMuYWRkRXZlbnRzKCk7XG4gIH0sXG5cbiAgYWRkRXZlbnRzKCkge1xuICAgIHRoaXMuZXZlbnRXcmFwcGVyLnNldElucHV0cyA9IHRoaXMuc2V0SW5wdXRzLmJpbmQodGhpcyk7XG4gICAgdGhpcy5ob29rLmxpc3QubGlzdC5hZGRFdmVudExpc3RlbmVyKCdjbGljay5kbCcsIHRoaXMuZXZlbnRXcmFwcGVyLnNldElucHV0cyk7XG4gIH0sXG5cbiAgcmVtb3ZlRXZlbnRzKCkge1xuICAgIHRoaXMuaG9vay5saXN0Lmxpc3QucmVtb3ZlRXZlbnRMaXN0ZW5lcignY2xpY2suZGwnLCB0aGlzLmV2ZW50V3JhcHBlci5zZXRJbnB1dHMpO1xuICB9LFxuXG4gIHNldElucHV0cyhlKSB7XG4gICAgY29uc3Qgc2VsZWN0ZWRJdGVtID0gZS5kZXRhaWwuc2VsZWN0ZWQ7XG5cbiAgICBpZiAoIUFycmF5LmlzQXJyYXkodGhpcy5jb25maWcpKSB0aGlzLmNvbmZpZyA9IFt0aGlzLmNvbmZpZ107XG5cbiAgICB0aGlzLmNvbmZpZy5mb3JFYWNoKGNvbmZpZyA9PiB0aGlzLnNldElucHV0KGNvbmZpZywgc2VsZWN0ZWRJdGVtKSk7XG4gIH0sXG5cbiAgc2V0SW5wdXQoY29uZmlnLCBzZWxlY3RlZEl0ZW0pIHtcbiAgICBjb25zdCBpbnB1dCA9IGNvbmZpZy5pbnB1dCB8fCB0aGlzLmhvb2sudHJpZ2dlcjtcbiAgICBjb25zdCBuZXdWYWx1ZSA9IHNlbGVjdGVkSXRlbS5nZXRBdHRyaWJ1dGUoY29uZmlnLnZhbHVlQXR0cmlidXRlKTtcblxuICAgIGlmIChpbnB1dC50YWdOYW1lID09PSAnSU5QVVQnKSB7XG4gICAgICBpbnB1dC52YWx1ZSA9IG5ld1ZhbHVlO1xuICAgIH0gZWxzZSB7XG4gICAgICBpbnB1dC50ZXh0Q29udGVudCA9IG5ld1ZhbHVlO1xuICAgIH1cbiAgfSxcblxuICBkZXN0cm95KCkge1xuICAgIHRoaXMucmVtb3ZlRXZlbnRzKCk7XG4gIH0sXG59O1xuXG5leHBvcnQgZGVmYXVsdCBkcm9wbGFiSW5wdXRTZXR0ZXI7XG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gLi9zcmMvcGx1Z2lucy9pbnB1dF9zZXR0ZXIvaW5wdXRfc2V0dGVyLmpzIl0sInNvdXJjZVJvb3QiOiIifQ== \ No newline at end of file diff --git a/app/assets/javascripts/filtered_search/dropdown_hint.js b/app/assets/javascripts/filtered_search/dropdown_hint.js index d3401dd0838..527037c08eb 100644 --- a/app/assets/javascripts/filtered_search/dropdown_hint.js +++ b/app/assets/javascripts/filtered_search/dropdown_hint.js @@ -1,4 +1,4 @@ -import droplabFilter from '../droplab/plugins/filter'; +import Filter from '@gitlab-org/droplab/dist/plugins/Filter'; require('./filtered_search_dropdown'); @@ -7,7 +7,7 @@ require('./filtered_search_dropdown'); constructor(droplab, dropdown, input, filter) { super(droplab, dropdown, input, filter); this.config = { - droplabFilter: { + Filter: { template: 'hint', filterFunction: gl.DropdownUtils.filterHint.bind(null, input), }, @@ -68,12 +68,12 @@ require('./filtered_search_dropdown'); } }); - this.droplab.changeHookList(this.hookId, this.dropdown, [droplabFilter], this.config); + this.droplab.changeHookList(this.hookId, this.dropdown, [Filter], this.config); this.droplab.setData(this.hookId, dropdownData); } init() { - this.droplab.addHook(this.input, this.dropdown, [droplabFilter], this.config).init(); + this.droplab.addHook(this.input, this.dropdown, [Filter], this.config).init(); } } diff --git a/app/assets/javascripts/filtered_search/dropdown_non_user.js b/app/assets/javascripts/filtered_search/dropdown_non_user.js index c30e673f8ba..48c2135aca3 100644 --- a/app/assets/javascripts/filtered_search/dropdown_non_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_non_user.js @@ -1,5 +1,5 @@ -import droplabAjax from '../droplab/plugins/ajax'; -import droplabFilter from '../droplab/plugins/filter'; +import Ajax from '@gitlab-org/droplab/dist/plugins/Ajax'; +import Filter from '@gitlab-org/droplab/dist/plugins/Filter'; require('./filtered_search_dropdown'); @@ -9,12 +9,12 @@ require('./filtered_search_dropdown'); super(droplab, dropdown, input, filter); this.symbol = symbol; this.config = { - droplabAjax: { + Ajax: { endpoint, method: 'setData', loadingTemplate: this.loadingTemplate, }, - droplabFilter: { + Filter: { filterFunction: gl.DropdownUtils.filterWithSymbol.bind(null, this.symbol, input), template: 'title', }, @@ -30,13 +30,13 @@ require('./filtered_search_dropdown'); renderContent(forceShowList = false) { this.droplab - .changeHookList(this.hookId, this.dropdown, [droplabAjax, droplabFilter], this.config); + .changeHookList(this.hookId, this.dropdown, [Ajax, Filter], this.config); super.renderContent(forceShowList); } init() { this.droplab - .addHook(this.input, this.dropdown, [droplabAjax, droplabFilter], this.config).init(); + .addHook(this.input, this.dropdown, [Ajax, Filter], this.config).init(); } } diff --git a/app/assets/javascripts/filtered_search/dropdown_user.js b/app/assets/javascripts/filtered_search/dropdown_user.js index fe95ccb41f8..1661a4c5da2 100644 --- a/app/assets/javascripts/filtered_search/dropdown_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_user.js @@ -1,4 +1,4 @@ -import droplabAjaxFilter from '../droplab/plugins/ajax_filter'; +import AjaxFilter from '@gitlab-org/droplab/dist/plugins/AjaxFilter'; require('./filtered_search_dropdown'); @@ -7,7 +7,7 @@ require('./filtered_search_dropdown'); constructor(droplab, dropdown, input, filter) { super(droplab, dropdown, input, filter); this.config = { - droplabAjaxFilter: { + AjaxFilter: { endpoint: `${gon.relative_url_root || ''}/autocomplete/users.json`, searchKey: 'search', params: { @@ -28,7 +28,7 @@ require('./filtered_search_dropdown'); } renderContent(forceShowList = false) { - this.droplab.changeHookList(this.hookId, this.dropdown, [droplabAjaxFilter], this.config); + this.droplab.changeHookList(this.hookId, this.dropdown, [AjaxFilter], this.config); super.renderContent(forceShowList); } @@ -56,7 +56,7 @@ require('./filtered_search_dropdown'); } init() { - this.droplab.addHook(this.input, this.dropdown, [droplabAjaxFilter], this.config).init(); + this.droplab.addHook(this.input, this.dropdown, [AjaxFilter], this.config).init(); } } diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js index 29aa4c1bb44..f5d6a85a4da 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js +++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js @@ -1,4 +1,4 @@ -import DropLab from '../droplab/droplab'; +import DropLab from '@gitlab-org/droplab'; import FilteredSearchContainer from './container'; (() => { diff --git a/yarn.lock b/yarn.lock index 65eef75af1a..4faec0e57d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14,8 +14,8 @@ accepts@1.3.3, accepts@~1.3.3: negotiator "0.6.1" acorn-dynamic-import@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz#23f671eb6e650dab277fef477c321b1178a8cca2" + version "2.0.2" + resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4" dependencies: acorn "^4.0.3" @@ -25,7 +25,7 @@ acorn-jsx@^3.0.0: dependencies: acorn "^3.0.4" -acorn@4.0.4, acorn@^4.0.4: +acorn@4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a" @@ -33,7 +33,7 @@ acorn@^3.0.4: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" -acorn@^4.0.11, acorn@^4.0.3: +acorn@^4.0.11, acorn@^4.0.3, acorn@^4.0.4: version "4.0.11" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0" @@ -45,9 +45,9 @@ ajv-keywords@^1.0.0, ajv-keywords@^1.1.1: version "1.5.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c" -ajv@^4.7.0: - version "4.11.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.2.tgz#f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6" +ajv@^4.7.0, ajv@^4.9.1: + version "4.11.5" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd" dependencies: co "^4.6.0" json-stable-stringify "^1.0.1" @@ -94,8 +94,8 @@ append-transform@^0.4.0: default-require-extensions "^1.0.0" aproba@^1.0.3: - version "1.1.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.0.tgz#4d8f047a318604e18e3c06a0e52230d3d19f147b" + version "1.1.1" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab" are-we-there-yet@~1.1.2: version "1.1.2" @@ -166,14 +166,14 @@ asn1@~0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + assert-plus@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" -assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - assert@^1.1.1: version "1.4.1" resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" @@ -184,7 +184,7 @@ async-each@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" -async@0.2.x, async@~0.2.6: +async@0.2.x: version "0.2.10" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" @@ -193,8 +193,8 @@ async@1.x, async@^1.4.0, async@^1.4.2, async@^1.5.2: resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" async@^2.1.2, async@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4" + version "2.2.0" + resolved "https://registry.yarnpkg.com/async/-/async-2.2.0.tgz#c324eba010a237e4fbd55a12dee86367d5c0ef32" dependencies: lodash "^4.14.0" @@ -222,15 +222,15 @@ babel-code-frame@^6.16.0, babel-code-frame@^6.22.0: esutils "^2.0.2" js-tokens "^3.0.0" -babel-core@^6.22.1, babel-core@^6.23.0: - version "6.23.1" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.23.1.tgz#c143cb621bb2f621710c220c5d579d15b8a442df" +babel-core@^6.22.1, babel-core@^6.24.0: + version "6.24.0" + resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.0.tgz#8f36a0a77f5c155aed6f920b844d23ba56742a02" dependencies: babel-code-frame "^6.22.0" - babel-generator "^6.23.0" + babel-generator "^6.24.0" babel-helpers "^6.23.0" babel-messages "^6.23.0" - babel-register "^6.23.0" + babel-register "^6.24.0" babel-runtime "^6.22.0" babel-template "^6.23.0" babel-traverse "^6.23.1" @@ -246,9 +246,9 @@ babel-core@^6.22.1, babel-core@^6.23.0: slash "^1.0.0" source-map "^0.5.0" -babel-generator@^6.18.0, babel-generator@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.23.0.tgz#6b8edab956ef3116f79d8c84c5a3c05f32a74bc5" +babel-generator@^6.18.0, babel-generator@^6.24.0: + version "6.24.0" + resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56" dependencies: babel-messages "^6.23.0" babel-runtime "^6.22.0" @@ -378,11 +378,11 @@ babel-helpers@^6.23.0: babel-template "^6.23.0" babel-loader@^6.2.10: - version "6.2.10" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.2.10.tgz#adefc2b242320cd5d15e65b31cea0e8b1b02d4b0" + version "6.4.1" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca" dependencies: find-cache-dir "^0.1.1" - loader-utils "^0.2.11" + loader-utils "^0.2.16" mkdirp "^0.5.1" object-assign "^4.0.1" @@ -399,12 +399,12 @@ babel-plugin-check-es2015-constants@^6.22.0: babel-runtime "^6.22.0" babel-plugin-istanbul@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.0.0.tgz#36bde8fbef4837e5ff0366531a2beabd7b1ffa10" + version "4.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.1.tgz#c12de0fc6fe42adfb16be56f1ad11e4a9782eca9" dependencies: find-up "^2.1.0" - istanbul-lib-instrument "^1.4.2" - test-exclude "^4.0.0" + istanbul-lib-instrument "^1.6.2" + test-exclude "^4.0.3" babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" @@ -745,11 +745,11 @@ babel-preset-stage-3@^6.22.0: babel-plugin-transform-exponentiation-operator "^6.22.0" babel-plugin-transform-object-rest-spread "^6.22.0" -babel-register@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.23.0.tgz#c9aa3d4cca94b51da34826c4a0f9e08145d74ff3" +babel-register@^6.24.0: + version "6.24.0" + resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.0.tgz#5e89f8463ba9970356d02eb07dabe3308b080cfd" dependencies: - babel-core "^6.23.0" + babel-core "^6.24.0" babel-runtime "^6.22.0" core-js "^2.4.0" home-or-tmp "^2.0.0" @@ -758,8 +758,8 @@ babel-register@^6.23.0: source-map-support "^0.4.2" babel-runtime@^6.18.0, babel-runtime@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611" + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b" dependencies: core-js "^2.4.0" regenerator-runtime "^0.10.0" @@ -798,8 +798,8 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23 to-fast-properties "^1.0.1" babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0: - version "6.15.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e" + version "6.16.1" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3" backo2@1.0.2: version "1.0.2" @@ -856,25 +856,25 @@ block-stream@*: inherits "~2.0.0" bluebird@^3.3.0: - version "3.4.7" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" + version "3.5.0" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.6" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215" -body-parser@^1.12.4: - version "1.16.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.16.0.tgz#924a5e472c6229fb9d69b85a20d5f2532dec788b" +body-parser@^1.16.1: + version "1.17.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.17.1.tgz#75b3bc98ddd6e7e0d8ffe750dfaca5c66993fa47" dependencies: bytes "2.4.0" content-type "~1.0.2" - debug "2.6.0" + debug "2.6.1" depd "~1.1.0" - http-errors "~1.5.1" + http-errors "~1.6.1" iconv-lite "0.4.15" on-finished "~2.3.0" - qs "6.2.1" + qs "6.4.0" raw-body "~2.2.0" type-is "~1.6.14" @@ -885,8 +885,8 @@ boom@2.x.x: hoek "2.x.x" bootstrap-sass@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.6.tgz#363b0d300e868d3e70134c1a742bb17288444fd1" + version "3.3.7" + resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz#6596c7ab40f6637393323ab0bc80d064fc630498" brace-expansion@^1.0.0: version "1.1.6" @@ -910,8 +910,8 @@ braces@^1.8.2: repeat-element "^1.1.2" brorand@^1.0.1: - version "1.0.7" - resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.0.7.tgz#6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc" + version "1.1.0" + resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.0.6" @@ -1022,6 +1022,10 @@ caseless@~0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7" +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + center-align@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" @@ -1145,10 +1149,10 @@ component-inherit@0.0.3: resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" compressible@~2.0.8: - version "2.0.9" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.9.tgz#6daab4e2b599c2770dd9e21e7a891b1c5a755425" + version "2.0.10" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd" dependencies: - mime-db ">= 1.24.0 < 2" + mime-db ">= 1.27.0 < 2" compression-webpack-plugin@^0.3.2: version "0.3.2" @@ -1182,7 +1186,7 @@ concat-stream@1.5.0: readable-stream "~2.0.0" typedarray "~0.0.5" -concat-stream@^1.4.6: +concat-stream@^1.5.2: version "1.6.0" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" dependencies: @@ -1194,12 +1198,12 @@ connect-history-api-fallback@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169" -connect@^3.3.5: - version "3.5.0" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.5.0.tgz#b357525a0b4c1f50599cd983e1d9efeea9677198" +connect@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.0.tgz#f09a4f7dcd17324b663b725c815bdb1c4158a46e" dependencies: - debug "~2.2.0" - finalhandler "0.5.0" + debug "2.6.1" + finalhandler "1.0.0" parseurl "~1.3.1" utils-merge "1.0.0" @@ -1230,8 +1234,8 @@ content-type@~1.0.2: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed" convert-source-map@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.3.0.tgz#e9f3e9c6e2728efc2676696a70eb382f73106a67" + version "1.4.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.4.0.tgz#e3dad195bf61bfe13a7a3c73e9876ec14a0268f3" cookie-signature@1.0.6: version "1.0.6" @@ -1297,19 +1301,23 @@ crypto-browserify@^3.11.0: public-encrypt "^4.0.0" randombytes "^2.0.0" +custom-event-polyfill@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/custom-event-polyfill/-/custom-event-polyfill-0.3.0.tgz#99807839be62edb446b645832e0d80ead6fa1888" + custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" d3@^3.5.11: - version "3.5.11" - resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.11.tgz#d130750eed0554db70e8432102f920a12407b69c" + version "3.5.17" + resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8" -d@^0.1.1, d@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309" +d@1: + version "1.0.0" + resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" dependencies: - es5-ext "~0.10.2" + es5-ext "^0.10.9" dashdash@^1.12.0: version "1.14.1" @@ -1337,9 +1345,15 @@ debug@2.3.3: dependencies: ms "0.7.2" -debug@2.6.0, debug@^2.1.1, debug@^2.2.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b" +debug@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351" + dependencies: + ms "0.7.2" + +debug@2.6.3, debug@^2.1.1, debug@^2.2.0: + version "2.6.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d" dependencies: ms "0.7.2" @@ -1387,7 +1401,7 @@ delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" -depd@~1.1.0: +depd@1.1.0, depd@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3" @@ -1420,16 +1434,23 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -doctrine@1.5.0, doctrine@^1.2.2: +doctrine@1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" dependencies: esutils "^2.0.2" isarray "^1.0.0" +doctrine@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63" + dependencies: + esutils "^2.0.2" + isarray "^1.0.0" + document-register-element@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.3.0.tgz#fb3babb523c74662be47be19c6bc33e71990d940" + version "1.4.1" + resolved "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.4.1.tgz#22b41e96fb86cccab2fa30f7d2a8d62ac7be8c57" dom-serialize@^2.2.0: version "2.2.1" @@ -1444,9 +1465,14 @@ domain-browser@^1.1.1: version "1.1.7" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" +"droplab@file:../../../DropLab": + version "0.1.1" + dependencies: + custom-event-polyfill "^0.3.0" + dropzone@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-4.2.0.tgz#fbe7acbb9918e0706489072ef663effeef8a79f3" + version "4.3.0" + resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-4.3.0.tgz#48b0b8f2ad092872e4b535b672a7c3f1a1d67c91" duplexer@^0.1.1: version "0.1.1" @@ -1467,13 +1493,16 @@ ejs@^2.5.5: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88" elliptic@^6.0.0: - version "6.3.3" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.3.tgz#5482d9646d54bcb89fd7d994fc9e2e9568876e3f" + version "6.4.0" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df" dependencies: bn.js "^4.4.0" brorand "^1.0.1" hash.js "^1.0.0" + hmac-drbg "^1.0.0" inherits "^2.0.1" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.0" emoji-unicode-version@^0.2.1: version "0.2.1" @@ -1487,9 +1516,9 @@ encodeurl@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20" -engine.io-client@1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.2.tgz#c38767547f2a7d184f5752f6f0ad501006703766" +engine.io-client@1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.3.tgz#1798ed93451246453d4c6f635d7a201fe940d5ab" dependencies: component-emitter "1.2.1" component-inherit "0.0.3" @@ -1500,7 +1529,7 @@ engine.io-client@1.8.2: parsejson "0.0.3" parseqs "0.0.5" parseuri "0.0.5" - ws "1.1.1" + ws "1.1.2" xmlhttprequest-ssl "1.5.3" yeast "0.1.2" @@ -1515,16 +1544,16 @@ engine.io-parser@1.3.2: has-binary "0.1.7" wtf-8 "1.0.0" -engine.io@1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.2.tgz#6b59be730b348c0125b0a4589de1c355abcf7a7e" +engine.io@1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.3.tgz#8de7f97895d20d39b85f88eeee777b2bd42b13d4" dependencies: accepts "1.3.3" base64id "1.0.0" cookie "0.3.1" debug "2.3.3" engine.io-parser "1.3.2" - ws "1.1.1" + ws "1.1.2" enhanced-resolve@^3.0.0: version "3.1.0" @@ -1554,36 +1583,36 @@ errno@^0.1.3: prr "~0.0.0" error-ex@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.0.tgz#e67b43f3e82c96ea3a584ffee0b9fc3325d802d9" + version "1.3.1" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" dependencies: is-arrayish "^0.2.1" -es5-ext@^0.10.7, es5-ext@^0.10.8, es5-ext@~0.10.11, es5-ext@~0.10.2, es5-ext@~0.10.7: - version "0.10.12" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.12.tgz#aa84641d4db76b62abba5e45fd805ecbab140047" +es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14: + version "0.10.15" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.15.tgz#c330a5934c1ee21284a7c081a86e5fd937c91ea6" dependencies: es6-iterator "2" es6-symbol "~3.1" -es6-iterator@2: - version "2.0.0" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.0.tgz#bd968567d61635e33c0b80727613c9cb4b096bac" +es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512" dependencies: - d "^0.1.1" - es5-ext "^0.10.7" - es6-symbol "3" + d "1" + es5-ext "^0.10.14" + es6-symbol "^3.1" es6-map@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.4.tgz#a34b147be224773a4d7da8072794cefa3632b897" + version "0.1.5" + resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0" dependencies: - d "~0.1.1" - es5-ext "~0.10.11" - es6-iterator "2" - es6-set "~0.1.3" - es6-symbol "~3.1.0" - event-emitter "~0.3.4" + d "1" + es5-ext "~0.10.14" + es6-iterator "~2.0.1" + es6-set "~0.1.5" + es6-symbol "~3.1.1" + event-emitter "~0.3.5" es6-promise@~3.0.2: version "3.0.2" @@ -1593,31 +1622,31 @@ es6-promise@~4.0.3: version "4.0.5" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42" -es6-set@~0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.4.tgz#9516b6761c2964b92ff479456233a247dc707ce8" +es6-set@~0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1" dependencies: - d "~0.1.1" - es5-ext "~0.10.11" - es6-iterator "2" - es6-symbol "3" - event-emitter "~0.3.4" + d "1" + es5-ext "~0.10.14" + es6-iterator "~2.0.1" + es6-symbol "3.1.1" + event-emitter "~0.3.5" -es6-symbol@3, es6-symbol@~3.1, es6-symbol@~3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa" +es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" dependencies: - d "~0.1.1" - es5-ext "~0.10.11" + d "1" + es5-ext "~0.10.14" es6-weak-map@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.1.tgz#0d2bbd8827eb5fb4ba8f97fbfea50d43db21ea81" + version "2.0.2" + resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f" dependencies: - d "^0.1.1" - es5-ext "^0.10.8" - es6-iterator "2" - es6-symbol "3" + d "1" + es5-ext "^0.10.14" + es6-iterator "^2.0.1" + es6-symbol "^3.1.1" escape-html@~1.0.3: version "1.0.3" @@ -1710,16 +1739,17 @@ eslint-plugin-jasmine@^2.1.0: resolved "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.2.0.tgz#7135879383c39a667c721d302b9f20f0389543de" eslint@^3.10.1: - version "3.15.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.15.0.tgz#bdcc6a6c5ffe08160e7b93c066695362a91e30f2" + version "3.18.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.18.0.tgz#647e985c4ae71502d20ac62c109f66d5104c8a4b" dependencies: babel-code-frame "^6.16.0" chalk "^1.1.3" - concat-stream "^1.4.6" + concat-stream "^1.5.2" debug "^2.1.1" - doctrine "^1.2.2" + doctrine "^2.0.0" escope "^3.6.0" espree "^3.4.0" + esquery "^1.0.0" estraverse "^4.2.0" esutils "^2.0.2" file-entry-cache "^2.0.0" @@ -1763,6 +1793,12 @@ esprima@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" +esquery@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa" + dependencies: + estraverse "^4.0.0" + esrecurse@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220" @@ -1774,7 +1810,7 @@ estraverse@^1.9.1: version "1.9.3" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44" -estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -1786,20 +1822,20 @@ esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" -etag@~1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.7.0.tgz#03d30b5f67dd6e632d2945d30d6652731a34d5d8" +etag@~1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.0.tgz#6f631aef336d6c46362b51764044ce216be3c051" eve-raphael@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz#17c754b792beef3fa6684d79cf5a47c63c4cda30" -event-emitter@~0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.4.tgz#8d63ddfb4cfe1fae3b32ca265c4c720222080bb5" +event-emitter@~0.3.5: + version "0.3.5" + resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" dependencies: - d "~0.1.1" - es5-ext "~0.10.7" + d "1" + es5-ext "~0.10.14" eventemitter3@1.x.x: version "1.2.0" @@ -1809,7 +1845,7 @@ events@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" -eventsource@~0.1.6: +eventsource@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232" dependencies: @@ -1853,8 +1889,8 @@ expand-range@^1.8.1: fill-range "^2.1.0" express@^4.13.3, express@^4.14.1: - version "4.14.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.14.1.tgz#646c237f766f148c2120aff073817b9e4d7e0d33" + version "4.15.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.15.2.tgz#af107fc148504457f2dca9a6f2571d7129b97b35" dependencies: accepts "~1.3.3" array-flatten "1.1.1" @@ -1862,23 +1898,25 @@ express@^4.13.3, express@^4.14.1: content-type "~1.0.2" cookie "0.3.1" cookie-signature "1.0.6" - debug "~2.2.0" + debug "2.6.1" depd "~1.1.0" encodeurl "~1.0.1" escape-html "~1.0.3" - etag "~1.7.0" - finalhandler "0.5.1" - fresh "0.3.0" + etag "~1.8.0" + finalhandler "~1.0.0" + fresh "0.5.0" merge-descriptors "1.0.1" methods "~1.1.2" on-finished "~2.3.0" parseurl "~1.3.1" path-to-regexp "0.1.7" proxy-addr "~1.1.3" - qs "6.2.0" + qs "6.4.0" range-parser "~1.2.0" - send "0.14.2" - serve-static "~1.11.2" + send "0.15.1" + serve-static "1.12.1" + setprototypeof "1.0.3" + statuses "~1.3.1" type-is "~1.6.14" utils-merge "1.0.0" vary "~1.1.0" @@ -1960,8 +1998,8 @@ fileset@^2.0.2: minimatch "^3.0.3" filesize@^3.5.4: - version "3.5.4" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.4.tgz#742fc7fb6aef4ee3878682600c22f840731e1fda" + version "3.5.6" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a" fill-range@^2.1.0: version "2.2.3" @@ -1973,23 +2011,27 @@ fill-range@^2.1.0: repeat-element "^1.1.2" repeat-string "^1.5.2" -finalhandler@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.0.tgz#e9508abece9b6dba871a6942a1d7911b91911ac7" +finalhandler@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.0.tgz#b5691c2c0912092f18ac23e9416bde5cd7dc6755" dependencies: - debug "~2.2.0" + debug "2.6.1" + encodeurl "~1.0.1" escape-html "~1.0.3" on-finished "~2.3.0" - statuses "~1.3.0" + parseurl "~1.3.1" + statuses "~1.3.1" unpipe "~1.0.0" -finalhandler@0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.1.tgz#2c400d8d4530935bc232549c5fa385ec07de6fcd" +finalhandler@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.1.tgz#bcd15d1689c0e5ed729b6f7f541a6df984117db8" dependencies: - debug "~2.2.0" + debug "2.6.3" + encodeurl "~1.0.1" escape-html "~1.0.3" on-finished "~2.3.0" + parseurl "~1.3.1" statuses "~1.3.1" unpipe "~1.0.0" @@ -2027,15 +2069,15 @@ flat-cache@^1.2.1: graceful-fs "^4.1.2" write "^0.2.1" -for-in@^0.1.5: - version "0.1.6" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.6.tgz#c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8" +for-in@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" for-own@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.4.tgz#0149b41a39088c7515f51ebe1c1386d45f935072" + version "0.1.5" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" dependencies: - for-in "^0.1.5" + for-in "^1.0.1" forever-agent@~0.6.1: version "0.6.1" @@ -2053,9 +2095,9 @@ forwarded@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363" -fresh@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f" +fresh@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e" fs-extra@~1.0.0: version "1.0.0" @@ -2070,13 +2112,13 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.0.0: - version "1.0.17" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.17.tgz#8537f3f12272678765b4fd6528c0f1f66f8f4558" + version "1.1.1" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff" dependencies: nan "^2.3.0" node-pre-gyp "^0.6.29" -fstream-ignore@~1.0.5: +fstream-ignore@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" dependencies: @@ -2084,9 +2126,9 @@ fstream-ignore@~1.0.5: inherits "2" minimatch "^3.0.0" -fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.10.tgz#604e8a92fe26ffd9f6fae30399d4984e1ab22822" +fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: + version "1.0.11" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" dependencies: graceful-fs "^4.1.2" inherits "~2.0.0" @@ -2098,8 +2140,8 @@ function-bind@^1.0.2: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771" gauge@~2.7.1: - version "2.7.2" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.2.tgz#15cecc31b02d05345a5d6b0e171cdb3ad2307774" + version "2.7.3" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.3.tgz#1c23855f962f17b3ad3d0dc7443f304542edfe09" dependencies: aproba "^1.0.3" console-control-strings "^1.0.0" @@ -2108,7 +2150,6 @@ gauge@~2.7.1: signal-exit "^3.0.0" string-width "^1.0.1" strip-ansi "^3.0.1" - supports-color "^0.2.0" wide-align "^1.1.0" generate-function@^2.0.0: @@ -2166,8 +2207,8 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1: path-is-absolute "^1.0.0" globals@^9.0.0, globals@^9.14.0: - version "9.14.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034" + version "9.17.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286" globby@^5.0.0: version "5.0.0" @@ -2208,6 +2249,10 @@ handlebars@^4.0.1, handlebars@^4.0.3: optionalDependencies: uglify-js "^2.6" +har-schema@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" + har-validator@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d" @@ -2217,6 +2262,13 @@ har-validator@~2.0.6: is-my-json-valid "^2.12.4" pinkie-promise "^2.0.0" +har-validator@~4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" + dependencies: + ajv "^4.9.1" + har-schema "^1.0.5" + has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" @@ -2247,7 +2299,7 @@ has@^1.0.1: dependencies: function-bind "^1.0.2" -hash.js@^1.0.0: +hash.js@^1.0.0, hash.js@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573" dependencies: @@ -2269,6 +2321,14 @@ hawk@~3.1.3: hoek "2.x.x" sntp "1.x.x" +hmac-drbg@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.0.tgz#3db471f45aae4a994a0688322171f51b8b91bee5" + dependencies: + hash.js "^1.0.3" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.1" + hoek@2.x.x: version "2.16.3" resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" @@ -2281,8 +2341,8 @@ home-or-tmp@^2.0.0: os-tmpdir "^1.0.1" hosted-git-info@^2.1.4: - version "2.2.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.2.0.tgz#7a0d097863d886c0fabbdcd37bf1758d8becf8a5" + version "2.4.1" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.1.tgz#4b0445e41c004a8bd1337773a4ff790ca40318c8" hpack.js@^2.1.6: version "2.1.6" @@ -2301,7 +2361,7 @@ http-deceiver@^1.2.4: version "1.2.7" resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" -http-errors@~1.5.0, http-errors@~1.5.1: +http-errors@~1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750" dependencies: @@ -2309,9 +2369,18 @@ http-errors@~1.5.0, http-errors@~1.5.1: setprototypeof "1.0.2" statuses ">= 1.3.1 < 2" -http-proxy-middleware@~0.17.1: - version "0.17.3" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz#940382147149b856084f5534752d5b5a8168cd1d" +http-errors@~1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.1.tgz#5f8b8ed98aca545656bf572997387f904a722257" + dependencies: + depd "1.1.0" + inherits "2.0.3" + setprototypeof "1.0.3" + statuses ">= 1.3.1 < 2" + +http-proxy-middleware@~0.17.4: + version "0.17.4" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833" dependencies: http-proxy "^1.16.2" is-glob "^3.1.0" @@ -2346,8 +2415,8 @@ ieee754@^1.1.4: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" ignore@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.2.tgz#1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410" + version "3.2.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.6.tgz#26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c" immediate@~3.0.5: version "3.0.6" @@ -2412,9 +2481,9 @@ invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" -ipaddr.js@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.2.0.tgz#8aba49c9192799585bdd643e0ccb50e8ae777ba4" +ipaddr.js@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec" is-absolute@^0.2.3: version "0.2.6" @@ -2434,8 +2503,8 @@ is-binary-path@^1.0.0: binary-extensions "^1.0.0" is-buffer@^1.0.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b" + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc" is-builtin-module@^1.0.0: version "1.0.0" @@ -2494,8 +2563,8 @@ is-glob@^3.1.0: is-extglob "^2.1.0" is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4: - version "2.15.0" - resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz#936edda3ca3c211fd98f3b2d3e08da43f7b2915b" + version "2.16.0" + resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693" dependencies: generate-function "^2.0.0" generate-object-property "^1.1.0" @@ -2586,9 +2655,9 @@ isbinaryfile@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621" -isexe@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0" +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" isobject@^2.0.0: version "2.1.0" @@ -2601,14 +2670,14 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" istanbul-api@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.1.tgz#d36e2f1560d1a43ce304c4ff7338182de61c8f73" + version "1.1.6" + resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.6.tgz#23aa5b5b9b1b3bdbb786f039160e91acbe495433" dependencies: async "^2.1.4" fileset "^2.0.2" istanbul-lib-coverage "^1.0.0" - istanbul-lib-hook "^1.0.0" - istanbul-lib-instrument "^1.3.0" + istanbul-lib-hook "^1.0.4" + istanbul-lib-instrument "^1.6.2" istanbul-lib-report "^1.0.0-alpha.3" istanbul-lib-source-maps "^1.1.0" istanbul-reports "^1.0.0" @@ -2620,15 +2689,15 @@ istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.0-alpha, istanbul-lib-c version "1.0.1" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.1.tgz#f263efb519c051c5f1f3343034fc40e7b43ff212" -istanbul-lib-hook@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.0.tgz#fc5367ee27f59268e8f060b0c7aaf051d9c425c5" +istanbul-lib-hook@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.4.tgz#1919debbc195807880041971caf9c7e2be2144d6" dependencies: append-transform "^0.4.0" -istanbul-lib-instrument@^1.3.0, istanbul-lib-instrument@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.4.2.tgz#0e2fdfac93c1dabf2e31578637dc78a19089f43e" +istanbul-lib-instrument@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.6.2.tgz#dac644f358f51efd6113536d7070959a0111f73b" dependencies: babel-generator "^6.18.0" babel-template "^6.16.0" @@ -2698,14 +2767,14 @@ jodid25519@^1.0.0: jsbn "~0.1.0" jquery-ujs@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.1.tgz#6ee75b1ef4e9ac95e7124f8d71f7d351f5548e92" + version "1.2.2" + resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.2.tgz#6a8ef1020e6b6dda385b90a4bddc128c21c56397" dependencies: jquery ">=1.8.0" jquery@>=1.8.0, jquery@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.1.tgz#3c3e16854ad3d2ac44ac65021b17426d22ad803f" + version "2.2.4" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02" js-cookie@^2.1.3: version "2.1.3" @@ -2716,15 +2785,15 @@ js-tokens@^3.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7" js-yaml@3.x, js-yaml@^3.5.1, js-yaml@^3.7.0: - version "3.8.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.1.tgz#782ba50200be7b9e5a8537001b7804db3ad02628" + version "3.8.2" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721" dependencies: argparse "^1.0.7" esprima "^3.1.1" jsbn@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd" + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" jsesc@^1.3.0: version "1.3.0" @@ -2775,9 +2844,10 @@ jsonpointer@^4.0.0: resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" jsprim@^1.2.2: - version "1.3.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.3.1.tgz#2a7256f70412a29ee3670aaca625994c4dcff252" + version "1.4.0" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918" dependencies: + assert-plus "1.0.0" extsprintf "1.0.2" json-schema "0.2.3" verror "1.3.6" @@ -2797,8 +2867,8 @@ jszip@^3.1.3: readable-stream "~2.0.6" karma-coverage-istanbul-reporter@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-0.2.0.tgz#5766263338adeb0026f7e4ac7a89a5f056c5642c" + version "0.2.3" + resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-0.2.3.tgz#11f1be9cfa93755a77bac39ab16e315a7100b5c5" dependencies: istanbul-api "^1.1.1" @@ -2807,14 +2877,14 @@ karma-jasmine@^1.1.0: resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf" karma-mocha-reporter@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.2.tgz#876de9a287244e54a608591732a98e66611f6abe" + version "2.2.3" + resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.3.tgz#04fdda45a1d9697a73871c7472223c581701ab20" dependencies: chalk "1.1.3" karma-phantomjs-launcher@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.2.tgz#19e1041498fd75563ed86730a22c1fe579fa8fb1" + version "1.0.4" + resolved "https://registry.yarnpkg.com/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz#d23ca34801bda9863ad318e3bb4bd4062b13acd2" dependencies: lodash "^4.0.1" phantomjs-prebuilt "^2.1.7" @@ -2826,8 +2896,8 @@ karma-sourcemap-loader@^0.3.7: graceful-fs "^4.1.2" karma-webpack@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.2.tgz#bd38350af5645c9644090770939ebe7ce726f864" + version "2.0.3" + resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.3.tgz#39cebf5ca2580139b27f9ae69b78816b9c82fae6" dependencies: async "~0.9.0" loader-utils "^0.2.5" @@ -2836,15 +2906,15 @@ karma-webpack@^2.0.2: webpack-dev-middleware "^1.0.11" karma@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/karma/-/karma-1.4.1.tgz#41981a71d54237606b0a3ea8c58c90773f41650e" + version "1.5.0" + resolved "https://registry.yarnpkg.com/karma/-/karma-1.5.0.tgz#9c4c14f0400bef2c04c8e8e6bff59371025cc009" dependencies: bluebird "^3.3.0" - body-parser "^1.12.4" + body-parser "^1.16.1" chokidar "^1.4.1" colors "^1.1.0" combine-lists "^1.0.0" - connect "^3.3.5" + connect "^3.6.0" core-js "^2.2.0" di "^0.0.1" dom-serialize "^2.2.0" @@ -2860,12 +2930,12 @@ karma@^1.4.1: optimist "^0.6.1" qjobs "^1.1.4" range-parser "^1.2.0" - rimraf "^2.3.3" + rimraf "^2.6.0" safe-buffer "^5.0.1" - socket.io "1.7.2" + socket.io "1.7.3" source-map "^0.5.3" - tmp "0.0.28" - useragent "^2.1.10" + tmp "0.0.31" + useragent "^2.1.12" kew@~0.7.0: version "0.7.0" @@ -2920,9 +2990,9 @@ loader-runner@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" -loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.5: - version "0.2.16" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d" +loader-utils@^0.2.16, loader-utils@^0.2.5: + version "0.2.17" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" dependencies: big.js "^3.1.3" emojis-list "^2.0.0" @@ -3084,15 +3154,15 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -"mime-db@>= 1.24.0 < 2", mime-db@~1.26.0: - version "1.26.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.26.0.tgz#eaffcd0e4fc6935cf8134da246e2e6c35305adff" +"mime-db@>= 1.27.0 < 2", mime-db@~1.27.0: + version "1.27.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1" mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7: - version "2.1.14" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.14.tgz#f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee" + version "2.1.15" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed" dependencies: - mime-db "~1.26.0" + mime-db "~1.27.0" mime@1.3.4, mime@^1.3.4: version "1.3.4" @@ -3102,6 +3172,10 @@ minimalistic-assert@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" +minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" + "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" @@ -3122,19 +3196,19 @@ mkdirp@0.5.0: dependencies: minimist "0.0.8" -mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: +mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: minimist "0.0.8" moment@2.x: - version "2.17.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82" + version "2.18.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f" mousetrap@^1.4.6: - version "1.4.6" - resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.4.6.tgz#eaca72e22e56d5b769b7555873b688c3332e390a" + version "1.6.0" + resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.0.tgz#0168fcabb11d07669e87490324c981208121ac4d" ms@0.7.1: version "0.7.1" @@ -3217,18 +3291,18 @@ node-libs-browser@^2.0.0: vm-browserify "0.0.4" node-pre-gyp@^0.6.29, node-pre-gyp@^0.6.4: - version "0.6.33" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz#640ac55198f6a925972e0c16c4ac26a034d5ecc9" + version "0.6.34" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7" dependencies: - mkdirp "~0.5.1" - nopt "~3.0.6" - npmlog "^4.0.1" - rc "~1.1.6" - request "^2.79.0" - rimraf "~2.5.4" - semver "~5.3.0" - tar "~2.2.1" - tar-pack "~3.3.0" + mkdirp "^0.5.1" + nopt "^4.0.1" + npmlog "^4.0.2" + rc "^1.1.7" + request "^2.81.0" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^2.2.1" + tar-pack "^3.4.0" node-zopfli@^2.0.0: version "2.0.2" @@ -3239,15 +3313,22 @@ node-zopfli@^2.0.0: nan "^2.0.0" node-pre-gyp "^0.6.4" -nopt@3.x, nopt@~3.0.6: +nopt@3.x: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" dependencies: abbrev "1" +nopt@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + dependencies: + abbrev "1" + osenv "^0.1.4" + normalize-package-data@^2.3.2: - version "2.3.5" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df" + version "2.3.6" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff" dependencies: hosted-git-info "^2.1.4" is-builtin-module "^1.0.0" @@ -3258,7 +3339,7 @@ normalize-path@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a" -npmlog@^4.0.1: +npmlog@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f" dependencies: @@ -3308,18 +3389,12 @@ on-headers@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7" -once@1.x, once@^1.3.0, once@^1.4.0: +once@1.x, once@^1.3.0, once@^1.3.3, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" dependencies: wrappy "1" -once@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20" - dependencies: - wrappy "1" - onetime@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" @@ -3377,10 +3452,17 @@ os-locale@^1.4.0: dependencies: lcid "^1.0.0" -os-tmpdir@^1.0.1, os-tmpdir@~1.0.1: +os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" +osenv@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644" + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + p-limit@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc" @@ -3400,8 +3482,8 @@ pako@~1.0.2: resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.5.tgz#d2205dfe5b9da8af797e7c163db4d1f84e4600bc" parse-asn1@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.0.0.tgz#35060f6d5015d37628c770f4e091a0b5a278bc23" + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712" dependencies: asn1.js "^4.0.0" browserify-aes "^1.0.0" @@ -3494,6 +3576,10 @@ pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" +performance-now@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" + phantomjs-prebuilt@^2.1.7: version "2.1.14" resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz#d53d311fcfb7d1d08ddb24014558f1188c516da0" @@ -3577,11 +3663,11 @@ progress@^1.1.8, progress@~1.1.8: resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" proxy-addr@~1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.3.tgz#dc97502f5722e888467b3fa2297a7b1ff47df074" + version "1.1.4" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3" dependencies: forwarded "~0.1.0" - ipaddr.js "1.2.0" + ipaddr.js "1.3.0" prr@~0.0.0: version "0.0.0" @@ -3609,17 +3695,13 @@ qjobs@^1.1.4: version "1.1.5" resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73" -qs@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b" - -qs@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.1.tgz#ce03c5ff0935bc1d9d69a9f14cbd18e568d67625" +qs@6.4.0, qs@~6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" qs@~6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442" + version "6.3.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c" querystring-es3@^0.2.0: version "0.2.1" @@ -3666,14 +3748,14 @@ raw-loader@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" -rc@~1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.6.tgz#43651b76b6ae53b5c802f1151fa3fc3b059969c9" +rc@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.7.tgz#c5ea564bb07aff9fd3a5b32e906c1d3a65940fea" dependencies: deep-extend "~0.4.0" ini "~1.3.0" minimist "^1.2.0" - strip-json-comments "~1.0.4" + strip-json-comments "~2.0.1" read-pkg-up@^1.0.1: version "1.0.1" @@ -3690,9 +3772,9 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.0, readable-stream@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e" +"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.0, readable-stream@^2.1.4, readable-stream@^2.2.2: + version "2.2.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816" dependencies: buffer-shims "^1.0.0" core-util-is "~1.0.0" @@ -3722,18 +3804,6 @@ readable-stream@~2.0.0, readable-stream@~2.0.6: string_decoder "~0.10.x" util-deprecate "~1.0.1" -readable-stream@~2.1.4: - version "2.1.5" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" - dependencies: - buffer-shims "^1.0.0" - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - readdirp@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" @@ -3762,8 +3832,8 @@ regenerate@^1.2.1: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260" regenerator-runtime@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz#257f41961ce44558b18f7814af48c17559f9faeb" + version "0.10.3" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e" regenerator-transform@0.9.8: version "0.9.8" @@ -3822,7 +3892,34 @@ request-progress@~2.0.1: dependencies: throttleit "^1.0.0" -request@^2.79.0, request@~2.79.0: +request@^2.81.0: + version "2.81.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" + dependencies: + aws-sign2 "~0.6.0" + aws4 "^1.2.1" + caseless "~0.12.0" + combined-stream "~1.0.5" + extend "~3.0.0" + forever-agent "~0.6.1" + form-data "~2.1.1" + har-validator "~4.2.1" + hawk "~3.1.3" + http-signature "~1.1.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.7" + oauth-sign "~0.8.1" + performance-now "^0.2.0" + qs "~6.4.0" + safe-buffer "^5.0.1" + stringstream "~0.0.4" + tough-cookie "~2.3.0" + tunnel-agent "^0.6.0" + uuid "^3.0.0" + +request@~2.79.0: version "2.79.0" resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" dependencies: @@ -3875,8 +3972,10 @@ resolve@1.1.x: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" resolve@^1.1.6, resolve@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c" + version "1.3.2" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235" + dependencies: + path-parse "^1.0.5" restore-cursor@^1.0.1: version "1.0.1" @@ -3891,9 +3990,9 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@~2.5.1, rimraf@~2.5.4: - version "2.5.4" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" +rimraf@2, rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.6.0, rimraf@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" dependencies: glob "^7.0.5" @@ -3923,7 +4022,7 @@ select2@3.5.2-browserify: version "3.5.2-browserify" resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz#dc4dafda38d67a734e8a97a46f0d3529ae05391d" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@~5.3.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -3931,18 +4030,18 @@ semver@~4.3.3: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" -send@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.14.2.tgz#39b0438b3f510be5dc6f667a11f71689368cdeef" +send@0.15.1: + version "0.15.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.15.1.tgz#8a02354c26e6f5cca700065f5f0cdeba90ec7b5f" dependencies: - debug "~2.2.0" + debug "2.6.1" depd "~1.1.0" destroy "~1.0.4" encodeurl "~1.0.1" escape-html "~1.0.3" - etag "~1.7.0" - fresh "0.3.0" - http-errors "~1.5.1" + etag "~1.8.0" + fresh "0.5.0" + http-errors "~1.6.1" mime "1.3.4" ms "0.7.2" on-finished "~2.3.0" @@ -3961,14 +4060,14 @@ serve-index@^1.7.2: mime-types "~2.1.11" parseurl "~1.3.1" -serve-static@~1.11.2: - version "1.11.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.11.2.tgz#2cf9889bd4435a320cc36895c9aa57bd662e6ac7" +serve-static@1.12.1: + version "1.12.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.1.tgz#7443a965e3ced647aceb5639fa06bf4d1bbe0039" dependencies: encodeurl "~1.0.1" escape-html "~1.0.3" parseurl "~1.3.1" - send "0.14.2" + send "0.15.1" set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" @@ -3986,6 +4085,10 @@ setprototypeof@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08" +setprototypeof@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04" + sha.js@^2.3.6: version "2.4.8" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f" @@ -3993,8 +4096,8 @@ sha.js@^2.3.6: inherits "^2.0.1" shelljs@^0.7.5: - version "0.7.6" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad" + version "0.7.7" + resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1" dependencies: glob "^7.0.0" interpret "^1.0.0" @@ -4025,15 +4128,15 @@ socket.io-adapter@0.5.0: debug "2.3.3" socket.io-parser "2.3.1" -socket.io-client@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.2.tgz#39fdb0c3dd450e321b7e40cfd83612ec533dd644" +socket.io-client@1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.3.tgz#b30e86aa10d5ef3546601c09cde4765e381da377" dependencies: backo2 "1.0.2" component-bind "1.0.0" component-emitter "1.2.1" debug "2.3.3" - engine.io-client "1.8.2" + engine.io-client "1.8.3" has-binary "0.1.7" indexof "0.0.1" object-component "0.0.3" @@ -4050,24 +4153,24 @@ socket.io-parser@2.3.1: isarray "0.0.1" json3 "3.3.2" -socket.io@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.2.tgz#83bbbdf2e79263b378900da403e7843e05dc3b71" +socket.io@1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.3.tgz#b8af9caba00949e568e369f1327ea9be9ea2461b" dependencies: debug "2.3.3" - engine.io "1.8.2" + engine.io "1.8.3" has-binary "0.1.7" object-assign "4.1.0" socket.io-adapter "0.5.0" - socket.io-client "1.7.2" + socket.io-client "1.7.3" socket.io-parser "2.3.1" -sockjs-client@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.1.tgz#284843e9a9784d7c474b1571b3240fca9dda4bb0" +sockjs-client@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.2.tgz#f0212a8550e4c9468c8cceaeefd2e3493c033ad5" dependencies: debug "^2.2.0" - eventsource "~0.1.6" + eventsource "0.1.6" faye-websocket "~0.11.0" inherits "^2.0.1" json3 "^3.3.2" @@ -4080,15 +4183,19 @@ sockjs@0.3.18: faye-websocket "^0.10.0" uuid "^2.0.2" +source-list-map@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.1.tgz#1a33ac210ca144d1e561f906ebccab5669ff4cb4" + source-list-map@~0.1.7: version "0.1.8" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106" source-map-support@^0.4.2: - version "0.4.11" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.11.tgz#647f939978b38535909530885303daf23279f322" + version "0.4.14" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef" dependencies: - source-map "^0.5.3" + source-map "^0.5.6" source-map@^0.1.41: version "0.1.43" @@ -4102,7 +4209,7 @@ source-map@^0.4.4: dependencies: amdefine ">=0.0.4" -source-map@^0.5.0, source-map@^0.5.3, source-map@~0.5.1, source-map@~0.5.3: +source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3: version "0.5.6" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" @@ -4151,8 +4258,8 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" sshpk@^1.7.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.10.2.tgz#d5a804ce22695515638e798dbe23273de070a5fa" + version "1.11.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.11.0.tgz#2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77" dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -4169,7 +4276,7 @@ stats-webpack-plugin@^0.4.3: version "0.4.3" resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.4.3.tgz#b2f618202f28dd04ab47d7ecf54ab846137b7aea" -"statuses@>= 1.3.1 < 2", statuses@~1.3.0, statuses@~1.3.1: +"statuses@>= 1.3.1 < 2", statuses@~1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" @@ -4229,18 +4336,10 @@ strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" -strip-json-comments@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91" - strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -supports-color@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a" - supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -4270,20 +4369,20 @@ tapable@^0.2.5, tapable@~0.2.5: version "0.2.6" resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d" -tar-pack@~3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.3.0.tgz#30931816418f55afc4d21775afdd6720cee45dae" +tar-pack@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984" dependencies: - debug "~2.2.0" - fstream "~1.0.10" - fstream-ignore "~1.0.5" - once "~1.3.3" - readable-stream "~2.1.4" - rimraf "~2.5.1" - tar "~2.2.1" - uid-number "~0.0.6" + debug "^2.2.0" + fstream "^1.0.10" + fstream-ignore "^1.0.5" + once "^1.3.3" + readable-stream "^2.1.4" + rimraf "^2.5.1" + tar "^2.2.1" + uid-number "^0.0.6" -tar@~2.2.1: +tar@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" dependencies: @@ -4291,9 +4390,9 @@ tar@~2.2.1: fstream "^1.0.2" inherits "2" -test-exclude@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.0.tgz#0ddc0100b8ae7e88b34eb4fd98a907e961991900" +test-exclude@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.3.tgz#86a13ce3effcc60e6c90403cf31a27a60ac6c4e7" dependencies: arrify "^1.0.1" micromatch "^2.3.11" @@ -4329,9 +4428,9 @@ timers-browserify@^2.0.2: dependencies: setimmediate "^1.0.4" -tmp@0.0.28, tmp@0.0.x: - version "0.0.28" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120" +tmp@0.0.31, tmp@0.0.x: + version "0.0.31" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7" dependencies: os-tmpdir "~1.0.1" @@ -4369,6 +4468,12 @@ tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + dependencies: + safe-buffer "^5.0.1" + tunnel-agent@~0.4.1: version "0.4.3" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" @@ -4394,20 +4499,20 @@ typedarray@^0.0.6, typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -uglify-js@^2.6, uglify-js@^2.7.5: - version "2.7.5" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8" +uglify-js@^2.6, uglify-js@^2.8.5: + version "2.8.16" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.16.tgz#d286190b6eefc6fd65eb0ecac6551e0b0e8839a4" dependencies: - async "~0.2.6" source-map "~0.5.1" - uglify-to-browserify "~1.0.0" yargs "~3.10.0" + optionalDependencies: + uglify-to-browserify "~1.0.0" uglify-to-browserify@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" -uid-number@~0.0.6: +uid-number@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" @@ -4435,8 +4540,8 @@ url-parse@1.0.x: requires-port "1.0.x" url-parse@^1.1.1: - version "1.1.7" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.7.tgz#025cff999653a459ab34232147d89514cc87d74a" + version "1.1.8" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.8.tgz#7a65b3a8d57a1e86af6b4e2276e34774167c0156" dependencies: querystringify "0.0.x" requires-port "1.0.x" @@ -4454,7 +4559,7 @@ user-home@^2.0.0: dependencies: os-homedir "^1.0.0" -useragent@^2.1.10: +useragent@^2.1.12: version "2.1.12" resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.12.tgz#aa7da6cdc48bdc37ba86790871a7321d64edbaa2" dependencies: @@ -4491,8 +4596,8 @@ validate-npm-package-license@^3.0.1: spdx-expression-parse "~1.0.0" vary@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.0.tgz#e1e5affbbd16ae768dd2674394b9ad3022653140" + version "1.1.1" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37" verror@1.3.6: version "1.3.6" @@ -4519,12 +4624,12 @@ vue-resource@^0.9.3: resolved "https://registry.yarnpkg.com/vue-resource/-/vue-resource-0.9.3.tgz#ab46e1c44ea219142dcc28ae4043b3b04c80959d" vue@^2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.4.tgz#d0a3a050a80a12356d7950ae5a7b3131048209cc" + version "2.2.5" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.5.tgz#528eba68447d7eff99f86767b31176aa656c6963" -watchpack@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.2.1.tgz#01efa80c5c29e5c56ba55d6f5470a35b6402f0b2" +watchpack@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87" dependencies: async "^2.1.2" chokidar "^1.4.3" @@ -4537,8 +4642,8 @@ wbuf@^1.1.0, wbuf@^1.4.0: minimalistic-assert "^1.0.0" webpack-bundle-analyzer@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.3.0.tgz#0d05e96a43033f7cc57f6855b725782ba61e93a4" + version "2.3.1" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.3.1.tgz#d97f8aadbcce68fc865c5787741d8549359a25cd" dependencies: acorn "^4.0.11" chalk "^1.1.3" @@ -4552,8 +4657,8 @@ webpack-bundle-analyzer@^2.3.0: opener "^1.4.2" webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.9.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.0.tgz#7d5be2651e692fddfafd8aaed177c16ff51f0eb8" + version "1.10.1" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.1.tgz#c6b4cf428139cf1aefbe06a0c00fdb4f8da2f893" dependencies: memory-fs "~0.4.1" mime "^1.3.4" @@ -4561,8 +4666,8 @@ webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.9.0: range-parser "^1.0.3" webpack-dev-server@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.3.0.tgz#0437704bbd4d941a6e4c061eb3cc232ed7d06101" + version "2.4.2" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.2.tgz#cf595d6b40878452b6d2ad7229056b686f8a16be" dependencies: ansi-html "0.0.7" chokidar "^1.6.0" @@ -4570,28 +4675,35 @@ webpack-dev-server@^2.3.0: connect-history-api-fallback "^1.3.0" express "^4.13.3" html-entities "^1.2.0" - http-proxy-middleware "~0.17.1" + http-proxy-middleware "~0.17.4" opn "4.0.2" portfinder "^1.0.9" serve-index "^1.7.2" sockjs "0.3.18" - sockjs-client "1.1.1" + sockjs-client "1.1.2" spdy "^3.4.1" strip-ansi "^3.0.0" supports-color "^3.1.1" webpack-dev-middleware "^1.9.0" yargs "^6.0.0" -webpack-sources@^0.1.0, webpack-sources@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.4.tgz#ccc2c817e08e5fa393239412690bb481821393cd" +webpack-sources@^0.1.0: + version "0.1.5" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750" dependencies: source-list-map "~0.1.7" source-map "~0.5.3" +webpack-sources@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb" + dependencies: + source-list-map "^1.1.1" + source-map "~0.5.3" + webpack@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.1.tgz#7bb1d72ae2087dd1a4af526afec15eed17dda475" + version "2.3.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.2.tgz#7d521e6f0777a3a58985c69425263fdfe977b458" dependencies: acorn "^4.0.4" acorn-dynamic-import "^2.0.0" @@ -4609,9 +4721,9 @@ webpack@^2.2.1: source-map "^0.5.3" supports-color "^3.1.0" tapable "~0.2.5" - uglify-js "^2.7.5" - watchpack "^1.2.0" - webpack-sources "^0.1.4" + uglify-js "^2.8.5" + watchpack "^1.3.1" + webpack-sources "^0.2.3" yargs "^6.0.0" websocket-driver@>=0.5.1: @@ -4629,10 +4741,10 @@ which-module@^1.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" which@^1.1.1, which@~1.2.10: - version "1.2.12" - resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192" + version "1.2.14" + resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" dependencies: - isexe "^1.1.1" + isexe "^2.0.0" wide-align@^1.1.0: version "1.1.0" @@ -4673,9 +4785,9 @@ write@^0.2.1: dependencies: mkdirp "^0.5.1" -ws@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.1.tgz#082ddb6c641e85d4bb451f03d52f06eabdb1f018" +ws@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f" dependencies: options ">=0.0.5" ultron "1.0.x" From 08bbb9fce66cb46d3262e6cd4c4379b59f065be0 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 9 Mar 2017 19:29:11 -0600 Subject: [PATCH 08/70] Add option to start a new discussion on an MR --- .../javascripts/files_comment_button.js | 26 +- app/assets/javascripts/notes.js | 69 +++-- app/controllers/projects/commit_controller.rb | 20 +- .../projects/discussions_controller.rb | 2 +- app/controllers/projects/issues_controller.rb | 10 +- .../projects/merge_requests_controller.rb | 28 +- app/controllers/projects/notes_controller.rb | 86 +++--- .../projects/snippets_controller.rb | 5 +- app/finders/notes_finder.rb | 54 ++-- app/helpers/notes_helper.rb | 47 ++- app/models/commit.rb | 5 + app/models/commit_discussion.rb | 9 + app/models/concerns/note_on_diff.rb | 8 - app/models/concerns/noteable.rb | 17 ++ app/models/concerns/resolvable_note.rb | 61 ++++ app/models/diff_discussion.rb | 69 +++++ app/models/diff_note.rb | 117 ++----- app/models/discussion.rb | 162 +++++----- app/models/discussion_note.rb | 9 + app/models/individual_note_discussion.rb | 13 + app/models/issue.rb | 1 + app/models/legacy_diff_discussion.rb | 21 ++ app/models/legacy_diff_note.rb | 10 +- app/models/merge_request.rb | 37 +-- app/models/note.rb | 112 ++++--- app/models/sent_notification.rb | 63 ++-- app/models/simple_discussion.rb | 9 + app/models/snippet.rb | 1 + .../concerns/issues/resolve_discussions.rb | 2 +- app/services/notes/build_service.rb | 29 ++ app/services/notes/create_service.rb | 6 +- app/services/system_note_service.rb | 8 +- app/views/discussions/_discussion.html.haml | 14 +- app/views/discussions/_notes.html.haml | 13 +- app/views/discussions/_resolve_all.html.haml | 17 +- app/views/projects/commit/show.html.haml | 1 + app/views/projects/notes/_form.html.haml | 17 +- app/views/projects/notes/_note.html.haml | 2 +- app/views/projects/notes/_notes.html.haml | 4 +- .../unreleased/new-resolvable-discussion.yml | 4 + ..._to_discussion_id_to_sent_notifications.rb | 29 ++ ...dd_index_to_note_original_discussion_id.rb | 18 ++ db/schema.rb | 2 + .../email/handler/create_note_handler.rb | 8 +- .../projects/commit_controller_spec.rb | 2 +- .../projects/discussions_controller_spec.rb | 2 +- .../projects/issues_controller_spec.rb | 2 +- .../merge_requests_controller_spec.rb | 2 +- .../projects/notes_controller_spec.rb | 11 +- spec/factories/discussions.rb | 5 + spec/factories/notes.rb | 9 + ...e_for_discussions_in_merge_request_spec.rb | 2 +- spec/features/notes_on_merge_requests_spec.rb | 2 +- spec/finders/notes_finder_spec.rb | 4 + spec/models/commit_discussion_spec.rb | 5 + spec/models/concerns/noteable_spec.rb | 5 + spec/models/concerns/resolvable_note_spec.rb | 276 +++++++++++++++++ spec/models/diff_discussion_spec.rb | 24 ++ spec/models/diff_note_spec.rb | 287 +----------------- spec/models/discussion_note_spec.rb | 5 + spec/models/discussion_spec.rb | 99 +++--- .../models/individual_note_discussion_spec.rb | 5 + spec/models/legacy_diff_discussion_spec.rb | 5 + spec/models/legacy_diff_note_spec.rb | 101 ------ spec/models/merge_request_spec.rb | 68 +++-- spec/models/note_spec.rb | 117 +++++-- spec/models/sent_notification_spec.rb | 5 + spec/models/simple_discussion_spec.rb | 5 + spec/requests/api/v3/issues_spec.rb | 2 +- .../discussions/resolve_service_spec.rb | 4 +- spec/services/issues/build_service_spec.rb | 4 +- spec/services/issues/create_service_spec.rb | 2 +- spec/services/notes/build_service_spec.rb | 5 + spec/services/notes/create_service_spec.rb | 3 + spec/services/notification_service_spec.rb | 2 +- spec/services/system_note_service_spec.rb | 2 +- 76 files changed, 1329 insertions(+), 988 deletions(-) create mode 100644 app/models/commit_discussion.rb create mode 100644 app/models/concerns/noteable.rb create mode 100644 app/models/concerns/resolvable_note.rb create mode 100644 app/models/diff_discussion.rb create mode 100644 app/models/discussion_note.rb create mode 100644 app/models/individual_note_discussion.rb create mode 100644 app/models/legacy_diff_discussion.rb create mode 100644 app/models/simple_discussion.rb create mode 100644 app/services/notes/build_service.rb create mode 100644 changelogs/unreleased/new-resolvable-discussion.yml create mode 100644 db/migrate/20161128095517_add_in_reply_to_discussion_id_to_sent_notifications.rb create mode 100644 db/migrate/20170308220217_add_index_to_note_original_discussion_id.rb create mode 100644 spec/factories/discussions.rb create mode 100644 spec/models/commit_discussion_spec.rb create mode 100644 spec/models/concerns/noteable_spec.rb create mode 100644 spec/models/concerns/resolvable_note_spec.rb create mode 100644 spec/models/diff_discussion_spec.rb create mode 100644 spec/models/discussion_note_spec.rb create mode 100644 spec/models/individual_note_discussion_spec.rb create mode 100644 spec/models/legacy_diff_discussion_spec.rb delete mode 100644 spec/models/legacy_diff_note_spec.rb create mode 100644 spec/models/sent_notification_spec.rb create mode 100644 spec/models/simple_discussion_spec.rb create mode 100644 spec/services/notes/build_service_spec.rb diff --git a/app/assets/javascripts/files_comment_button.js b/app/assets/javascripts/files_comment_button.js index 3f041172ff3..d1d24b411a4 100644 --- a/app/assets/javascripts/files_comment_button.js +++ b/app/assets/javascripts/files_comment_button.js @@ -5,7 +5,7 @@ let $commentButtonTemplate; var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; }; -window.FilesCommentButton = (function() { +this.FilesCommentButton = (function() { var COMMENT_BUTTON_CLASS, EMPTY_CELL_CLASS, LINE_COLUMN_CLASSES, LINE_CONTENT_CLASS, LINE_HOLDER_CLASS, LINE_NUMBER_CLASS, OLD_LINE_CLASS, TEXT_FILE_SELECTOR, UNFOLDABLE_LINE_CLASS; COMMENT_BUTTON_CLASS = '.add-diff-note'; @@ -55,14 +55,19 @@ window.FilesCommentButton = (function() { textFileElement = this.getTextFileElement($currentTarget); buttonParentElement.append(this.buildButton({ + discussionID: lineContentElement.attr('data-discussion-id'), + lineType: lineContentElement.attr('data-line-type'), + noteableType: textFileElement.attr('data-noteable-type'), noteableID: textFileElement.attr('data-noteable-id'), commitID: textFileElement.attr('data-commit-id'), noteType: lineContentElement.attr('data-note-type'), - position: lineContentElement.attr('data-position'), - lineType: lineContentElement.attr('data-line-type'), - discussionID: lineContentElement.attr('data-discussion-id'), - lineCode: lineContentElement.attr('data-line-code') + + // LegacyDiffNote + lineCode: lineContentElement.attr('data-line-code'), + + // DiffNote + position: lineContentElement.attr('data-position') })); }; @@ -76,14 +81,19 @@ window.FilesCommentButton = (function() { FilesCommentButton.prototype.buildButton = function(buttonAttributes) { return $commentButtonTemplate.clone().attr({ + 'data-discussion-id': buttonAttributes.discussionID, + 'data-line-type': buttonAttributes.lineType, + 'data-noteable-type': buttonAttributes.noteableType, 'data-noteable-id': buttonAttributes.noteableID, 'data-commit-id': buttonAttributes.commitID, 'data-note-type': buttonAttributes.noteType, + + // LegacyDiffNote 'data-line-code': buttonAttributes.lineCode, - 'data-position': buttonAttributes.position, - 'data-discussion-id': buttonAttributes.discussionID, - 'data-line-type': buttonAttributes.lineType + + // DiffNote + 'data-position': buttonAttributes.position }); }; diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 1d563c63f39..71c03c89314 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -213,11 +213,7 @@ require('./task_list'); _this.last_fetched_at = data.last_fetched_at; _this.setPollingInterval(data.notes.length); return $.each(notes, function(i, note) { - if (note.discussion_html != null) { - return _this.renderDiscussionNote(note); - } else { - return _this.renderNote(note); - } + _this.renderNote(note); }); }; })(this) @@ -278,6 +274,10 @@ require('./task_list'); Notes.prototype.renderNote = function(note) { var $notesList; + if (note.discussion_html != null) { + return this.renderDiscussionNote(note); + } + if (!note.valid) { if (note.errors.commands_only) { new Flash(note.errors.commands_only, 'notice', this.parentTimeline); @@ -323,9 +323,9 @@ require('./task_list'); return; } this.note_ids.push(note.id); - form = $("#new-discussion-note-form-" + note.discussion_id); - if ((note.original_discussion_id != null) && form.length === 0) { - form = $("#new-discussion-note-form-" + note.original_discussion_id); + form = $(".js-discussion-note-form[data-discussion-id='" + note.discussion_id + "']"); + if (form.length === 0) { + form = $(".js-discussion-note-form[data-original-discussion-id='" + note.original_discussion_id + "']"); } row = form.closest("tr"); lineType = this.isParallelView() ? form.find('#line_type').val() : 'old'; @@ -334,8 +334,8 @@ require('./task_list'); note_html.renderGFM(); // is this the first note of discussion? discussionContainer = $(".notes[data-discussion-id='" + note.discussion_id + "']"); - if ((note.original_discussion_id != null) && discussionContainer.length === 0) { - discussionContainer = $(".notes[data-discussion-id='" + note.original_discussion_id + "']"); + if (discussionContainer.length === 0) { + discussionContainer = $(".notes[data-original-discussion-id='" + note.original_discussion_id + "']"); } if (discussionContainer.length === 0) { if (!this.isParallelView() || row.hasClass('js-temp-notes-holder')) { @@ -363,7 +363,7 @@ require('./task_list'); // Add note to 'Changes' page discussions discussionContainer.append(note_html); // Init discussion on 'Discussion' page if it is merge request page - if ($('body').attr('data-page').indexOf('projects:merge_request') === 0) { + if ($('body').attr('data-page').indexOf('projects:merge_request') === 0 || !note.diff_discussion_html) { $('ul.main-notes-list').append(note.discussion_html).renderGFM(); } } else { @@ -456,6 +456,7 @@ require('./task_list'); form.find("#note_line_code").remove(); form.find("#note_position").remove(); form.find("#note_type").remove(); + form.find("#note_in_reply_to_discussion_id").remove(); form.find('.js-comment-resolve-button').closest('comment-and-resolve-btn').remove(); return this.parentTimeline = form.parents('.timeline'); }; @@ -470,10 +471,24 @@ require('./task_list'); */ Notes.prototype.setupNoteForm = function(form) { - var textarea; + var textarea, key; new gl.GLForm(form); textarea = form.find(".js-note-text"); - return new Autosave(textarea, ["Note", form.find("#note_noteable_type").val(), form.find("#note_noteable_id").val(), form.find("#note_commit_id").val(), form.find("#note_type").val(), form.find("#note_line_code").val(), form.find("#note_position").val()]); + key = [ + "Note", + form.find("#note_noteable_type").val(), + form.find("#note_noteable_id").val(), + form.find("#note_commit_id").val(), + form.find("#note_type").val(), + form.find("#in_reply_to_discussion_id").val(), + + // LegacyDiffNote + form.find("#note_line_code").val(), + + // DiffNote + form.find("#note_position").val() + ]; + return new Autosave(textarea, key); }; /* @@ -510,7 +525,7 @@ require('./task_list'); } } - this.renderDiscussionNote(note); + this.renderNote(note); // cleanup after successfully creating a diff/discussion note this.removeDiscussionNoteForm($form); }; @@ -727,23 +742,35 @@ require('./task_list'); Sets some hidden fields in the form. - Note: dataHolder must have the "discussionId", "lineCode", "noteableType" - and "noteableId" data attributes set. + Note: dataHolder must have the "discussionId" and "lineCode" data attributes set. */ Notes.prototype.setupDiscussionNoteForm = function(dataHolder, form) { // setup note target - form.attr('id', "new-discussion-note-form-" + (dataHolder.data("discussionId"))); + var discussionID = dataHolder.data("discussionId"); + + form.attr('id', "new-discussion-note-form-" + discussionID); + form.attr("data-discussion-id", discussionID); + form.attr("data-original-discussion-id", dataHolder.data("originalDiscussionId") || discussionID); form.attr("data-line-code", dataHolder.data("lineCode")); - form.find("#note_type").val(dataHolder.data("noteType")); + form.find("#line_type").val(dataHolder.data("lineType")); - form.find("#note_commit_id").val(dataHolder.data("commitId")); - form.find("#note_line_code").val(dataHolder.data("lineCode")); - form.find("#note_position").val(dataHolder.attr("data-position")); + form.find("#in_reply_to_discussion_id").val(dataHolder.data("originalDiscussionId")); + form.find("#note_noteable_type").val(dataHolder.data("noteableType")); form.find("#note_noteable_id").val(dataHolder.data("noteableId")); + form.find("#note_commit_id").val(dataHolder.data("commitId")); + form.find("#note_type").val(dataHolder.data("noteType")); + + // LegacyDiffNote + form.find("#note_line_code").val(dataHolder.data("lineCode")); + + // DiffNote + form.find("#note_position").val(dataHolder.attr("data-position")); + form.find('.js-note-discard').show().removeClass('js-note-discard').addClass('js-close-discussion-note-form').text(form.find('.js-close-discussion-note-form').data('cancel-text')); form.find('.js-note-target-close').remove(); + form.find('.js-note-new-discussion').remove(); this.setupNoteForm(form); if (typeof gl.diffNotesCompileComponents !== 'undefined') { diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index cc67f688d51..98cd4ce344a 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -2,6 +2,7 @@ # # Not to be confused with CommitsController, plural. class Projects::CommitController < Projects::ApplicationController + include NotesHelper include CreatesCommit include DiffForPath include DiffHelper @@ -111,22 +112,19 @@ class Projects::CommitController < Projects::ApplicationController end def define_note_vars - @grouped_diff_discussions = commit.notes.grouped_diff_discussions - @notes = commit.notes.non_diff_notes.fresh - - Banzai::NoteRenderer.render( - @grouped_diff_discussions.values.flat_map(&:notes) + @notes, - @project, - current_user, - ) - + @noteable = @commit @note = @project.build_commit_note(commit) - @noteable = @commit - @comments_target = { + @new_diff_note_attrs = { noteable_type: 'Commit', commit_id: @commit.id } + + @grouped_diff_discussions = commit.grouped_diff_discussions + @discussions = commit.discussions + + @notes = (@grouped_diff_discussions.values + @discussions).flat_map(&:notes) + @notes = prepare_notes_for_rendering(@notes) end def assign_change_commit_vars diff --git a/app/controllers/projects/discussions_controller.rb b/app/controllers/projects/discussions_controller.rb index 1349b015a63..f4a18a5e8f7 100644 --- a/app/controllers/projects/discussions_controller.rb +++ b/app/controllers/projects/discussions_controller.rb @@ -28,7 +28,7 @@ class Projects::DiscussionsController < Projects::ApplicationController end def discussion - @discussion ||= @merge_request.find_diff_discussion(params[:id]) || render_404 + @discussion ||= @merge_request.find_discussion(params[:id]) || render_404 end def authorize_resolve_discussion! diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index d984e6d3918..0c6267f065b 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -84,15 +84,11 @@ class Projects::IssuesController < Projects::ApplicationController end def show - raw_notes = @issue.notes.inc_relations_for_view.fresh - - @notes = Banzai::NoteRenderer. - render(raw_notes, @project, current_user, @path, @project_wiki, @ref) - - @note = @project.notes.new(noteable: @issue) @noteable = @issue + @note = @project.notes.new(noteable: @issue) - preload_max_access_for_authors(@notes, @project) + @discussions = @issue.discussions + @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes)) respond_to do |format| format.html diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 37e3ac05916..7863fe18f32 100755 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -570,20 +570,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @note = @project.notes.new(noteable: @merge_request) @discussions = @merge_request.discussions - - preload_noteable_for_regular_notes(@discussions.flat_map(&:notes)) - - # This is not executed lazily - @notes = Banzai::NoteRenderer.render( - @discussions.flat_map(&:notes), - @project, - current_user, - @path, - @project_wiki, - @ref - ) - - preload_max_access_for_authors(@notes, @project) + @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes)) end def define_widget_vars @@ -596,22 +583,15 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def define_diff_comment_vars - @comments_target = { + @new_diff_note_attrs = { noteable_type: 'MergeRequest', noteable_id: @merge_request.id } @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs? - @grouped_diff_discussions = @merge_request.notes.inc_relations_for_view.grouped_diff_discussions - Banzai::NoteRenderer.render( - @grouped_diff_discussions.values.flat_map(&:notes), - @project, - current_user, - @path, - @project_wiki, - @ref - ) + @grouped_diff_discussions = @merge_request.grouped_diff_discussions + @notes = prepare_notes_for_rendering(@grouped_diff_discussions.values.flat_map(&:notes)) end def define_pipelines_vars diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index d00177e7612..f80313bbee0 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -6,13 +6,14 @@ class Projects::NotesController < Projects::ApplicationController before_action :authorize_create_note!, only: [:create] before_action :authorize_admin_note!, only: [:update, :destroy] before_action :authorize_resolve_note!, only: [:resolve, :unresolve] - before_action :find_current_user_notes, only: [:index] def index current_fetched_at = Time.now.to_i notes_json = { notes: [], last_fetched_at: current_fetched_at } + @notes = notes_finder.execute.inc_author + @notes.each do |note| next if note.cross_reference_not_visible_for?(current_user) @@ -23,7 +24,11 @@ class Projects::NotesController < Projects::ApplicationController end def create - create_params = note_params.merge(merge_request_diff_head_sha: params[:merge_request_diff_head_sha]) + create_params = note_params.merge( + merge_request_diff_head_sha: params[:merge_request_diff_head_sha], + in_reply_to_discussion_id: params[:in_reply_to_discussion_id], + new_discussion: params[:new_discussion], + ) @note = Notes::CreateService.new(project, current_user, create_params).execute if @note.is_a?(Note) @@ -111,6 +116,17 @@ class Projects::NotesController < Projects::ApplicationController ) end + def discussion_html(discussion) + return if discussion.render_as_individual_notes? + + render_to_string( + "discussions/_discussion", + layout: false, + formats: [:html], + locals: { discussion: discussion } + ) + end + def diff_discussion_html(discussion) return unless discussion.diff_discussion? @@ -135,17 +151,6 @@ class Projects::NotesController < Projects::ApplicationController ) end - def discussion_html(discussion) - return unless discussion.diff_discussion? - - render_to_string( - "discussions/_discussion", - layout: false, - formats: [:html], - locals: { discussion: discussion } - ) - end - def note_json(note) attrs = { id: note.id @@ -156,33 +161,22 @@ class Projects::NotesController < Projects::ApplicationController attrs.merge!( valid: true, - discussion_id: note.discussion_id, + discussion_id: note.discussion_id(noteable), html: note_html(note), note: note.note ) - if note.diff_note? - discussion = note.to_discussion - + discussion = note.to_discussion(noteable) + unless discussion.render_as_individual_notes? attrs.merge!( diff_discussion_html: diff_discussion_html(discussion), - discussion_html: discussion_html(discussion) - ) + discussion_html: discussion_html(discussion), - # The discussion_id is used to add the comment to the correct discussion - # element on the merge request page. Among other things, the discussion_id - # contains the sha of head commit of the merge request. - # When new commits are pushed into the merge request after the initial - # load of the merge request page, the discussion elements will still have - # the old discussion_ids, with the old head commit sha. The new comment, - # however, will have the new discussion_id with the new commit sha. - # To ensure that these new comments will still end up in the correct - # discussion element, we also send the original discussion_id, with the - # old commit sha, along, and fall back on this value when no discussion - # element with the new discussion_id could be found. - if note.new_diff_note? && note.position != note.original_position - attrs[:original_discussion_id] = note.original_discussion_id - end + # Since the `discussion_id` can change, for example when new commits are pushed into an MR, + # the never-changing `original_discussion_id` is used as a fallback to the find the relevant + # discussion container to add this note to. + original_discussion_id: note.original_discussion_id + ) end else attrs.merge!( @@ -205,14 +199,30 @@ class Projects::NotesController < Projects::ApplicationController def note_params params.require(:note).permit( - :note, :noteable, :noteable_id, :noteable_type, :project_id, - :attachment, :line_code, :commit_id, :type, :position + :project_id, + :noteable_type, + :noteable_id, + :commit_id, + :noteable, + :type, + + :note, + :attachment, + + # LegacyDiffNote + :line_code, + + # DiffNote + :position ) end - def find_current_user_notes - @notes = NotesFinder.new(project, current_user, params.merge(last_fetched_at: last_fetched_at)) - .execute.inc_author + def notes_finder + @notes_finder ||= NotesFinder.new(project, current_user, params.merge(last_fetched_at: last_fetched_at)) + end + + def noteable + @noteable ||= notes_finder.target end def last_fetched_at diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb index ea1a97b7cf0..2600a9d7256 100644 --- a/app/controllers/projects/snippets_controller.rb +++ b/app/controllers/projects/snippets_controller.rb @@ -1,4 +1,5 @@ class Projects::SnippetsController < Projects::ApplicationController + include NotesHelper include ToggleAwardEmoji include SpammableActions include SnippetsActions @@ -55,8 +56,10 @@ class Projects::SnippetsController < Projects::ApplicationController def show @note = @project.notes.new(noteable: @snippet) - @notes = Banzai::NoteRenderer.render(@snippet.notes.fresh, @project, current_user) @noteable = @snippet + + @discussions = @snippet.discussions + @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes)) end def destroy diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb index 6630c6384f2..855940762f3 100644 --- a/app/finders/notes_finder.rb +++ b/app/finders/notes_finder.rb @@ -17,29 +17,46 @@ class NotesFinder @project = project @current_user = current_user @params = params - init_collection end def execute - @notes = since_fetch_at(@params[:last_fetched_at]) if @params[:last_fetched_at] + @notes = init_collection + @notes = since_fetch_at(@params[:last_fetched_at], @notes) if @params[:last_fetched_at] @notes end + def target + return @target if defined?(@target) + + target_type = @params[:target_type] + target_id = @params[:target_id] + + return @target = nil unless target_type && target_id + + @target = + if target_type == "commit" + if Ability.allowed?(@current_user, :download_code, @project) + @project.commit(target_id) + end + else + noteables_for_type(target_type).find(target_id) + end + end + private def init_collection - @notes = - if @params[:target_id] - on_target(@params[:target_type], @params[:target_id]) - else - notes_of_any_type - end + if target + notes_on_target + else + notes_of_any_type + end end def notes_of_any_type types = %w(commit issue merge_request snippet) note_relations = types.map { |t| notes_for_type(t) } - note_relations.map!{ |notes| search(@params[:search], notes) } if @params[:search] + note_relations.map! { |notes| search(@params[:search], notes) } if @params[:search] UnionFinder.new.find_union(note_relations, Note) end @@ -69,17 +86,11 @@ class NotesFinder end end - def on_target(target_type, target_id) - if target_type == "commit" - notes_for_type('commit').for_commit_id(target_id) + def notes_on_target + if target.respond_to?(:related_notes) + target.related_notes else - target = noteables_for_type(target_type).find(target_id) - - if target.respond_to?(:related_notes) - target.related_notes - else - target.notes - end + target.notes end end @@ -94,10 +105,9 @@ class NotesFinder # Notes changed since last fetch # Uses overlapping intervals to avoid worrying about race conditions - def since_fetch_at(fetch_time) + def since_fetch_at(fetch_time, notes_relation = @notes) # Default to 0 to remain compatible with old clients last_fetched_at = Time.at(@params.fetch(:last_fetched_at, 0).to_i) - - @notes.where('updated_at > ?', last_fetched_at - FETCH_OVERLAP).fresh + notes_relation.where('updated_at > ?', last_fetched_at - FETCH_OVERLAP).fresh end end diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index b0331f36a2f..01ecac983cf 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -24,9 +24,9 @@ module NotesHelper end def diff_view_data - return {} unless @comments_target + return {} unless @new_diff_note_attrs - @comments_target.slice(:noteable_id, :noteable_type, :commit_id) + @new_diff_note_attrs.slice(:noteable_id, :noteable_type, :commit_id) end def diff_view_line_data(line_code, position, line_type) @@ -53,37 +53,26 @@ module NotesHelper } if use_legacy_diff_note - discussion_id = LegacyDiffNote.discussion_id( - @comments_target[:noteable_type], - @comments_target[:noteable_id] || @comments_target[:commit_id], - line_code - ) - - data.merge!( - note_type: LegacyDiffNote.name, - discussion_id: discussion_id - ) + new_note = LegacyDiffNote.new(@new_diff_note_attrs.merge(line_code: line_code)) + discussion_id = new_note.discussion_id else - discussion_id = DiffNote.discussion_id( - @comments_target[:noteable_type], - @comments_target[:noteable_id] || @comments_target[:commit_id], - position - ) + new_note = DiffNote.new(@new_diff_note_attrs.merge(position: position)) + discussion_id = new_note.discussion_id - data.merge!( - position: position.to_json, - note_type: DiffNote.name, - discussion_id: discussion_id - ) + data[:position] = position.to_json end - data + data.merge( + note_type: new_note.type, + discussion_id: discussion_id + ) end def link_to_reply_discussion(discussion, line_type = nil) return unless current_user - data = discussion.reply_attributes.merge(line_type: line_type) + data = { discussion_id: discussion.id, original_discussion_id: discussion.original_id, line_type: line_type } + data[:line_code] = discussion.line_code if discussion.respond_to?(:line_code) button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button', data: data, title: 'Add a reply' @@ -95,7 +84,15 @@ module NotesHelper end def preload_noteable_for_regular_notes(notes) - ActiveRecord::Associations::Preloader.new.preload(notes.select { |note| !note.for_commit? }, :noteable) + ActiveRecord::Associations::Preloader.new.preload(notes.reject(&:for_commit?), :noteable) + end + + def prepare_notes_for_rendering(notes) + preload_noteable_for_regular_notes(notes) + preload_max_access_for_authors(notes, @project) + Banzai::NoteRenderer.render(notes, @project, current_user) + + notes end def note_max_access_for_user(note) diff --git a/app/models/commit.rb b/app/models/commit.rb index ce92cc369ad..5c452f78546 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -2,6 +2,7 @@ class Commit extend ActiveModel::Naming include ActiveModel::Conversion + include Noteable include Participable include Mentionable include Referable @@ -203,6 +204,10 @@ class Commit project.notes.for_commit_id(self.id) end + def discussion_notes + notes.non_diff_notes + end + def notes_with_associations notes.includes(:author) end diff --git a/app/models/commit_discussion.rb b/app/models/commit_discussion.rb new file mode 100644 index 00000000000..bcca3155335 --- /dev/null +++ b/app/models/commit_discussion.rb @@ -0,0 +1,9 @@ +class CommitDiscussion < Discussion + def self.override_discussion_id(note) + discussion_id(note) + end + + def potentially_resolvable? + false + end +end diff --git a/app/models/concerns/note_on_diff.rb b/app/models/concerns/note_on_diff.rb index b8dd27a7afe..9ce40f329d8 100644 --- a/app/models/concerns/note_on_diff.rb +++ b/app/models/concerns/note_on_diff.rb @@ -24,12 +24,4 @@ module NoteOnDiff def diff_attributes raise NotImplementedError end - - def can_be_award_emoji? - false - end - - def to_discussion - Discussion.new([self]) - end end diff --git a/app/models/concerns/noteable.rb b/app/models/concerns/noteable.rb new file mode 100644 index 00000000000..7900af6aaac --- /dev/null +++ b/app/models/concerns/noteable.rb @@ -0,0 +1,17 @@ +module Noteable + def discussion_notes + notes + end + + delegate :find_discussion, :find_original_discussion, to: :discussion_notes + + def discussions + @discussions ||= discussion_notes + .inc_relations_for_view + .discussions(self) + end + + def grouped_diff_discussions + notes.inc_relations_for_view.grouped_diff_discussions + end +end diff --git a/app/models/concerns/resolvable_note.rb b/app/models/concerns/resolvable_note.rb new file mode 100644 index 00000000000..eecb77ebf80 --- /dev/null +++ b/app/models/concerns/resolvable_note.rb @@ -0,0 +1,61 @@ +module ResolvableNote + extend ActiveSupport::Concern + + included do + belongs_to :resolved_by, class_name: "User" + + validates :resolved_by, presence: true, if: :resolved? + + # Keep this scope in sync with the logic in `#resolvable?` in `Note` subclasses that are resolvable + scope :resolvable, -> { where(type: %w(DiffNote DiscussionNote)).user.where(noteable_type: 'MergeRequest') } + scope :resolved, -> { resolvable.where.not(resolved_at: nil) } + scope :unresolved, -> { resolvable.where(resolved_at: nil) } + end + + module ClassMethods + # This method must be kept in sync with `#resolve!` + def resolve!(current_user) + unresolved.update_all(resolved_at: Time.now, resolved_by_id: current_user.id) + end + + # This method must be kept in sync with `#unresolve!` + def unresolve! + resolved.update_all(resolved_at: nil, resolved_by_id: nil) + end + end + + # If you update this method remember to also update the scope `resolvable` + def resolvable? + to_discussion.potentially_resolvable? && !system? + end + + def resolved? + return false unless resolvable? + + self.resolved_at.present? + end + + def to_be_resolved? + resolvable? && !resolved? + end + + # If you update this method remember to also update `.resolve!` + def resolve!(current_user) + return unless resolvable? + return if resolved? + + self.resolved_at = Time.now + self.resolved_by = current_user + save! + end + + # If you update this method remember to also update `.unresolve!` + def unresolve! + return unless resolvable? + return unless resolved? + + self.resolved_at = nil + self.resolved_by = nil + save! + end +end diff --git a/app/models/diff_discussion.rb b/app/models/diff_discussion.rb new file mode 100644 index 00000000000..9a934c7520c --- /dev/null +++ b/app/models/diff_discussion.rb @@ -0,0 +1,69 @@ +class DiffDiscussion < Discussion + NUMBER_OF_TRUNCATED_DIFF_LINES = 16 + + delegate :line_code, + :original_line_code, + :diff_file, + :for_line?, + :active?, + + to: :first_note + + delegate :blob, + :highlighted_diff_lines, + :diff_lines, + + to: :diff_file, + allow_nil: true + + def self.build_discussion_id(note) + [*super(note), *unique_position_identifier(note)] + end + + def self.build_original_discussion_id(note) + [*Discussion.build_discussion_id(note), *note.original_position.key] + end + + def self.unique_position_identifier(note) + note.position.key + end + + def diff_discussion? + true + end + + def legacy_diff_discussion? + false + end + + def active? + return @active if @active.present? + + @active = first_note.active? + end + MEMOIZED_VALUES << :active + + def reply_attributes + super.merge(first_note.diff_attributes) + end + + # Returns an array of at most 16 highlighted lines above a diff note + def truncated_diff_lines(highlight: true) + lines = highlight ? highlighted_diff_lines : diff_lines + prev_lines = [] + + lines.each do |line| + if line.meta? + prev_lines.clear + else + prev_lines << line + + break if for_line?(line) + + prev_lines.shift if prev_lines.length >= NUMBER_OF_TRUNCATED_DIFF_LINES + end + end + + prev_lines + end +end diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index 895a91139c9..e5f437f8647 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -9,58 +9,44 @@ class DiffNote < Note validates :diff_line, presence: true validates :line_code, presence: true, line_code: true validates :noteable_type, inclusion: { in: %w(Commit MergeRequest) } - validates :resolved_by, presence: true, if: :resolved? validate :positions_complete validate :verify_supported - # Keep this scope in sync with the logic in `#resolvable?` - scope :resolvable, -> { user.where(noteable_type: 'MergeRequest') } - scope :resolved, -> { resolvable.where.not(resolved_at: nil) } - scope :unresolved, -> { resolvable.where(resolved_at: nil) } - - after_initialize :ensure_original_discussion_id before_validation :set_original_position, :update_position, on: :create - before_validation :set_line_code, :set_original_discussion_id + before_validation :set_line_code # We need to do this again, because it's already in `Note`, but is affected by # `update_position` and needs to run after that. - before_validation :set_discussion_id + before_validation :set_discussion_id, if: :position_changed? after_save :keep_around_commits - class << self - def build_discussion_id(noteable_type, noteable_id, position) - [super(noteable_type, noteable_id), *position.key].join("-") - end - - # This method must be kept in sync with `#resolve!` - def resolve!(current_user) - unresolved.update_all(resolved_at: Time.now, resolved_by_id: current_user.id) - end - - # This method must be kept in sync with `#unresolve!` - def unresolve! - resolved.update_all(resolved_at: nil, resolved_by_id: nil) - end - end - def new_diff_note? true end - def diff_attributes - { position: position.to_json } + def discussion_class(*) + DiffDiscussion end - def position=(new_position) - if new_position.is_a?(String) - new_position = JSON.parse(new_position) rescue nil - end + def diff_attributes + { + original_position: original_position.to_json, + position: position.to_json, + } + end - if new_position.is_a?(Hash) - new_position = new_position.with_indifferent_access - new_position = Gitlab::Diff::Position.new(new_position) - end + %i(original_position= position=).each do |meth| + define_method meth do |new_position| + if new_position.is_a?(String) + new_position = JSON.parse(new_position) rescue nil + end - super(new_position) + if new_position.is_a?(Hash) + new_position = new_position.with_indifferent_access + new_position = Gitlab::Diff::Position.new(new_position) + end + + super(new_position) + end end def diff_file @@ -88,43 +74,6 @@ class DiffNote < Note self.position.diff_refs == diff_refs end - # If you update this method remember to also update the scope `resolvable` - def resolvable? - !system? && for_merge_request? - end - - def resolved? - return false unless resolvable? - - self.resolved_at.present? - end - - # If you update this method remember to also update `.resolve!` - def resolve!(current_user) - return unless resolvable? - return if resolved? - - self.resolved_at = Time.now - self.resolved_by = current_user - save! - end - - # If you update this method remember to also update `.unresolve!` - def unresolve! - return unless resolvable? - return unless resolved? - - self.resolved_at = nil - self.resolved_by = nil - save! - end - - def discussion - return unless resolvable? - - self.noteable.find_diff_discussion(self.discussion_id) - end - private def supported? @@ -140,33 +89,13 @@ class DiffNote < Note end def set_original_position - self.original_position = self.position.dup + self.original_position = self.position.dup unless self.original_position&.complete? end def set_line_code self.line_code = self.position.line_code(self.project.repository) end - def ensure_original_discussion_id - return unless self.persisted? - return if self.original_discussion_id - - set_original_discussion_id - update_column(:original_discussion_id, self.original_discussion_id) - end - - def set_original_discussion_id - self.original_discussion_id = Digest::SHA1.hexdigest(build_original_discussion_id) - end - - def build_discussion_id - self.class.build_discussion_id(noteable_type, noteable_id || commit_id, position) - end - - def build_original_discussion_id - self.class.build_discussion_id(noteable_type, noteable_id || commit_id, original_position) - end - def update_position return unless supported? return if for_commit? diff --git a/app/models/discussion.rb b/app/models/discussion.rb index bbe813db823..314aea2c63a 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -1,5 +1,5 @@ class Discussion - NUMBER_OF_TRUNCATED_DIFF_LINES = 16 + MEMOIZED_VALUES = [] # rubocop:disable Style/MutableConstant attr_reader :notes @@ -11,12 +11,6 @@ class Discussion :for_commit?, :for_merge_request?, - :line_code, - :original_line_code, - :diff_file, - :for_line?, - :active?, - to: :first_note delegate :resolved_at, @@ -25,29 +19,46 @@ class Discussion to: :last_resolved_note, allow_nil: true - delegate :blob, - :highlighted_diff_lines, - :diff_lines, - - to: :diff_file, - allow_nil: true - - def self.for_notes(notes) - notes.group_by(&:discussion_id).values.map { |notes| new(notes) } + def self.build(notes, noteable = nil) + notes.first.discussion_class(noteable).new(notes, noteable) end - def self.for_diff_notes(notes) - notes.group_by(&:line_code).values.map { |notes| new(notes) } + def self.build_collection(notes, noteable = nil) + notes.group_by { |n| n.discussion_id(noteable) }.values.map { |notes| build(notes, noteable) } end - def initialize(notes) + def self.discussion_id(note) + Digest::SHA1.hexdigest(build_discussion_id(note).join("-")) + end + + # Optionally override the discussion ID at runtime depending on circumstances + def self.override_discussion_id(note) + nil + end + + def self.build_discussion_id(note) + noteable_id = note.noteable_id || note.commit_id + [:discussion, note.noteable_type.try(:underscore), noteable_id] + end + + def self.original_discussion_id(note) + original_discussion_id = build_original_discussion_id(note) + if original_discussion_id + Digest::SHA1.hexdigest(original_discussion_id.join("-")) + else + note.discussion_id + end + end + + # Optionally build a separate original discussion ID that will never change, + # if the main discussion ID _can_ change, like in the case of DiffDiscussion. + def self.build_original_discussion_id(note) + nil + end + + def initialize(notes, noteable = nil) @notes = notes - end - - def last_resolved_note - return unless resolved? - - @last_resolved_note ||= resolved_notes.sort_by(&:resolved_at).last + @noteable = noteable end def last_updated_at @@ -59,42 +70,64 @@ class Discussion end def id - first_note.discussion_id + first_note.discussion_id(noteable) end alias_method :to_param, :id - def diff_discussion? - first_note.diff_note? + def original_id + first_note.original_discussion_id end - def legacy_diff_discussion? - notes.any?(&:legacy_diff_note?) + def diff_discussion? + false + end + + def render_as_individual_notes? + false + end + + def potentially_resolvable? + first_note.for_merge_request? end def resolvable? return @resolvable if @resolvable.present? - @resolvable = diff_discussion? && notes.any?(&:resolvable?) + @resolvable = potentially_resolvable? && notes.any?(&:resolvable?) end + MEMOIZED_VALUES << :resolvable def resolved? return @resolved if @resolved.present? @resolved = resolvable? && notes.none?(&:to_be_resolved?) end + MEMOIZED_VALUES << :resolved def first_note - @first_note ||= @notes.first + @first_note ||= notes.first end + MEMOIZED_VALUES << :first_note def first_note_to_resolve - @first_note_to_resolve ||= notes.detect(&:to_be_resolved?) + return unless resolvable? + + @first_note_to_resolve ||= notes.find(&:to_be_resolved?) end + MEMOIZED_VALUES << :first_note_to_resolve + + def last_resolved_note + return unless resolved? + + @last_resolved_note ||= resolved_notes.sort_by(&:resolved_at).last + end + MEMOIZED_VALUES << :last_resolved_note def last_note - @last_note ||= @notes.last + @last_note ||= notes.last end + MEMOIZED_VALUES << :last_note def resolved_notes notes.select(&:resolved?) @@ -124,25 +157,12 @@ class Discussion update { |notes| notes.unresolve! } end - def for_target?(target) - self.noteable == target && !diff_discussion? - end - - def active? - return @active if @active.present? - - @active = first_note.active? - end - def collapsed? - return false unless diff_discussion? - if resolvable? # New diff discussions only disappear once they are marked resolved resolved? else - # Old diff discussions disappear once they become outdated - !active? + false end end @@ -151,52 +171,22 @@ class Discussion end def reply_attributes - data = { - noteable_type: first_note.noteable_type, - noteable_id: first_note.noteable_id, - commit_id: first_note.commit_id, - discussion_id: self.id, - } - - if diff_discussion? - data[:note_type] = first_note.type - - data.merge!(first_note.diff_attributes) - end - - data - end - - # Returns an array of at most 16 highlighted lines above a diff note - def truncated_diff_lines(highlight: true) - lines = highlight ? highlighted_diff_lines : diff_lines - prev_lines = [] - - lines.each do |line| - if line.meta? - prev_lines.clear - else - prev_lines << line - - break if for_line?(line) - - prev_lines.shift if prev_lines.length >= NUMBER_OF_TRUNCATED_DIFF_LINES - end - end - - prev_lines + first_note.slice(:type, :noteable_type, :noteable_id, :commit_id) end private def update - notes_relation = DiffNote.where(id: notes.map(&:id)).fresh + # Do not select `Note.resolvable`, so that system notes remain in the collection + notes_relation = Note.where(id: notes.map(&:id)) + yield(notes_relation) # Set the notes array to the updated notes - @notes = notes_relation.to_a + @notes = notes_relation.fresh.to_a - # Reset the memoized values - @last_resolved_note = @resolvable = @resolved = @first_note = @last_note = nil + MEMOIZED_VALUES.each do |var| + instance_variable_set(:"@#{var}", nil) + end end end diff --git a/app/models/discussion_note.rb b/app/models/discussion_note.rb new file mode 100644 index 00000000000..fc168ae74a9 --- /dev/null +++ b/app/models/discussion_note.rb @@ -0,0 +1,9 @@ +class DiscussionNote < Note + NOTEABLE_TYPES = %w(MergeRequest).freeze + + validates :noteable_type, inclusion: { in: NOTEABLE_TYPES } + + def discussion_class(*) + SimpleDiscussion + end +end diff --git a/app/models/individual_note_discussion.rb b/app/models/individual_note_discussion.rb new file mode 100644 index 00000000000..8c82d217126 --- /dev/null +++ b/app/models/individual_note_discussion.rb @@ -0,0 +1,13 @@ +class IndividualNoteDiscussion < Discussion + def self.build_discussion_id(note) + [*super(note), SecureRandom.hex] + end + + def potentially_resolvable? + false + end + + def render_as_individual_notes? + true + end +end diff --git a/app/models/issue.rb b/app/models/issue.rb index 472796df9df..5010b6e1edf 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -3,6 +3,7 @@ require 'carrierwave/orm/activerecord' class Issue < ActiveRecord::Base include InternalId include Issuable + include Noteable include Referable include Sortable include Spammable diff --git a/app/models/legacy_diff_discussion.rb b/app/models/legacy_diff_discussion.rb new file mode 100644 index 00000000000..e13f17abdbe --- /dev/null +++ b/app/models/legacy_diff_discussion.rb @@ -0,0 +1,21 @@ +class LegacyDiffDiscussion < DiffDiscussion + def self.unique_position_identifier(note) + note.line_code + end + + def self.build_original_discussion_id(note) + Discussion.build_original_discussion_id(note) + end + + def legacy_diff_discussion? + true + end + + def potentially_resolvable? + false + end + + def collapsed? + !active? + end +end diff --git a/app/models/legacy_diff_note.rb b/app/models/legacy_diff_note.rb index 40277a9b139..4952a1ce2ca 100644 --- a/app/models/legacy_diff_note.rb +++ b/app/models/legacy_diff_note.rb @@ -7,10 +7,8 @@ class LegacyDiffNote < Note before_create :set_diff - class << self - def build_discussion_id(noteable_type, noteable_id, line_code) - [super(noteable_type, noteable_id), line_code].join("-") - end + def discussion_class(*) + LegacyDiffDiscussion end def legacy_diff_note? @@ -119,8 +117,4 @@ class LegacyDiffNote < Note diffs = noteable.raw_diffs(Commit.max_diff_options) diffs.find { |d| d.new_path == self.diff.new_path } end - - def build_discussion_id - self.class.build_discussion_id(noteable_type, noteable_id || commit_id, line_code) - end end diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 8d740adb771..546fd2b8e35 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1,6 +1,7 @@ class MergeRequest < ActiveRecord::Base include InternalId include Issuable + include Noteable include Referable include Sortable @@ -475,44 +476,32 @@ class MergeRequest < ActiveRecord::Base ) end - def discussions - @discussions ||= self.related_notes. - inc_relations_for_view. - fresh. - discussions - end - - def diff_discussions - @diff_discussions ||= self.notes.diff_notes.discussions - end + alias_method :discussion_notes, :related_notes def resolvable_discussions - @resolvable_discussions ||= diff_discussions.select(&:to_be_resolved?) - end - - def discussions_can_be_resolved_by?(user) - resolvable_discussions.all? { |discussion| discussion.can_resolve?(user) } - end - - def find_diff_discussion(discussion_id) - notes = self.notes.diff_notes.where(discussion_id: discussion_id).fresh.to_a - return if notes.empty? - - Discussion.new(notes) + @resolvable_discussions ||= notes.resolvable.discussions end def discussions_resolvable? - diff_discussions.any?(&:resolvable?) + resolvable_discussions.any?(&:resolvable?) end def discussions_resolved? - discussions_resolvable? && diff_discussions.none?(&:to_be_resolved?) + discussions_resolvable? && resolvable_discussions.none?(&:to_be_resolved?) end def discussions_to_be_resolved? discussions_resolvable? && !discussions_resolved? end + def discussions_to_be_resolved + @discussions_to_be_resolved ||= resolvable_discussions.select(&:to_be_resolved?) + end + + def discussions_can_be_resolved_by?(user) + discussions_to_be_resolved.all? { |discussion| discussion.can_resolve?(user) } + end + def mergeable_discussions_state? return true unless project.only_allow_merge_if_all_discussions_are_resolved? diff --git a/app/models/note.rb b/app/models/note.rb index 16d66cb1427..6385747b571 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -8,6 +8,7 @@ class Note < ActiveRecord::Base include FasterCacheKeys include CacheMarkdownField include AfterCommitQueue + include ResolvableNote cache_markdown_field :note, pipeline: :note @@ -32,9 +33,6 @@ class Note < ActiveRecord::Base belongs_to :author, class_name: "User" belongs_to :updated_by, class_name: "User" - # Only used by DiffNote, but defined here so that it can be used in `Note.includes` - belongs_to :resolved_by, class_name: "User" - has_many :todos, dependent: :destroy has_many :events, as: :target, dependent: :destroy has_one :system_note_metadata @@ -54,6 +52,7 @@ class Note < ActiveRecord::Base validates :noteable_id, presence: true, unless: [:for_commit?, :importing?] validates :commit_id, presence: true, if: :for_commit? validates :author, presence: true + validates :discussion_id, :original_discussion_id, presence: true, format: { with: /\A\h{40}\z/ } validate unless: [:for_commit?, :importing?, :for_personal_snippet?] do |note| unless note.noteable.try(:project) == note.project @@ -76,7 +75,7 @@ class Note < ActiveRecord::Base end scope :diff_notes, ->{ where(type: %w(LegacyDiffNote DiffNote)) } - scope :non_diff_notes, ->{ where(type: ['Note', nil]) } + scope :non_diff_notes, ->{ where(type: ['Note', 'DiscussionNote', nil]) } scope :with_associations, -> do # FYI noteable cannot be loaded for LegacyDiffNote for commits @@ -84,9 +83,9 @@ class Note < ActiveRecord::Base project: [:project_members, { group: [:group_members] }]) end - after_initialize :ensure_discussion_id + after_initialize :ensure_discussion_id, :ensure_original_discussion_id before_validation :nullify_blank_type, :nullify_blank_line_code - before_validation :set_discussion_id + before_validation :set_discussion_id, :set_original_discussion_id, on: :create after_save :keep_around_commit, unless: :for_personal_snippet? after_save :expire_etag_cache @@ -95,22 +94,31 @@ class Note < ActiveRecord::Base ActiveModel::Name.new(self, nil, 'note') end - def build_discussion_id(noteable_type, noteable_id) - [:discussion, noteable_type.try(:underscore), noteable_id].join("-") + def discussions(noteable = nil) + Discussion.build_collection(fresh, noteable) end - def discussion_id(*args) - Digest::SHA1.hexdigest(build_discussion_id(*args)) + def find_original_discussion(discussion_id) + note = find_by(original_discussion_id: discussion_id) + return unless note + + note.to_discussion end - def discussions - Discussion.for_notes(fresh) + def find_discussion(discussion_id) + notes = where(discussion_id: discussion_id).fresh.to_a + return if notes.empty? + + Discussion.build(notes) end def grouped_diff_discussions - active_notes = diff_notes.fresh.select(&:active?) - Discussion.for_diff_notes(active_notes). - map { |d| [d.line_code, d] }.to_h + diff_notes. + fresh. + select(&:active?). + group_by(&:line_code). + map { |line_code, notes| [line_code, DiffDiscussion.build(notes)] }. + to_h end def count_for_collection(ids, type) @@ -121,7 +129,7 @@ class Note < ActiveRecord::Base end def cross_reference? - system && SystemNoteService.cross_reference?(note) + system? && SystemNoteService.cross_reference?(note) end def diff_note? @@ -140,18 +148,6 @@ class Note < ActiveRecord::Base true end - def resolvable? - false - end - - def resolved? - false - end - - def to_be_resolved? - resolvable? && !resolved? - end - def max_attachment_size current_application_settings.max_attachment_size.megabytes.to_i end @@ -228,7 +224,7 @@ class Note < ActiveRecord::Base end def can_be_award_emoji? - noteable.is_a?(Awardable) + noteable.is_a?(Awardable) && !part_of_discussion? end def contains_emoji_only? @@ -239,6 +235,42 @@ class Note < ActiveRecord::Base for_personal_snippet? ? 'personal_snippet' : noteable_type.underscore end + def can_be_discussion_note? + DiscussionNote::NOTEABLE_TYPES.include?(self.noteable_type) + end + + def discussion_class(noteable = nil) + # When commit notes are rendered on an MR's Discussion page, they are + # displayed in one discussion instead of individually + if noteable && noteable != self.noteable && for_commit? + CommitDiscussion + else + IndividualNoteDiscussion + end + end + + def discussion_id(noteable = nil) + discussion_class(noteable).override_discussion_id(self) || super() + end + + # Returns a discussion containing just this note + def to_discussion(noteable = nil) + Discussion.build([self], noteable) + end + + # Returns the entire discussion this note is part of + def discussion + if part_of_discussion? + self.noteable.notes.find_discussion(self.discussion_id) + else + to_discussion + end + end + + def part_of_discussion? + !to_discussion.render_as_individual_notes? + end + private def keep_around_commit @@ -264,17 +296,21 @@ class Note < ActiveRecord::Base end def set_discussion_id - self.discussion_id = Digest::SHA1.hexdigest(build_discussion_id) + self.discussion_id ||= discussion_class.discussion_id(self) end - def build_discussion_id - if for_merge_request? - # Notes on merge requests are always in a discussion of their own, - # so we generate a unique discussion ID. - [:discussion, :note, SecureRandom.hex].join("-") - else - self.class.build_discussion_id(noteable_type, noteable_id || commit_id) - end + def ensure_original_discussion_id + return unless self.persisted? + # Needed in case the SELECT statement doesn't ask for `original_discussion_id` + return unless self.has_attribute?(:original_discussion_id) + return if self.original_discussion_id + + set_original_discussion_id + update_column(:original_discussion_id, self.original_discussion_id) + end + + def set_original_discussion_id + self.original_discussion_id = discussion_class.original_discussion_id(self) end def expire_etag_cache diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb index f4bcb49b34d..6770af6fffd 100644 --- a/app/models/sent_notification.rb +++ b/app/models/sent_notification.rb @@ -5,10 +5,11 @@ class SentNotification < ActiveRecord::Base belongs_to :noteable, polymorphic: true belongs_to :recipient, class_name: "User" - validates :project, :recipient, :reply_key, presence: true - validates :reply_key, uniqueness: true + validates :project, :recipient, presence: true + validates :reply_key, presence: true, uniqueness: true validates :noteable_id, presence: true, unless: :for_commit? validates :commit_id, presence: true, if: :for_commit? + validates :in_reply_to_discussion_id, format: { with: /\A\h{40}\z/, allow_nil: true } validate :note_valid after_save :keep_around_commit @@ -34,23 +35,20 @@ class SentNotification < ActiveRecord::Base end attrs.reverse_merge!( - project: noteable.project, - noteable_type: noteable.class.name, - noteable_id: noteable_id, - commit_id: commit_id, - recipient_id: recipient_id, - reply_key: reply_key + project: noteable.project, + recipient_id: recipient_id, + reply_key: reply_key, + + noteable_type: noteable.class.name, + noteable_id: noteable_id, + commit_id: commit_id, ) create(attrs) end def record_note(note, recipient_id, reply_key, attrs = {}) - if note.diff_note? - attrs[:note_type] = note.type - - attrs.merge!(note.diff_attributes) - end + attrs[:in_reply_to_discussion_id] = note.original_discussion_id record(note.noteable, recipient_id, reply_key, attrs) end @@ -89,31 +87,34 @@ class SentNotification < ActiveRecord::Base self.reply_key end - def note_attributes - { - project: self.project, - author: self.recipient, - type: self.note_type, - noteable_type: self.noteable_type, - noteable_id: self.noteable_id, - commit_id: self.commit_id, - line_code: self.line_code, - position: self.position.to_json + def note_params + attrs = { + noteable_type: self.noteable_type, + noteable_id: self.noteable_id, + commit_id: self.commit_id } - end - def create_note(note) - Notes::CreateService.new( - self.project, - self.recipient, - self.note_attributes.merge(note: note) - ).execute + if self.in_reply_to_discussion_id.present? + attrs[:in_reply_to_discussion_id] = self.in_reply_to_discussion_id + else + attrs.merge!( + type: self.note_type, + + # LegacyDiffNote + line_code: self.line_code, + + # DiffNote + position: self.position.to_json + ) + end + + attrs end private def note_valid - Note.new(note_attributes.merge(note: "Test")).valid? + Notes::BuildService.new(self.project, self.recipient, note_params.merge(note: 'Test')).execute.valid? end def keep_around_commit diff --git a/app/models/simple_discussion.rb b/app/models/simple_discussion.rb new file mode 100644 index 00000000000..a5ef5c565e7 --- /dev/null +++ b/app/models/simple_discussion.rb @@ -0,0 +1,9 @@ +class SimpleDiscussion < Discussion + def self.build_discussion_id(note) + [*super(note), SecureRandom.hex] + end + + def reply_attributes + super.merge(discussion_id: self.id) + end +end diff --git a/app/models/snippet.rb b/app/models/snippet.rb index 30aca62499c..380835707e8 100644 --- a/app/models/snippet.rb +++ b/app/models/snippet.rb @@ -2,6 +2,7 @@ class Snippet < ActiveRecord::Base include Gitlab::VisibilityLevel include Linguist::BlobHelper include CacheMarkdownField + include Noteable include Participable include Referable include Sortable diff --git a/app/services/concerns/issues/resolve_discussions.rb b/app/services/concerns/issues/resolve_discussions.rb index 297c7d696c3..378967f0231 100644 --- a/app/services/concerns/issues/resolve_discussions.rb +++ b/app/services/concerns/issues/resolve_discussions.rb @@ -25,7 +25,7 @@ module Issues Array(discussion_or_nil) else merge_request_to_resolve_discussions_of - .resolvable_discussions + .discussions_to_be_resolved end end end diff --git a/app/services/notes/build_service.rb b/app/services/notes/build_service.rb new file mode 100644 index 00000000000..47ed3e3fc3d --- /dev/null +++ b/app/services/notes/build_service.rb @@ -0,0 +1,29 @@ +module Notes + class BuildService < BaseService + def execute + # TODO: Remove when we use a selectbox instead of a submit button + params[:type] = DiscussionNote.name if params.delete(:new_discussion) + + in_reply_to_discussion_id = params.delete(:in_reply_to_discussion_id) + if project && in_reply_to_discussion_id.present? + discussion = + project.notes.find_original_discussion(in_reply_to_discussion_id) || + project.notes.find_discussion(in_reply_to_discussion_id) + + unless discussion + note = Note.new + note.errors.add(:base, 'Discussion to reply to cannot be found') + return note + end + + params.merge!(discussion.reply_attributes) + end + + note = Note.new(params) + note.project = project + note.author = current_user + + note + end + end +end diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index 61d66a26932..c08cddcbee5 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -3,10 +3,8 @@ module Notes def execute merge_request_diff_head_sha = params.delete(:merge_request_diff_head_sha) - note = Note.new(params) - note.project = project - note.author = current_user - note.system = false + note = Notes::BuildService.new(project, current_user, params).execute + return note unless note.valid? # We execute commands (extracted from `params[:note]`) on the noteable # **before** we save the note because if the note consists of commands diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index 35cfcc3682e..c9e25c7aaa2 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -228,12 +228,10 @@ module SystemNoteService def discussion_continued_in_issue(discussion, project, author, issue) body = "created #{issue.to_reference} to continue this discussion" + note_attributes = discussion.reply_attributes.merge(project: project, author: author, note: body) - note_params = discussion.reply_attributes.merge(project: project, author: author, note: body) - note_params[:type] = note_params.delete(:note_type) - - note = Note.create(note_params.merge(system: true)) - note.system_note_metadata = SystemNoteMetadata.new({ action: 'discussion' }) + note = Note.create(note_attributes.merge(system: true)) + note.system_note_metadata = SystemNoteMetadata.new(action: 'discussion') note end diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index 2d78c55211e..38112f67881 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -18,19 +18,21 @@ .inline.discussion-headline-light = discussion.author.to_reference - started a discussion on + started a discussion - - if discussion.for_commit? + - if discussion.for_commit? && @noteable != discussion.noteable + on - commit = discussion.noteable - if commit commit - = link_to commit.short_id, namespace_project_commit_path(discussion.project.namespace, discussion.project, discussion.noteable, anchor: discussion.line_code), class: 'monospace' + - anchor = discussion.line_code if discussion.diff_discussion? + = link_to commit.short_id, namespace_project_commit_path(discussion.project.namespace, discussion.project, discussion.noteable, anchor: anchor), class: 'monospace' - else a deleted commit - - else + - elsif discussion.diff_discussion? + on - if discussion.active? - = link_to diffs_namespace_project_merge_request_path(discussion.project.namespace, discussion.project, discussion.noteable, anchor: discussion.line_code) do - the diff + = link_to 'the diff', discussion_diff_path(discussion) - else an outdated diff diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index 2789391819c..c8fcc37d1ab 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -1,18 +1,19 @@ -%ul.notes{ data: { discussion_id: discussion.id } } +%ul.notes{ data: { discussion_id: discussion.id, original_discussion_id: discussion.original_id } } = render partial: "projects/notes/note", collection: discussion.notes, as: :note - if current_user .discussion-reply-holder - - if discussion.diff_discussion? + - if discussion.potentially_resolvable? - line_type = local_assigns.fetch(:line_type, nil) .btn-group-justified.discussion-with-resolve-btn{ role: "group" } .btn-group{ role: "group" } = link_to_reply_discussion(discussion, line_type) + = render "discussions/resolve_all", discussion: discussion - - if discussion.for_merge_request? - .btn-group.discussion-actions - = render "discussions/new_issue_for_discussion", discussion: discussion, merge_request: discussion.noteable - = render "discussions/jump_to_next", discussion: discussion + + .btn-group.discussion-actions + = render "discussions/new_issue_for_discussion", discussion: discussion, merge_request: discussion.noteable + = render "discussions/jump_to_next", discussion: discussion - else = link_to_reply_discussion(discussion) diff --git a/app/views/discussions/_resolve_all.html.haml b/app/views/discussions/_resolve_all.html.haml index e30ee1b0e05..689a22acd27 100644 --- a/app/views/discussions/_resolve_all.html.haml +++ b/app/views/discussions/_resolve_all.html.haml @@ -1,9 +1,8 @@ -- if discussion.for_merge_request? - %resolve-discussion-btn{ ":discussion-id" => "'#{discussion.id}'", - ":merge-request-id" => discussion.noteable.iid, - ":can-resolve" => discussion.can_resolve?(current_user), - "inline-template" => true } - .btn-group{ role: "group", "v-if" => "showButton" } - %button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading", "v-cloak" => "true" } - = icon("spinner spin", "v-show" => "loading") - {{ buttonText }} +%resolve-discussion-btn{ ":discussion-id" => "'#{discussion.id}'", + ":merge-request-id" => discussion.noteable.iid, + ":can-resolve" => discussion.can_resolve?(current_user), + "inline-template" => true } + .btn-group{ role: "group", "v-if" => "showButton" } + %button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading", "v-cloak" => "true" } + = icon("spinner spin", "v-show" => "loading") + {{ buttonText }} diff --git a/app/views/projects/commit/show.html.haml b/app/views/projects/commit/show.html.haml index d5fc283aa8d..0d11da2451a 100644 --- a/app/views/projects/commit/show.html.haml +++ b/app/views/projects/commit/show.html.haml @@ -10,6 +10,7 @@ - else .block-connector = render "projects/diffs/diffs", diffs: @diffs, environment: @environment + = render "projects/notes/notes_with_form" - if can_collaborate_with_project? - %w(revert cherry-pick).each do |type| diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index b561052e721..80db16ea578 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -4,12 +4,18 @@ = hidden_field_tag :view, diff_view = hidden_field_tag :line_type = hidden_field_tag :merge_request_diff_head_sha, @note.noteable.try(:diff_head_sha) + = hidden_field_tag :in_reply_to_discussion_id + = note_target_fields(@note) - = f.hidden_field :commit_id - = f.hidden_field :line_code - = f.hidden_field :noteable_id = f.hidden_field :noteable_type + = f.hidden_field :noteable_id + = f.hidden_field :commit_id = f.hidden_field :type + + -# LegacyDiffNote + = f.hidden_field :line_code + + -# DiffNote = f.hidden_field :position = render layout: 'projects/md_preview', locals: { preview_class: "md-preview", referenced_users: true } do @@ -23,6 +29,11 @@ .note-form-actions.clearfix = f.submit 'Comment', class: "btn btn-nr btn-create append-right-10 comment-btn js-comment-button" + + - if @note.can_be_discussion_note? + = submit_tag 'Start discussion', name: 'new_discussion', class: "btn btn-nr append-right-10 btn-inverted js-note-new-discussion" + = yield(:note_actions) + %a.btn.btn-cancel.js-note-discard{ role: "button", data: {cancel_text: "Cancel" } } Discard draft diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 6c0e6d48d6c..097dd17c094 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -31,7 +31,7 @@ - if note.resolvable? - can_resolve = can?(current_user, :resolve_note, note) %resolve-btn{ "project-path" => project_path(note.project), - "discussion-id" => note.discussion_id, + "discussion-id" => note.discussion_id(@noteable), ":note-id" => note.id, ":resolved" => note.resolved?, ":can-resolve" => can_resolve, diff --git a/app/views/projects/notes/_notes.html.haml b/app/views/projects/notes/_notes.html.haml index 022578bd6db..50809068453 100644 --- a/app/views/projects/notes/_notes.html.haml +++ b/app/views/projects/notes/_notes.html.haml @@ -1,7 +1,7 @@ - if @discussions.present? - @discussions.each do |discussion| - - if discussion.for_target?(@noteable) - = render partial: "projects/notes/note", object: discussion.first_note, as: :note + - if discussion.render_as_individual_notes? + = render partial: "projects/notes/note", collection: discussion.notes, as: :note - else = render 'discussions/discussion', discussion: discussion - else diff --git a/changelogs/unreleased/new-resolvable-discussion.yml b/changelogs/unreleased/new-resolvable-discussion.yml new file mode 100644 index 00000000000..af1de6a45e7 --- /dev/null +++ b/changelogs/unreleased/new-resolvable-discussion.yml @@ -0,0 +1,4 @@ +--- +title: Add option to start a new resolvable discussion in an MR +merge_request: +author: diff --git a/db/migrate/20161128095517_add_in_reply_to_discussion_id_to_sent_notifications.rb b/db/migrate/20161128095517_add_in_reply_to_discussion_id_to_sent_notifications.rb new file mode 100644 index 00000000000..d56d83ca1d3 --- /dev/null +++ b/db/migrate/20161128095517_add_in_reply_to_discussion_id_to_sent_notifications.rb @@ -0,0 +1,29 @@ +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddInReplyToDiscussionIdToSentNotifications < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + # Set this constant to true if this migration requires downtime. + DOWNTIME = false + + # When a migration requires downtime you **must** uncomment the following + # constant and define a short and easy to understand explanation as to why the + # migration requires downtime. + # DOWNTIME_REASON = '' + + # When using the methods "add_concurrent_index" or "add_column_with_default" + # you must disable the use of transactions as these methods can not run in an + # existing transaction. When using "add_concurrent_index" make sure that this + # method is the _only_ method called in the migration, any other changes + # should go in a separate migration. This ensures that upon failure _only_ the + # index creation fails and can be retried or reverted easily. + # + # To disable transactions uncomment the following line and remove these + # comments: + # disable_ddl_transaction! + + def change + add_column :sent_notifications, :in_reply_to_discussion_id, :string + end +end diff --git a/db/migrate/20170308220217_add_index_to_note_original_discussion_id.rb b/db/migrate/20170308220217_add_index_to_note_original_discussion_id.rb new file mode 100644 index 00000000000..2c823ed84a9 --- /dev/null +++ b/db/migrate/20170308220217_add_index_to_note_original_discussion_id.rb @@ -0,0 +1,18 @@ +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddIndexToNoteOriginalDiscussionId < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_concurrent_index :notes, :original_discussion_id + end + + def down + remove_index :notes, :original_discussion_id if index_exists? :notes, :original_discussion_id + end +end diff --git a/db/schema.rb b/db/schema.rb index ccf18d07179..1b23bab5af2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -736,6 +736,7 @@ ActiveRecord::Schema.define(version: 20170402231018) do add_index "notes", ["note"], name: "index_notes_on_note_trigram", using: :gin, opclasses: {"note"=>"gin_trgm_ops"} add_index "notes", ["noteable_id", "noteable_type"], name: "index_notes_on_noteable_id_and_noteable_type", using: :btree add_index "notes", ["noteable_type"], name: "index_notes_on_noteable_type", using: :btree + add_index "notes", ["original_discussion_id"], name: "index_notes_on_original_discussion_id", using: :btree add_index "notes", ["project_id", "noteable_type"], name: "index_notes_on_project_id_and_noteable_type", using: :btree add_index "notes", ["updated_at"], name: "index_notes_on_updated_at", using: :btree @@ -999,6 +1000,7 @@ ActiveRecord::Schema.define(version: 20170402231018) do t.string "line_code" t.string "note_type" t.text "position" + t.string "in_reply_to_discussion_id" end add_index "sent_notifications", ["reply_key"], name: "index_sent_notifications_on_reply_key", unique: true, using: :btree diff --git a/lib/gitlab/email/handler/create_note_handler.rb b/lib/gitlab/email/handler/create_note_handler.rb index d87ba427f4b..0a9e928d13f 100644 --- a/lib/gitlab/email/handler/create_note_handler.rb +++ b/lib/gitlab/email/handler/create_note_handler.rb @@ -45,13 +45,7 @@ module Gitlab Notes::CreateService.new( project, author, - note: message, - noteable_type: sent_notification.noteable_type, - noteable_id: sent_notification.noteable_id, - commit_id: sent_notification.commit_id, - line_code: sent_notification.line_code, - position: sent_notification.position, - type: sent_notification.note_type + sent_notification.note_params.merge(note: message) ).execute end end diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb index b223a22ae60..9545b980fbf 100644 --- a/spec/controllers/projects/commit_controller_spec.rb +++ b/spec/controllers/projects/commit_controller_spec.rb @@ -266,7 +266,7 @@ describe Projects::CommitController do diff_for_path(id: commit2.id, old_path: existing_path, new_path: existing_path) expect(assigns(:diff_notes_disabled)).to be_falsey - expect(assigns(:comments_target)).to eq(noteable_type: 'Commit', + expect(assigns(:new_diff_note_attrs)).to eq(noteable_type: 'Commit', commit_id: commit2.id) end diff --git a/spec/controllers/projects/discussions_controller_spec.rb b/spec/controllers/projects/discussions_controller_spec.rb index 79ab364a6f3..fe62898fa9b 100644 --- a/spec/controllers/projects/discussions_controller_spec.rb +++ b/spec/controllers/projects/discussions_controller_spec.rb @@ -4,7 +4,7 @@ describe Projects::DiscussionsController do let(:user) { create(:user) } let(:merge_request) { create(:merge_request) } let(:project) { merge_request.source_project } - let(:note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project) } + let(:note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) } let(:discussion) { note.discussion } let(:request_params) do diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb index 734966d50b2..731e511c270 100644 --- a/spec/controllers/projects/issues_controller_spec.rb +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -508,7 +508,7 @@ describe Projects::IssuesController do end context 'resolving discussions in MergeRequest' do - let(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request)]).first } + let(:discussion) { create(:diff_note_on_merge_request).to_discussion } let(:merge_request) { discussion.noteable } let(:project) { merge_request.source_project } diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 72f41f7209a..6f8755645a1 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -574,7 +574,7 @@ describe Projects::MergeRequestsController do diff_for_path(id: merge_request.iid, old_path: existing_path, new_path: existing_path) expect(assigns(:diff_notes_disabled)).to be_falsey - expect(assigns(:comments_target)).to eq(noteable_type: 'MergeRequest', + expect(assigns(:new_diff_note_attrs)).to eq(noteable_type: 'MergeRequest', noteable_id: merge_request.id) end diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb index d80780b1d90..87084806568 100644 --- a/spec/controllers/projects/notes_controller_spec.rb +++ b/spec/controllers/projects/notes_controller_spec.rb @@ -14,7 +14,15 @@ describe Projects::NotesController do } end + describe 'GET index' do + # It renders the discussion partial for any threaded note + # TODO: Test + end + describe 'POST create' do + # Test :type, :new_discussion, :in_reply_to_discussion_id (in_reply_to_id?) + # TODO: Test + let(:merge_request) { create(:merge_request) } let(:project) { merge_request.source_project } let(:request_params) do @@ -49,7 +57,8 @@ describe Projects::NotesController do note: 'some note', noteable_id: merge_request.id.to_s, noteable_type: 'MergeRequest', - merge_request_diff_head_sha: 'sha' + merge_request_diff_head_sha: 'sha', + in_reply_to_discussion_id: nil } expect(Notes::CreateService).to receive(:new).with(project, user, service_params).and_return(double(execute: true)) diff --git a/spec/factories/discussions.rb b/spec/factories/discussions.rb new file mode 100644 index 00000000000..5e3a9b1e698 --- /dev/null +++ b/spec/factories/discussions.rb @@ -0,0 +1,5 @@ +FactoryGirl.define do + factory :discussion do + # TODO: Implement + end +end diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index fe19a404e16..755c6d7e031 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -16,6 +16,15 @@ FactoryGirl.define do factory :note_on_personal_snippet, traits: [:on_personal_snippet] factory :system_note, traits: [:system] + factory :discussion_note_on_merge_request, traits: [:on_merge_request], class: DiscussionNote do + association :project, :repository + + trait :resolved do + resolved_at { Time.now } + resolved_by { create(:user) } + end + end + factory :legacy_diff_note_on_commit, traits: [:on_commit, :legacy_diff_note], class: LegacyDiffNote do association :project, :repository end diff --git a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb index 572bca3de21..58f897cba3e 100644 --- a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb +++ b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb @@ -4,7 +4,7 @@ feature 'Resolving all open discussions in a merge request from an issue', featu let(:user) { create(:user) } let(:project) { create(:project) } let(:merge_request) { create(:merge_request, source_project: project) } - let!(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request, noteable: merge_request, project: project)]).first } + let!(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion } describe 'as a user with access to the project' do before do diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb index fab2d532e06..783f2e93909 100644 --- a/spec/features/notes_on_merge_requests_spec.rb +++ b/spec/features/notes_on_merge_requests_spec.rb @@ -25,7 +25,7 @@ describe 'Comments', feature: true do describe 'the note form' do it 'is valid' do is_expected.to have_css('.js-main-target-form', visible: true, count: 1) - expect(find('.js-main-target-form input[type=submit]').value). + expect(find('.js-main-target-form .js-comment-button').value). to eq('Comment') page.within('.js-main-target-form') do expect(page).not_to have_link('Cancel') diff --git a/spec/finders/notes_finder_spec.rb b/spec/finders/notes_finder_spec.rb index 77a04507be1..d2ec42ae70f 100644 --- a/spec/finders/notes_finder_spec.rb +++ b/spec/finders/notes_finder_spec.rb @@ -202,4 +202,8 @@ describe NotesFinder do end end end + + describe '#target' do + # TODO: Test + end end diff --git a/spec/models/commit_discussion_spec.rb b/spec/models/commit_discussion_spec.rb new file mode 100644 index 00000000000..6a5042d8827 --- /dev/null +++ b/spec/models/commit_discussion_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe CommitDiscussion, model: true do + # TODO: Test +end diff --git a/spec/models/concerns/noteable_spec.rb b/spec/models/concerns/noteable_spec.rb new file mode 100644 index 00000000000..51855fb2f0d --- /dev/null +++ b/spec/models/concerns/noteable_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe Noteable, model: true do + # TODO: Test +end diff --git a/spec/models/concerns/resolvable_note_spec.rb b/spec/models/concerns/resolvable_note_spec.rb new file mode 100644 index 00000000000..3306b311e4a --- /dev/null +++ b/spec/models/concerns/resolvable_note_spec.rb @@ -0,0 +1,276 @@ +require 'spec_helper' + +describe Note, ResolvableNote, models: true do + subject { create(:discussion_note_on_merge_request) } + + describe '.resolvable' do + # TODO: Test + end + + describe '.resolved' do + # TODO: Test + end + + describe '.unresolved' do + # TODO: Test + end + + describe ".resolve!" do + let(:current_user) { create(:user) } + let!(:commit_note) { create(:diff_note_on_commit) } + let!(:resolved_note) { create(:discussion_note_on_merge_request, :resolved) } + let!(:unresolved_note) { create(:discussion_note_on_merge_request) } + + before do + described_class.resolve!(current_user) + + commit_note.reload + resolved_note.reload + unresolved_note.reload + end + + it 'resolves only the resolvable, not yet resolved notes' do + expect(commit_note.resolved_at).to be_nil + expect(resolved_note.resolved_by).not_to eq(current_user) + expect(unresolved_note.resolved_at).not_to be_nil + expect(unresolved_note.resolved_by).to eq(current_user) + end + end + + describe ".unresolve!" do + let!(:resolved_note) { create(:discussion_note_on_merge_request, :resolved) } + + before do + described_class.unresolve! + + resolved_note.reload + end + + it 'unresolves the resolved notes' do + expect(resolved_note.resolved_by).to be_nil + expect(resolved_note.resolved_at).to be_nil + end + end + + describe '#resolvable?' do + context "when potentially resolvable" do + before do + allow(subject).to receive(:discussion_resolvable?).and_return(true) + end + + context "when a system note" do + before do + subject.system = true + end + + it "returns false" do + expect(subject.resolvable?).to be false + end + end + + context "when a regular note" do + it "returns true" do + expect(subject.resolvable?).to be true + end + end + end + + context "when not potentially resolvable" do + before do + allow(subject).to receive(:discussion_resolvable?).and_return(false) + end + + it "returns false" do + expect(subject.resolvable?).to be false + end + end + end + + describe "#to_be_resolved?" do + context "when not resolvable" do + before do + allow(subject).to receive(:resolvable?).and_return(false) + end + + it "returns false" do + expect(subject.to_be_resolved?).to be false + end + end + + context "when resolvable" do + before do + allow(subject).to receive(:resolvable?).and_return(true) + end + + context "when resolved" do + before do + allow(subject).to receive(:resolved?).and_return(true) + end + + it "returns false" do + expect(subject.to_be_resolved?).to be false + end + end + + context "when not resolved" do + before do + allow(subject).to receive(:resolved?).and_return(false) + end + + it "returns true" do + expect(subject.to_be_resolved?).to be true + end + end + end + end + + describe "#resolved?" do + # TODO: Test + end + + describe "#resolve!" do + let(:current_user) { create(:user) } + + context "when not resolvable" do + before do + allow(subject).to receive(:resolvable?).and_return(false) + end + + it "returns nil" do + expect(subject.resolve!(current_user)).to be_nil + end + + it "doesn't set resolved_at" do + subject.resolve!(current_user) + + expect(subject.resolved_at).to be_nil + end + + it "doesn't set resolved_by" do + subject.resolve!(current_user) + + expect(subject.resolved_by).to be_nil + end + + it "doesn't mark as resolved" do + subject.resolve!(current_user) + + expect(subject.resolved?).to be false + end + end + + context "when resolvable" do + before do + allow(subject).to receive(:resolvable?).and_return(true) + end + + context "when already resolved" do + let(:user) { create(:user) } + + before do + subject.resolve!(user) + end + + it "returns nil" do + expect(subject.resolve!(current_user)).to be_nil + end + + it "doesn't change resolved_at" do + expect(subject.resolved_at).not_to be_nil + + expect { subject.resolve!(current_user) }.not_to change { subject.resolved_at } + end + + it "doesn't change resolved_by" do + expect(subject.resolved_by).to eq(user) + + expect { subject.resolve!(current_user) }.not_to change { subject.resolved_by } + end + + it "doesn't change resolved status" do + expect(subject.resolved?).to be true + + expect { subject.resolve!(current_user) }.not_to change { subject.resolved? } + end + end + + context "when not yet resolved" do + it "returns true" do + expect(subject.resolve!(current_user)).to be true + end + + it "sets resolved_at" do + subject.resolve!(current_user) + + expect(subject.resolved_at).not_to be_nil + end + + it "sets resolved_by" do + subject.resolve!(current_user) + + expect(subject.resolved_by).to eq(current_user) + end + + it "marks as resolved" do + subject.resolve!(current_user) + + expect(subject.resolved?).to be true + end + end + end + end + + describe "#unresolve!" do + context "when not resolvable" do + before do + allow(subject).to receive(:resolvable?).and_return(false) + end + + it "returns nil" do + expect(subject.unresolve!).to be_nil + end + end + + context "when resolvable" do + before do + allow(subject).to receive(:resolvable?).and_return(true) + end + + context "when resolved" do + let(:user) { create(:user) } + + before do + subject.resolve!(user) + end + + it "returns true" do + expect(subject.unresolve!).to be true + end + + it "unsets resolved_at" do + subject.unresolve! + + expect(subject.resolved_at).to be_nil + end + + it "unsets resolved_by" do + subject.unresolve! + + expect(subject.resolved_by).to be_nil + end + + it "unmarks as resolved" do + subject.unresolve! + + expect(subject.resolved?).to be false + end + end + + context "when not resolved" do + it "returns nil" do + expect(subject.unresolve!).to be_nil + end + end + end + end +end diff --git a/spec/models/diff_discussion_spec.rb b/spec/models/diff_discussion_spec.rb new file mode 100644 index 00000000000..8f3a4a8cc49 --- /dev/null +++ b/spec/models/diff_discussion_spec.rb @@ -0,0 +1,24 @@ +require 'spec_helper' + +describe DiffDiscussion, model: true do + # TODO: Test + + describe "#truncated_diff_lines" do + let(:truncated_lines) { subject.truncated_diff_lines } + + context "when diff is greater than allowed number of truncated diff lines " do + it "returns fewer lines" do + expect(subject.diff_lines.count).to be > described_class::NUMBER_OF_TRUNCATED_DIFF_LINES + + expect(truncated_lines.count).to be <= described_class::NUMBER_OF_TRUNCATED_DIFF_LINES + end + end + + context "when some diff lines are meta" do + it "returns no meta lines" do + expect(subject.diff_lines).to include(be_meta) + expect(truncated_lines).not_to include(be_meta) + end + end + end +end diff --git a/spec/models/diff_note_spec.rb b/spec/models/diff_note_spec.rb index 9ea3a4b7020..92059936188 100644 --- a/spec/models/diff_note_spec.rb +++ b/spec/models/diff_note_spec.rb @@ -31,43 +31,6 @@ describe DiffNote, models: true do subject { create(:diff_note_on_merge_request, project: project, position: position, noteable: merge_request) } - describe ".resolve!" do - let(:current_user) { create(:user) } - let!(:commit_note) { create(:diff_note_on_commit) } - let!(:resolved_note) { create(:diff_note_on_merge_request, :resolved) } - let!(:unresolved_note) { create(:diff_note_on_merge_request) } - - before do - described_class.resolve!(current_user) - - commit_note.reload - resolved_note.reload - unresolved_note.reload - end - - it 'resolves only the resolvable, not yet resolved notes' do - expect(commit_note.resolved_at).to be_nil - expect(resolved_note.resolved_by).not_to eq(current_user) - expect(unresolved_note.resolved_at).not_to be_nil - expect(unresolved_note.resolved_by).to eq(current_user) - end - end - - describe ".unresolve!" do - let!(:resolved_note) { create(:diff_note_on_merge_request, :resolved) } - - before do - described_class.unresolve! - - resolved_note.reload - end - - it 'unresolves the resolved notes' do - expect(resolved_note.resolved_by).to be_nil - expect(resolved_note.resolved_at).to be_nil - end - end - describe "#position=" do context "when provided a string" do it "sets the position" do @@ -94,6 +57,10 @@ describe DiffNote, models: true do end end + describe "#original_position=" do + # TODO: Test + end + describe "#diff_file" do it "returns the correct diff file" do diff_file = subject.diff_file @@ -226,252 +193,6 @@ describe DiffNote, models: true do end end - describe "#resolvable?" do - context "when noteable is a commit" do - subject { create(:diff_note_on_commit, project: project, position: position) } - - it "returns false" do - expect(subject.resolvable?).to be false - end - end - - context "when noteable is a merge request" do - context "when a system note" do - before do - subject.system = true - end - - it "returns false" do - expect(subject.resolvable?).to be false - end - end - - context "when a regular note" do - it "returns true" do - expect(subject.resolvable?).to be true - end - end - end - end - - describe "#to_be_resolved?" do - context "when not resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(false) - end - - it "returns false" do - expect(subject.to_be_resolved?).to be false - end - end - - context "when resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(true) - end - - context "when resolved" do - before do - allow(subject).to receive(:resolved?).and_return(true) - end - - it "returns false" do - expect(subject.to_be_resolved?).to be false - end - end - - context "when not resolved" do - before do - allow(subject).to receive(:resolved?).and_return(false) - end - - it "returns true" do - expect(subject.to_be_resolved?).to be true - end - end - end - end - - describe "#resolve!" do - let(:current_user) { create(:user) } - - context "when not resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(false) - end - - it "returns nil" do - expect(subject.resolve!(current_user)).to be_nil - end - - it "doesn't set resolved_at" do - subject.resolve!(current_user) - - expect(subject.resolved_at).to be_nil - end - - it "doesn't set resolved_by" do - subject.resolve!(current_user) - - expect(subject.resolved_by).to be_nil - end - - it "doesn't mark as resolved" do - subject.resolve!(current_user) - - expect(subject.resolved?).to be false - end - end - - context "when resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(true) - end - - context "when already resolved" do - let(:user) { create(:user) } - - before do - subject.resolve!(user) - end - - it "returns nil" do - expect(subject.resolve!(current_user)).to be_nil - end - - it "doesn't change resolved_at" do - expect(subject.resolved_at).not_to be_nil - - expect { subject.resolve!(current_user) }.not_to change { subject.resolved_at } - end - - it "doesn't change resolved_by" do - expect(subject.resolved_by).to eq(user) - - expect { subject.resolve!(current_user) }.not_to change { subject.resolved_by } - end - - it "doesn't change resolved status" do - expect(subject.resolved?).to be true - - expect { subject.resolve!(current_user) }.not_to change { subject.resolved? } - end - end - - context "when not yet resolved" do - it "returns true" do - expect(subject.resolve!(current_user)).to be true - end - - it "sets resolved_at" do - subject.resolve!(current_user) - - expect(subject.resolved_at).not_to be_nil - end - - it "sets resolved_by" do - subject.resolve!(current_user) - - expect(subject.resolved_by).to eq(current_user) - end - - it "marks as resolved" do - subject.resolve!(current_user) - - expect(subject.resolved?).to be true - end - end - end - end - - describe "#unresolve!" do - context "when not resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(false) - end - - it "returns nil" do - expect(subject.unresolve!).to be_nil - end - end - - context "when resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(true) - end - - context "when resolved" do - let(:user) { create(:user) } - - before do - subject.resolve!(user) - end - - it "returns true" do - expect(subject.unresolve!).to be true - end - - it "unsets resolved_at" do - subject.unresolve! - - expect(subject.resolved_at).to be_nil - end - - it "unsets resolved_by" do - subject.unresolve! - - expect(subject.resolved_by).to be_nil - end - - it "unmarks as resolved" do - subject.unresolve! - - expect(subject.resolved?).to be false - end - end - - context "when not resolved" do - it "returns nil" do - expect(subject.unresolve!).to be_nil - end - end - end - end - - describe "#discussion" do - context "when not resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(false) - end - - it "returns nil" do - expect(subject.discussion).to be_nil - end - end - - context "when resolvable" do - let!(:diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: subject.position) } - let!(:diff_note3) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: active_position2) } - - let(:active_position2) do - Gitlab::Diff::Position.new( - old_path: "files/ruby/popen.rb", - new_path: "files/ruby/popen.rb", - old_line: 16, - new_line: 22, - diff_refs: merge_request.diff_refs - ) - end - - it "returns the discussion this note is in" do - discussion = subject.discussion - - expect(discussion.id).to eq(subject.discussion_id) - expect(discussion.notes).to eq([subject, diff_note2]) - end - end - end - describe "#discussion_id" do let(:note) { create(:diff_note_on_merge_request) } diff --git a/spec/models/discussion_note_spec.rb b/spec/models/discussion_note_spec.rb new file mode 100644 index 00000000000..d61ea05e318 --- /dev/null +++ b/spec/models/discussion_note_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe DiscussionNote, models: true do + # TODO: Test +end diff --git a/spec/models/discussion_spec.rb b/spec/models/discussion_spec.rb index bc32fadd391..f48450589d0 100644 --- a/spec/models/discussion_spec.rb +++ b/spec/models/discussion_spec.rb @@ -3,14 +3,34 @@ require 'spec_helper' describe Discussion, model: true do subject { described_class.new([first_note, second_note, third_note]) } - let(:first_note) { create(:diff_note_on_merge_request) } - let(:second_note) { create(:diff_note_on_merge_request) } - let(:third_note) { create(:diff_note_on_merge_request) } + let(:first_note) { create(:discussion_note_on_merge_request) } + let(:second_note) { create(:discussion_note_on_merge_request) } + let(:third_note) { create(:discussion_note_on_merge_request) } + + describe '.build' do + # TODO: Test + end + + describe '.build_collection' do + # TODO: Test + end + + describe '#id' do + # TODO: Test + end + + describe '#original_id' do + # TODO: Test + end + + describe '#potentially_resolvable?' do + # TODO: Test + end describe "#resolvable?" do - context "when a diff discussion" do + context "when potentially resolvable" do before do - allow(subject).to receive(:diff_discussion?).and_return(true) + allow(subject).to receive(:discussion_resolvable?).and_return(true) end context "when all notes are unresolvable" do @@ -50,9 +70,9 @@ describe Discussion, model: true do end end - context "when not a diff discussion" do + context "when not potentially resolvable" do before do - allow(subject).to receive(:diff_discussion?).and_return(false) + allow(subject).to receive(:discussion_resolvable?).and_return(false) end it "returns false" do @@ -530,10 +550,14 @@ describe Discussion, model: true do end end + describe "#last_resolved_note" do + # TODO: Test + end + describe "#collapsed?" do - context "when a diff discussion" do + context "when potentially resolvable" do before do - allow(subject).to receive(:diff_discussion?).and_return(true) + allow(subject).to receive(:discussion_resolvable?).and_return(true) end context "when resolvable" do @@ -567,31 +591,43 @@ describe Discussion, model: true do allow(subject).to receive(:resolvable?).and_return(false) end - context "when active" do + context "when a diff discussion" do before do - allow(subject).to receive(:active?).and_return(true) + allow(subject).to receive(:diff_discussion?).and_return(true) end - it "returns false" do - expect(subject.collapsed?).to be false + context "when active" do + before do + allow(subject).to receive(:active?).and_return(true) + end + + it "returns false" do + expect(subject.collapsed?).to be false + end + end + + context "when outdated" do + before do + allow(subject).to receive(:active?).and_return(false) + end + + it "returns true" do + expect(subject.collapsed?).to be true + end end end - context "when outdated" do - before do - allow(subject).to receive(:active?).and_return(false) - end - - it "returns true" do - expect(subject.collapsed?).to be true + context "when not a diff discussion" do + it "returns false" do + expect(subject.collapsed?).to be false end end end end - context "when not a diff discussion" do + context "when not potentially resolvable" do before do - allow(subject).to receive(:diff_discussion?).and_return(false) + allow(subject).to receive(:discussion_resolvable?).and_return(false) end it "returns false" do @@ -599,23 +635,4 @@ describe Discussion, model: true do end end end - - describe "#truncated_diff_lines" do - let(:truncated_lines) { subject.truncated_diff_lines } - - context "when diff is greater than allowed number of truncated diff lines " do - it "returns fewer lines" do - expect(subject.diff_lines.count).to be > described_class::NUMBER_OF_TRUNCATED_DIFF_LINES - - expect(truncated_lines.count).to be <= described_class::NUMBER_OF_TRUNCATED_DIFF_LINES - end - end - - context "when some diff lines are meta" do - it "returns no meta lines" do - expect(subject.diff_lines).to include(be_meta) - expect(truncated_lines).not_to include(be_meta) - end - end - end end diff --git a/spec/models/individual_note_discussion_spec.rb b/spec/models/individual_note_discussion_spec.rb new file mode 100644 index 00000000000..33de682aedc --- /dev/null +++ b/spec/models/individual_note_discussion_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe IndividualNoteDiscussion, models: true do + # TODO: Test +end diff --git a/spec/models/legacy_diff_discussion_spec.rb b/spec/models/legacy_diff_discussion_spec.rb new file mode 100644 index 00000000000..72e33877b40 --- /dev/null +++ b/spec/models/legacy_diff_discussion_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe LegacyDiffDiscussion, models: true do + # TODO: Test +end diff --git a/spec/models/legacy_diff_note_spec.rb b/spec/models/legacy_diff_note_spec.rb deleted file mode 100644 index 81517a18b74..00000000000 --- a/spec/models/legacy_diff_note_spec.rb +++ /dev/null @@ -1,101 +0,0 @@ -require 'spec_helper' - -describe LegacyDiffNote, models: true do - describe "Commit diff line notes" do - let!(:note) { create(:legacy_diff_note_on_commit, note: "+1 from me") } - let!(:commit) { note.noteable } - - it "saves a valid note" do - expect(note.commit_id).to eq(commit.id) - expect(note.noteable.id).to eq(commit.id) - end - - it "is recognized by #legacy_diff_note?" do - expect(note).to be_legacy_diff_note - end - end - - describe '#active?' do - it 'is always true when the note has no associated diff line' do - note = build(:legacy_diff_note_on_merge_request) - - expect(note).to receive(:diff_line).and_return(nil) - - expect(note).to be_active - end - - it 'is never true when the note has no noteable associated' do - note = build(:legacy_diff_note_on_merge_request) - - expect(note).to receive(:diff_line).and_return(double) - expect(note).to receive(:noteable).and_return(nil) - - expect(note).not_to be_active - end - - it 'returns the memoized value if defined' do - note = build(:legacy_diff_note_on_merge_request) - - note.instance_variable_set(:@active, 'foo') - expect(note).not_to receive(:find_noteable_diff) - - expect(note.active?).to eq 'foo' - end - - context 'for a merge request noteable' do - it 'is false when noteable has no matching diff' do - merge = build_stubbed(:merge_request, :simple) - note = build(:legacy_diff_note_on_merge_request, noteable: merge) - - allow(note).to receive(:diff_line).and_return(double) - expect(note).to receive(:find_noteable_diff).and_return(nil) - - expect(note).not_to be_active - end - - it 'is true when noteable has a matching diff' do - merge = create(:merge_request, :simple) - - # Generate a real line_code value so we know it will match. We use a - # random line from a random diff just for funsies. - diff = merge.raw_diffs.to_a.sample - line = Gitlab::Diff::Parser.new.parse(diff.diff.each_line).to_a.sample - code = Gitlab::Diff::LineCode.generate(diff.new_path, line.new_pos, line.old_pos) - - # We're persisting in order to trigger the set_diff callback - note = create(:legacy_diff_note_on_merge_request, noteable: merge, - line_code: code, - project: merge.source_project) - - # Make sure we don't get a false positive from a guard clause - expect(note).to receive(:find_noteable_diff).and_call_original - expect(note).to be_active - end - end - end - - describe "#discussion_id" do - let(:note) { create(:note) } - - context "when it is newly created" do - it "has a discussion id" do - expect(note.discussion_id).not_to be_nil - expect(note.discussion_id).to match(/\A\h{40}\z/) - end - end - - context "when it didn't store a discussion id before" do - before do - note.update_column(:discussion_id, nil) - end - - it "has a discussion id" do - # The discussion_id is set in `after_initialize`, so `reload` won't work - reloaded_note = Note.find(note.id) - - expect(reloaded_note.discussion_id).not_to be_nil - expect(reloaded_note.discussion_id).to match(/\A\h{40}\z/) - end - end - end -end diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 24e7c1b17d9..faa89ff0507 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1225,12 +1225,12 @@ describe MergeRequest, models: true do end context "discussion status" do - let(:first_discussion) { Discussion.new([create(:diff_note_on_merge_request)]) } - let(:second_discussion) { Discussion.new([create(:diff_note_on_merge_request)]) } - let(:third_discussion) { Discussion.new([create(:diff_note_on_merge_request)]) } + let(:first_discussion) { Discussion.new([create(:discussion_note_on_merge_request)]) } + let(:second_discussion) { Discussion.new([create(:discussion_note_on_merge_request)]) } + let(:third_discussion) { Discussion.new([create(:discussion_note_on_merge_request)]) } before do - allow(subject).to receive(:diff_discussions).and_return([first_discussion, second_discussion, third_discussion]) + allow(subject).to receive(:resolvable_discussions).and_return([first_discussion, second_discussion, third_discussion]) end describe '#resolvable_discussions' do @@ -1245,34 +1245,6 @@ describe MergeRequest, models: true do end end - describe '#discussions_can_be_resolved_by? user' do - let(:user) { build(:user) } - - context 'all discussions can be resolved by the user' do - before do - allow(first_discussion).to receive(:can_resolve?).with(user).and_return(true) - allow(second_discussion).to receive(:can_resolve?).with(user).and_return(true) - allow(third_discussion).to receive(:can_resolve?).with(user).and_return(true) - end - - it 'allows a user to resolve the discussions' do - expect(subject.discussions_can_be_resolved_by?(user)).to be(true) - end - end - - context 'one discussion cannot be resolved by the user' do - before do - allow(first_discussion).to receive(:can_resolve?).with(user).and_return(true) - allow(second_discussion).to receive(:can_resolve?).with(user).and_return(true) - allow(third_discussion).to receive(:can_resolve?).with(user).and_return(false) - end - - it 'allows a user to resolve the discussions' do - expect(subject.discussions_can_be_resolved_by?(user)).to be(false) - end - end - end - describe "#discussions_resolvable?" do context "when all discussions are unresolvable" do before do @@ -1398,6 +1370,38 @@ describe MergeRequest, models: true do end end end + + describe "#discussions_to_be_resolved" do + # TODO: Test + end + + describe '#discussions_can_be_resolved_by?' do + let(:user) { build(:user) } + + context 'all discussions can be resolved by the user' do + before do + allow(first_discussion).to receive(:can_resolve?).with(user).and_return(true) + allow(second_discussion).to receive(:can_resolve?).with(user).and_return(true) + allow(third_discussion).to receive(:can_resolve?).with(user).and_return(true) + end + + it 'allows a user to resolve the discussions' do + expect(subject.discussions_can_be_resolved_by?(user)).to be(true) + end + end + + context 'one discussion cannot be resolved by the user' do + before do + allow(first_discussion).to receive(:can_resolve?).with(user).and_return(true) + allow(second_discussion).to receive(:can_resolve?).with(user).and_return(true) + allow(third_discussion).to receive(:can_resolve?).with(user).and_return(false) + end + + it 'allows a user to resolve the discussions' do + expect(subject.discussions_can_be_resolved_by?(user)).to be(false) + end + end + end end describe '#conflicts_can_be_resolved_in_ui?' do diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 33536487c41..c5e4a639f06 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -245,6 +245,18 @@ describe Note, models: true do end end + describe '.discussions' do + # TODO: Test + end + + describe '.find_original_discussion' do + # TODO: Test + end + + describe '.find_discussion' do + # TODO: Test + end + describe ".grouped_diff_discussions" do let!(:merge_request) { create(:merge_request) } let(:project) { merge_request.project } @@ -297,31 +309,6 @@ describe Note, models: true do end end - describe "#discussion_id" do - let(:note) { create(:note) } - - context "when it is newly created" do - it "has a discussion id" do - expect(note.discussion_id).not_to be_nil - expect(note.discussion_id).to match(/\A\h{40}\z/) - end - end - - context "when it didn't store a discussion id before" do - before do - note.update_column(:discussion_id, nil) - end - - it "has a discussion id" do - # The discussion_id is set in `after_initialize`, so `reload` won't work - reloaded_note = Note.find(note.id) - - expect(reloaded_note.discussion_id).not_to be_nil - expect(reloaded_note.discussion_id).to match(/\A\h{40}\z/) - end - end - end - describe '#for_personal_snippet?' do it 'returns false for a project snippet note' do expect(build(:note_on_project_snippet).for_personal_snippet?).to be_falsy @@ -388,6 +375,86 @@ describe Note, models: true do end end + describe '#can_be_discussion_note?' do + # TODO: Test + end + + describe '#discussion_class' do + # TODO: Test + end + + describe "#discussion_id" do + let(:note) { create(:note) } + + context "when it is newly created" do + it "has a discussion id" do + expect(note.discussion_id).not_to be_nil + expect(note.discussion_id).to match(/\A\h{40}\z/) + end + end + + context "when it didn't store a discussion id before" do + before do + note.update_column(:discussion_id, nil) + end + + it "has a discussion id" do + # The discussion_id is set in `after_initialize`, so `reload` won't work + reloaded_note = Note.find(note.id) + + expect(reloaded_note.discussion_id).not_to be_nil + expect(reloaded_note.discussion_id).to match(/\A\h{40}\z/) + end + end + end + + describe "#original_discussion_id" do + # TODO: Test + end + + describe '#to_discussion' do + subject { create(:discussion_note_on_merge_request) } + let!(:note2) { create(:discussion_note_on_merge_request, project: subject.project, noteable: subject.noteable, in_reply_to_discussion_id: subject.discussion_id) } + + it "returns a discussion with just this note" do + discussion = subject.to_discussion + + expect(discussion.id).to eq(subject.discussion_id) + expect(discussion.notes).to eq([subject]) + end + end + + describe "#discussion" do + let!(:note1) { create(:discussion_note_on_merge_request) } + let!(:note2) { create(:diff_note_on_merge_request, project: note1.project, noteable: note1.noteable) } + + context 'when the note is part of a discussion' do + subject { create(:discussion_note_on_merge_request, project: note1.project, noteable: note1.noteable, in_reply_to_discussion_id: note1.discussion_id) } + + it "returns the discussion this note is in" do + discussion = subject.discussion + + expect(discussion.id).to eq(subject.discussion_id) + expect(discussion.notes).to eq([note1, subject]) + end + end + + context 'when the note is not part of a discussion' do + subject { create(:note) } + + it "returns a discussion with just this note" do + discussion = subject.discussion + + expect(discussion.id).to eq(subject.discussion_id) + expect(discussion.notes).to eq([subject]) + end + end + end + + describe "#part_of_discussion?" do + # TODO: Test + end + describe 'expiring ETag cache' do let(:note) { build(:note_on_issue) } diff --git a/spec/models/sent_notification_spec.rb b/spec/models/sent_notification_spec.rb new file mode 100644 index 00000000000..2fc6cce471f --- /dev/null +++ b/spec/models/sent_notification_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe SentNotification, model: true do + # TODO: Test +end diff --git a/spec/models/simple_discussion_spec.rb b/spec/models/simple_discussion_spec.rb new file mode 100644 index 00000000000..1cb149aa270 --- /dev/null +++ b/spec/models/simple_discussion_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe SimpleDiscussion, model: true do + # TODO: Test +end diff --git a/spec/requests/api/v3/issues_spec.rb b/spec/requests/api/v3/issues_spec.rb index b1b398a897e..91d9057075f 100644 --- a/spec/requests/api/v3/issues_spec.rb +++ b/spec/requests/api/v3/issues_spec.rb @@ -824,7 +824,7 @@ describe API::V3::Issues, api: true do end context 'resolving issues in a merge request' do - let(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request)]).first } + let(:discussion) { create(:diff_note_on_merge_request).to_discussion } let(:merge_request) { discussion.noteable } let(:project) { merge_request.source_project } before do diff --git a/spec/services/discussions/resolve_service_spec.rb b/spec/services/discussions/resolve_service_spec.rb index 12c3cdf28c6..ab8df7b74cd 100644 --- a/spec/services/discussions/resolve_service_spec.rb +++ b/spec/services/discussions/resolve_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe Discussions::ResolveService do describe '#execute' do - let(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request)]).first } + let(:discussion) { create(:diff_note_on_merge_request).to_discussion } let(:project) { merge_request.project } let(:merge_request) { discussion.noteable } let(:user) { create(:user) } @@ -41,7 +41,7 @@ describe Discussions::ResolveService do end it 'can resolve multiple discussions at once' do - other_discussion = Discussion.for_diff_notes([create(:diff_note_on_merge_request, noteable: discussion.noteable, project: discussion.noteable.source_project)]).first + other_discussion = create(:diff_note_on_merge_request, noteable: discussion.noteable, project: discussion.noteable.source_project).to_discussion service.execute([discussion, other_discussion]) diff --git a/spec/services/issues/build_service_spec.rb b/spec/services/issues/build_service_spec.rb index 17990f41b3b..d166b9783ad 100644 --- a/spec/services/issues/build_service_spec.rb +++ b/spec/services/issues/build_service_spec.rb @@ -96,13 +96,13 @@ describe Issues::BuildService, services: true do end it 'mentions all the authors in the description' do - authors = merge_request.diff_discussions.map(&:author) + authors = merge_request.resolvable_discussions.map(&:author) expect(issue.description).to include(*authors.map(&:to_reference)) end it 'has a link for each unresolved discussion in the description' do - notes = merge_request.diff_discussions.map(&:first_note) + notes = merge_request.resolvable_discussions.map(&:first_note) links = notes.map { |note| Gitlab::UrlBuilder.build(note) } expect(issue.description).to include(*links) diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb index 776cbc4296b..80bfb731550 100644 --- a/spec/services/issues/create_service_spec.rb +++ b/spec/services/issues/create_service_spec.rb @@ -141,7 +141,7 @@ describe Issues::CreateService, services: true do it_behaves_like 'new issuable record that supports slash commands' context 'resolving discussions' do - let(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request)]).first } + let(:discussion) { create(:diff_note_on_merge_request).to_discussion } let(:merge_request) { discussion.noteable } let(:project) { merge_request.source_project } diff --git a/spec/services/notes/build_service_spec.rb b/spec/services/notes/build_service_spec.rb new file mode 100644 index 00000000000..065f6eeeacb --- /dev/null +++ b/spec/services/notes/build_service_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe Notes::CreateService, services: true do + # TODO: Test +end diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb index 152c6d20daa..b406afeb34d 100644 --- a/spec/services/notes/create_service_spec.rb +++ b/spec/services/notes/create_service_spec.rb @@ -13,6 +13,9 @@ describe Notes::CreateService, services: true do project.team << [user, :master] end + # TODO: Test in_reply_to_discussion_id + # TODO: Test new_discussion + context "valid params" do it 'returns a valid note' do note = described_class.new(project, user, opts).execute diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb index e3146a56495..c4e00fcf080 100644 --- a/spec/services/notification_service_spec.rb +++ b/spec/services/notification_service_spec.rb @@ -439,7 +439,7 @@ describe NotificationService, services: true do notification.new_note(note) - expect(SentNotification.last.position).to eq(note.position) + expect(SentNotification.last.in_reply_to_discussion_id).to eq(note.original_discussion_id) end end end diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index 5ec1ed8237b..42d63a9f9ba 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -796,7 +796,7 @@ describe SystemNoteService, services: true do end describe '.discussion_continued_in_issue' do - let(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request)]).first } + let(:discussion) { create(:diff_note_on_merge_request).to_discussion } let(:merge_request) { discussion.noteable } let(:project) { merge_request.source_project } let(:issue) { create(:issue, project: project) } From 336016fa858dfa48b9f9e9b5b2d9c3a9000fffe5 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Mon, 13 Mar 2017 12:05:02 -0600 Subject: [PATCH 09/70] Satisfy Rubocop --- spec/controllers/projects/commit_controller_spec.rb | 2 +- spec/controllers/projects/merge_requests_controller_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb index 9545b980fbf..69e4706dc71 100644 --- a/spec/controllers/projects/commit_controller_spec.rb +++ b/spec/controllers/projects/commit_controller_spec.rb @@ -267,7 +267,7 @@ describe Projects::CommitController do expect(assigns(:diff_notes_disabled)).to be_falsey expect(assigns(:new_diff_note_attrs)).to eq(noteable_type: 'Commit', - commit_id: commit2.id) + commit_id: commit2.id) end it 'only renders the diffs for the path given' do diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 6f8755645a1..6cf4a97e76f 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -575,7 +575,7 @@ describe Projects::MergeRequestsController do expect(assigns(:diff_notes_disabled)).to be_falsey expect(assigns(:new_diff_note_attrs)).to eq(noteable_type: 'MergeRequest', - noteable_id: merge_request.id) + noteable_id: merge_request.id) end it 'only renders the diffs for the path given' do From 9c30b0e918ca035d8555de5e3393247f6d00ed16 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Mon, 13 Mar 2017 16:13:12 -0600 Subject: [PATCH 10/70] Fix some specs --- app/assets/javascripts/notes.js | 4 ++-- app/controllers/projects/notes_controller.rb | 2 ++ app/helpers/notes_helper.rb | 4 +--- app/views/projects/notes/_notes.html.haml | 2 +- features/steps/project/merge_requests.rb | 3 +++ .../projects/notes_controller_spec.rb | 3 ++- spec/factories/notes.rb | 15 +++++++++++++- spec/models/diff_discussion_spec.rb | 8 +++++++- spec/models/merge_request_spec.rb | 20 +++++++++---------- spec/models/note_spec.rb | 4 ++-- spec/requests/api/issues_spec.rb | 2 +- 11 files changed, 45 insertions(+), 22 deletions(-) diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 71c03c89314..226029ba8f3 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -192,7 +192,7 @@ require('./task_list'); }; Notes.prototype.refresh = function() { - if (!document.hidden && document.URL.indexOf(this.noteable_url) === 0) { + if (!document.hidden) { return this.getContent(); } }; @@ -371,7 +371,7 @@ require('./task_list'); discussionContainer.append(note_html); } - if (typeof gl.diffNotesCompileComponents !== 'undefined' && note.discussion_id) { + if (typeof gl.diffNotesCompileComponents !== 'undefined' && note.discussion_resolvable) { gl.diffNotesCompileComponents(); this.renderDiscussionAvatar(diffAvatarContainer, note); } diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index f80313bbee0..186098c67b7 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -169,6 +169,8 @@ class Projects::NotesController < Projects::ApplicationController discussion = note.to_discussion(noteable) unless discussion.render_as_individual_notes? attrs.merge!( + discussion_resolvable: discussion.resolvable?, + diff_discussion_html: diff_discussion_html(discussion), discussion_html: discussion_html(discussion), diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index 01ecac983cf..e2fa9905e86 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -54,17 +54,15 @@ module NotesHelper if use_legacy_diff_note new_note = LegacyDiffNote.new(@new_diff_note_attrs.merge(line_code: line_code)) - discussion_id = new_note.discussion_id else new_note = DiffNote.new(@new_diff_note_attrs.merge(position: position)) - discussion_id = new_note.discussion_id data[:position] = position.to_json end data.merge( note_type: new_note.type, - discussion_id: discussion_id + discussion_id: new_note.discussion_class.discussion_id(new_note) ) end diff --git a/app/views/projects/notes/_notes.html.haml b/app/views/projects/notes/_notes.html.haml index 50809068453..d619f7ac262 100644 --- a/app/views/projects/notes/_notes.html.haml +++ b/app/views/projects/notes/_notes.html.haml @@ -1,4 +1,4 @@ -- if @discussions.present? +- if defined?(@discussions) - @discussions.each do |discussion| - if discussion.render_as_individual_notes? = render partial: "projects/notes/note", collection: discussion.notes, as: :note diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 5510c65265a..a67b3222af3 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -347,6 +347,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'I should see a discussion by user "John Doe" has started on diff' do + # Trigger a refresh of notes + execute_script("$(document).trigger('visibilitychange');") + wait_for_ajax page.within(".notes .discussion") do page.should have_content "#{user_exists("John Doe").name} #{user_exists("John Doe").to_reference} started a discussion" page.should have_content sample_commit.line_code_path diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb index 87084806568..a3b0e8a252e 100644 --- a/spec/controllers/projects/notes_controller_spec.rb +++ b/spec/controllers/projects/notes_controller_spec.rb @@ -58,7 +58,8 @@ describe Projects::NotesController do noteable_id: merge_request.id.to_s, noteable_type: 'MergeRequest', merge_request_diff_head_sha: 'sha', - in_reply_to_discussion_id: nil + in_reply_to_discussion_id: nil, + new_discussion: nil } expect(Notes::CreateService).to receive(:new).with(project, user, service_params).and_return(double(execute: true)) diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index 755c6d7e031..0ad7034e96d 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -18,7 +18,7 @@ FactoryGirl.define do factory :discussion_note_on_merge_request, traits: [:on_merge_request], class: DiscussionNote do association :project, :repository - + trait :resolved do resolved_at { Time.now } resolved_by { create(:user) } @@ -117,5 +117,18 @@ FactoryGirl.define do trait :with_svg_attachment do attachment { fixture_file_upload(Rails.root + "spec/fixtures/unsanitized.svg", "image/svg+xml") } end + + transient do + in_reply_to nil + end + + before(:create) do |note, evaluator| + discussion = evaluator.in_reply_to + next unless discussion + discussion = discussion.to_discussion if discussion.is_a?(Note) + next unless discussion + + note.assign_attributes(discussion.reply_attributes) + end end end diff --git a/spec/models/diff_discussion_spec.rb b/spec/models/diff_discussion_spec.rb index 8f3a4a8cc49..6109d77f27c 100644 --- a/spec/models/diff_discussion_spec.rb +++ b/spec/models/diff_discussion_spec.rb @@ -1,7 +1,13 @@ require 'spec_helper' describe DiffDiscussion, model: true do - # TODO: Test + subject { described_class.new([first_note, second_note, third_note]) } + + let(:first_note) { create(:diff_note_on_merge_request) } + let(:second_note) { create(:diff_note_on_merge_request) } + let(:third_note) { create(:diff_note_on_merge_request) } + +# TODO: Test describe "#truncated_diff_lines" do let(:truncated_lines) { subject.truncated_diff_lines } diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index faa89ff0507..3d26049b54a 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1234,15 +1234,7 @@ describe MergeRequest, models: true do end describe '#resolvable_discussions' do - before do - allow(first_discussion).to receive(:to_be_resolved?).and_return(true) - allow(second_discussion).to receive(:to_be_resolved?).and_return(false) - allow(third_discussion).to receive(:to_be_resolved?).and_return(false) - end - - it 'includes only discussions that need to be resolved' do - expect(subject.resolvable_discussions).to eq([first_discussion]) - end + # TODO: Test end describe "#discussions_resolvable?" do @@ -1372,7 +1364,15 @@ describe MergeRequest, models: true do end describe "#discussions_to_be_resolved" do - # TODO: Test + before do + allow(first_discussion).to receive(:to_be_resolved?).and_return(true) + allow(second_discussion).to receive(:to_be_resolved?).and_return(false) + allow(third_discussion).to receive(:to_be_resolved?).and_return(false) + end + + it 'includes only discussions that need to be resolved' do + expect(subject.discussions_to_be_resolved).to eq([first_discussion]) + end end describe '#discussions_can_be_resolved_by?' do diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index c5e4a639f06..7a85c5f22ff 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -414,7 +414,7 @@ describe Note, models: true do describe '#to_discussion' do subject { create(:discussion_note_on_merge_request) } - let!(:note2) { create(:discussion_note_on_merge_request, project: subject.project, noteable: subject.noteable, in_reply_to_discussion_id: subject.discussion_id) } + let!(:note2) { create(:discussion_note_on_merge_request, project: subject.project, noteable: subject.noteable, in_reply_to: subject) } it "returns a discussion with just this note" do discussion = subject.to_discussion @@ -429,7 +429,7 @@ describe Note, models: true do let!(:note2) { create(:diff_note_on_merge_request, project: note1.project, noteable: note1.noteable) } context 'when the note is part of a discussion' do - subject { create(:discussion_note_on_merge_request, project: note1.project, noteable: note1.noteable, in_reply_to_discussion_id: note1.discussion_id) } + subject { create(:discussion_note_on_merge_request, project: note1.project, noteable: note1.noteable, in_reply_to: note1) } it "returns the discussion this note is in" do discussion = subject.discussion diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb index 4729adba11c..504ff19a17f 100644 --- a/spec/requests/api/issues_spec.rb +++ b/spec/requests/api/issues_spec.rb @@ -953,7 +953,7 @@ describe API::Issues, api: true do end context 'resolving discussions' do - let(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request)]).first } + let(:discussion) { create(:diff_note_on_merge_request).to_discussion } let(:merge_request) { discussion.noteable } let(:project) { merge_request.source_project } From 1571835248aa504e36c6cdc6ac1be4db9da48135 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 15 Mar 2017 18:14:11 -0600 Subject: [PATCH 11/70] Fix merge conflict issue --- app/assets/javascripts/files_comment_button.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/files_comment_button.js b/app/assets/javascripts/files_comment_button.js index d1d24b411a4..7f91bdd38ab 100644 --- a/app/assets/javascripts/files_comment_button.js +++ b/app/assets/javascripts/files_comment_button.js @@ -5,7 +5,7 @@ let $commentButtonTemplate; var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; }; -this.FilesCommentButton = (function() { +window.FilesCommentButton = (function() { var COMMENT_BUTTON_CLASS, EMPTY_CELL_CLASS, LINE_COLUMN_CLASSES, LINE_CONTENT_CLASS, LINE_HOLDER_CLASS, LINE_NUMBER_CLASS, OLD_LINE_CLASS, TEXT_FILE_SELECTOR, UNFOLDABLE_LINE_CLASS; COMMENT_BUTTON_CLASS = '.add-diff-note'; From 76aa0bedd7ed3aaaeab9402b78261917df66de10 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 15 Mar 2017 18:14:46 -0600 Subject: [PATCH 12/70] Fix field name --- app/assets/javascripts/notes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 226029ba8f3..08bbc15f6b9 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -456,7 +456,7 @@ require('./task_list'); form.find("#note_line_code").remove(); form.find("#note_position").remove(); form.find("#note_type").remove(); - form.find("#note_in_reply_to_discussion_id").remove(); + form.find("#in_reply_to_discussion_id").remove(); form.find('.js-comment-resolve-button').closest('comment-and-resolve-btn').remove(); return this.parentTimeline = form.parents('.timeline'); }; From f6f6aaf593dc40c79b8e3536f5e2821c96b9dcd3 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 15 Mar 2017 18:14:58 -0600 Subject: [PATCH 13/70] Better notification emails for notes and (diff) discussions --- app/mailers/emails/notes.rb | 7 ++-- app/models/diff_discussion.rb | 4 ++- app/models/discussion.rb | 4 +++ app/models/note.rb | 2 +- app/views/layouts/mailer.text.erb | 4 +++ app/views/layouts/mailer.text.haml | 5 --- app/views/layouts/notify.text.erb | 12 +++++++ app/views/notify/_note_email.html.haml | 36 +++++++++++++++++++ app/views/notify/_note_email.text.erb | 25 +++++++++++++ app/views/notify/_note_message.html.haml | 5 --- app/views/notify/_note_message.text.erb | 5 --- .../notify/_note_mr_or_commit_email.html.haml | 18 ---------- .../notify/_note_mr_or_commit_email.text.erb | 8 ----- app/views/notify/_simple_diff.text.erb | 3 -- app/views/notify/note_commit_email.html.haml | 3 +- app/views/notify/note_commit_email.text.erb | 3 +- app/views/notify/note_issue_email.html.haml | 2 +- app/views/notify/note_issue_email.text.erb | 10 +----- .../notify/note_merge_request_email.html.haml | 3 +- .../notify/note_merge_request_email.text.erb | 3 +- .../note_personal_snippet_email.html.haml | 2 +- .../note_personal_snippet_email.text.erb | 9 +---- app/views/notify/note_snippet_email.html.haml | 2 +- app/views/notify/note_snippet_email.text.erb | 9 +---- lib/gitlab/diff/line.rb | 4 +++ spec/mailers/notify_spec.rb | 2 ++ 26 files changed, 106 insertions(+), 84 deletions(-) create mode 100644 app/views/layouts/mailer.text.erb delete mode 100644 app/views/layouts/mailer.text.haml create mode 100644 app/views/layouts/notify.text.erb create mode 100644 app/views/notify/_note_email.html.haml create mode 100644 app/views/notify/_note_email.text.erb delete mode 100644 app/views/notify/_note_message.html.haml delete mode 100644 app/views/notify/_note_message.text.erb delete mode 100644 app/views/notify/_note_mr_or_commit_email.html.haml delete mode 100644 app/views/notify/_note_mr_or_commit_email.text.erb delete mode 100644 app/views/notify/_simple_diff.text.erb diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb index 46fa6fd9f6d..de58314fef2 100644 --- a/app/mailers/emails/notes.rb +++ b/app/mailers/emails/notes.rb @@ -4,7 +4,7 @@ module Emails setup_note_mail(note_id, recipient_id) @commit = @note.noteable - @discussion = @note.to_discussion if @note.diff_note? + @discussion = @note.discussion if @note.part_of_discussion? @target_url = namespace_project_commit_url(*note_target_url_options) mail_answer_thread(@commit, @@ -17,6 +17,7 @@ module Emails setup_note_mail(note_id, recipient_id) @issue = @note.noteable + @discussion = @note.discussion if @note.part_of_discussion? @target_url = namespace_project_issue_url(*note_target_url_options) mail_answer_thread(@issue, note_thread_options(recipient_id)) end @@ -25,7 +26,7 @@ module Emails setup_note_mail(note_id, recipient_id) @merge_request = @note.noteable - @discussion = @note.to_discussion if @note.diff_note? + @discussion = @note.discussion if @note.part_of_discussion? @target_url = namespace_project_merge_request_url(*note_target_url_options) mail_answer_thread(@merge_request, note_thread_options(recipient_id)) end @@ -34,6 +35,7 @@ module Emails setup_note_mail(note_id, recipient_id) @snippet = @note.noteable + @discussion = @note.discussion if @note.part_of_discussion? @target_url = namespace_project_snippet_url(*note_target_url_options) mail_answer_thread(@snippet, note_thread_options(recipient_id)) end @@ -42,6 +44,7 @@ module Emails setup_note_mail(note_id, recipient_id) @snippet = @note.noteable + @discussion = @note.discussion if @note.part_of_discussion? @target_url = snippet_url(@note.noteable) mail_answer_thread(@snippet, note_thread_options(recipient_id)) end diff --git a/app/models/diff_discussion.rb b/app/models/diff_discussion.rb index 9a934c7520c..9c80b190b74 100644 --- a/app/models/diff_discussion.rb +++ b/app/models/diff_discussion.rb @@ -4,12 +4,14 @@ class DiffDiscussion < Discussion delegate :line_code, :original_line_code, :diff_file, + :diff_line, :for_line?, :active?, to: :first_note - delegate :blob, + delegate :file_path, + :blob, :highlighted_diff_lines, :diff_lines, diff --git a/app/models/discussion.rb b/app/models/discussion.rb index 314aea2c63a..8ab9031e42c 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -87,6 +87,10 @@ class Discussion false end + def new_discussion? + notes.length == 1 + end + def potentially_resolvable? first_note.for_merge_request? end diff --git a/app/models/note.rb b/app/models/note.rb index 6385747b571..06ceb60b982 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -261,7 +261,7 @@ class Note < ActiveRecord::Base # Returns the entire discussion this note is part of def discussion if part_of_discussion? - self.noteable.notes.find_discussion(self.discussion_id) + self.noteable.notes.find_discussion(self.discussion_id) || to_discussion else to_discussion end diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 00000000000..198f30a1dc4 --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1,4 @@ +<%= yield -%> + +--- +You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>. diff --git a/app/views/layouts/mailer.text.haml b/app/views/layouts/mailer.text.haml deleted file mode 100644 index 6a9c6ced9cc..00000000000 --- a/app/views/layouts/mailer.text.haml +++ /dev/null @@ -1,5 +0,0 @@ -= yield - -You're receiving this email because of your account on #{Gitlab.config.gitlab.host}. -Manage all notifications: #{profile_notifications_url} -Help: #{help_url} diff --git a/app/views/layouts/notify.text.erb b/app/views/layouts/notify.text.erb new file mode 100644 index 00000000000..b4ce02eead8 --- /dev/null +++ b/app/views/layouts/notify.text.erb @@ -0,0 +1,12 @@ +<%= yield -%> + +--- +<% if @target_url -%> +<% if @reply_by_email -%> +<%= "Reply to this email directly or view it on GitLab: #{@target_url}" -%> +<% else -%> +<%= "View it on GitLab: #{@target_url}" -%> +<% end -%> +<% end -%> + +You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>. diff --git a/app/views/notify/_note_email.html.haml b/app/views/notify/_note_email.html.haml new file mode 100644 index 00000000000..8b139a150b7 --- /dev/null +++ b/app/views/notify/_note_email.html.haml @@ -0,0 +1,36 @@ +- if @discussion + %p.details + = succeed ':' do + = link_to @note.author_name, user_url(@note.author) + + - if @discussion.diff_discussion? + - if @discussion.new_discussion? + started a new discussion + - else + commented on a discussion + + on #{link_to @discussion.file_path, @target_url} + - else + - if @discussion.new_discussion? + started a new discussion + - else + commented on a #{link_to 'discussion', @target_url} + +- elsif current_application_settings.email_author_in_body + %p.details + #{link_to @note.author_name, user_url(@note.author)} commented: + +- if @discussion&.diff_discussion? + = content_for :head do + = stylesheet_link_tag 'mailers/highlighted_diff_email' + + %table + = render partial: "projects/diffs/line", + collection: @discussion.truncated_diff_lines, + as: :line, + locals: { diff_file: @discussion.diff_file, + plain: true, + email: true } + +%div + = markdown(@note.note, pipeline: :email, author: @note.author) diff --git a/app/views/notify/_note_email.text.erb b/app/views/notify/_note_email.text.erb new file mode 100644 index 00000000000..f2db321859f --- /dev/null +++ b/app/views/notify/_note_email.text.erb @@ -0,0 +1,25 @@ +<% if @discussion -%> +<%= @note.author_name -%> +<% if @discussion.new_discussion? -%> +<%= " started a new discussion" -%> +<% else -%> +<%= " commented on a discussion" -%> +<% end -%> +<% if @discussion.diff_discussion? -%> +<%= " on #{@discussion.file_path}" -%> +<% end -%> +<%= ":" -%> + + +<% elsif current_application_settings.email_author_in_body -%> +<%= "#{@note.author_name} commented:" -%> + + +<% end -%> +<% if @discussion&.diff_discussion? -%> +<% @discussion.truncated_diff_lines(highlight: false).each do |line| -%> +<%= "> #{line.text}\n" -%> +<% end -%> + +<% end -%> +<%= @note.note -%> diff --git a/app/views/notify/_note_message.html.haml b/app/views/notify/_note_message.html.haml deleted file mode 100644 index e9c66170877..00000000000 --- a/app/views/notify/_note_message.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -- if current_application_settings.email_author_in_body - %div - #{link_to @note.author_name, user_url(@note.author)} wrote: -%div - = markdown(@note.note, pipeline: :email, author: @note.author) diff --git a/app/views/notify/_note_message.text.erb b/app/views/notify/_note_message.text.erb deleted file mode 100644 index f82cbc9a3fc..00000000000 --- a/app/views/notify/_note_message.text.erb +++ /dev/null @@ -1,5 +0,0 @@ -<% if current_application_settings.email_author_in_body %> - <%= @note.author_name %> wrote: -<% end -%> - -<%= @note.note %> diff --git a/app/views/notify/_note_mr_or_commit_email.html.haml b/app/views/notify/_note_mr_or_commit_email.html.haml deleted file mode 100644 index edf8dfe7e9e..00000000000 --- a/app/views/notify/_note_mr_or_commit_email.html.haml +++ /dev/null @@ -1,18 +0,0 @@ -= content_for :head do - = stylesheet_link_tag 'mailers/highlighted_diff_email' - -New comment - -- if @discussion && @discussion.diff_file - on - = link_to @note.diff_file.file_path, @target_url, class: 'details' - \: - %table - = render partial: "projects/diffs/line", - collection: @discussion.truncated_diff_lines, - as: :line, - locals: { diff_file: @note.diff_file, - plain: true, - email: true } - -= render 'note_message' diff --git a/app/views/notify/_note_mr_or_commit_email.text.erb b/app/views/notify/_note_mr_or_commit_email.text.erb deleted file mode 100644 index b4fcdf6b1e9..00000000000 --- a/app/views/notify/_note_mr_or_commit_email.text.erb +++ /dev/null @@ -1,8 +0,0 @@ -<% if @discussion && @discussion.diff_file -%> - on <%= @note.diff_file.file_path -%> -<% end -%>: - -<%= url %> - -<%= render 'simple_diff' if @discussion -%> -<%= render 'note_message' %> diff --git a/app/views/notify/_simple_diff.text.erb b/app/views/notify/_simple_diff.text.erb deleted file mode 100644 index c28d1cc34d3..00000000000 --- a/app/views/notify/_simple_diff.text.erb +++ /dev/null @@ -1,3 +0,0 @@ -<% @discussion.truncated_diff_lines(highlight: false).each do |line| %> -> <%= line.text %> -<% end %> diff --git a/app/views/notify/note_commit_email.html.haml b/app/views/notify/note_commit_email.html.haml index 0a650e3b2ca..5e69f01a486 100644 --- a/app/views/notify/note_commit_email.html.haml +++ b/app/views/notify/note_commit_email.html.haml @@ -1,2 +1 @@ -%p.details - = render 'note_mr_or_commit_email' += render 'note_email' diff --git a/app/views/notify/note_commit_email.text.erb b/app/views/notify/note_commit_email.text.erb index 6aa085a172e..5585e7c3ee8 100644 --- a/app/views/notify/note_commit_email.text.erb +++ b/app/views/notify/note_commit_email.text.erb @@ -1,2 +1 @@ -New comment for Commit <%= @commit.short_id -%> -<%= render partial: 'note_mr_or_commit_email', locals: { url: @target_url } %> +<%= render partial: 'note_email' %> diff --git a/app/views/notify/note_issue_email.html.haml b/app/views/notify/note_issue_email.html.haml index 2fa2f784661..5e69f01a486 100644 --- a/app/views/notify/note_issue_email.html.haml +++ b/app/views/notify/note_issue_email.html.haml @@ -1 +1 @@ -= render 'note_message' += render 'note_email' diff --git a/app/views/notify/note_issue_email.text.erb b/app/views/notify/note_issue_email.text.erb index e33cbcd70f2..5585e7c3ee8 100644 --- a/app/views/notify/note_issue_email.text.erb +++ b/app/views/notify/note_issue_email.text.erb @@ -1,9 +1 @@ -New comment for Issue <%= @issue.iid %> - -<%= url_for(namespace_project_issue_url(@issue.project.namespace, @issue.project, @issue, anchor: "note_#{@note.id}")) %> - - -Author: <%= @note.author_name %> - -<%= @note.note %> - +<%= render partial: 'note_email' %> diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml index 0a650e3b2ca..5e69f01a486 100644 --- a/app/views/notify/note_merge_request_email.html.haml +++ b/app/views/notify/note_merge_request_email.html.haml @@ -1,2 +1 @@ -%p.details - = render 'note_mr_or_commit_email' += render 'note_email' diff --git a/app/views/notify/note_merge_request_email.text.erb b/app/views/notify/note_merge_request_email.text.erb index 2ce64c494cf..381f0366971 100644 --- a/app/views/notify/note_merge_request_email.text.erb +++ b/app/views/notify/note_merge_request_email.text.erb @@ -1,2 +1 @@ -New comment for Merge Request <%= @merge_request.to_reference -%> -<%= render partial: 'note_mr_or_commit_email', locals: { url: @target_url }%> +<%= render partial: 'note_email'%> diff --git a/app/views/notify/note_personal_snippet_email.html.haml b/app/views/notify/note_personal_snippet_email.html.haml index 2fa2f784661..5e69f01a486 100644 --- a/app/views/notify/note_personal_snippet_email.html.haml +++ b/app/views/notify/note_personal_snippet_email.html.haml @@ -1 +1 @@ -= render 'note_message' += render 'note_email' diff --git a/app/views/notify/note_personal_snippet_email.text.erb b/app/views/notify/note_personal_snippet_email.text.erb index b2a8809a23b..5585e7c3ee8 100644 --- a/app/views/notify/note_personal_snippet_email.text.erb +++ b/app/views/notify/note_personal_snippet_email.text.erb @@ -1,8 +1 @@ -New comment for Snippet <%= @snippet.id %> - -<%= url_for(snippet_url(@snippet, anchor: "note_#{@note.id}")) %> - - -Author: <%= @note.author_name %> - -<%= @note.note %> +<%= render partial: 'note_email' %> diff --git a/app/views/notify/note_snippet_email.html.haml b/app/views/notify/note_snippet_email.html.haml index 2fa2f784661..5e69f01a486 100644 --- a/app/views/notify/note_snippet_email.html.haml +++ b/app/views/notify/note_snippet_email.html.haml @@ -1 +1 @@ -= render 'note_message' += render 'note_email' diff --git a/app/views/notify/note_snippet_email.text.erb b/app/views/notify/note_snippet_email.text.erb index 4d5a406f4b0..5585e7c3ee8 100644 --- a/app/views/notify/note_snippet_email.text.erb +++ b/app/views/notify/note_snippet_email.text.erb @@ -1,8 +1 @@ -New comment for Snippet <%= @snippet.id %> - -<%= url_for(namespace_project_snippet_url(@snippet.project.namespace, @snippet.project, @snippet, anchor: "note_#{@note.id}")) %> - - -Author: <%= @note.author_name %> - -<%= @note.note %> +<%= render partial: 'note_email' %> diff --git a/lib/gitlab/diff/line.rb b/lib/gitlab/diff/line.rb index 114656958e3..0a15c6d9358 100644 --- a/lib/gitlab/diff/line.rb +++ b/lib/gitlab/diff/line.rb @@ -33,6 +33,10 @@ module Gitlab new_pos unless removed? || meta? end + def line + new_line || old_line + end + def unchanged? type.nil? end diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index 6a89b007f96..01246f87dff 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -536,6 +536,8 @@ describe Notify do allow(Note).to receive(:find).with(note.id).and_return(note) end + # TODO: Test discussions + shared_examples 'a note email' do it_behaves_like 'it should have Gmail Actions links' From 80b2e18fb62b8da7410f90b3e5340b9e63e765a3 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 15 Mar 2017 18:58:55 -0600 Subject: [PATCH 14/70] Enable discussions on issues, commits and snippets --- app/models/discussion_note.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/discussion_note.rb b/app/models/discussion_note.rb index fc168ae74a9..510aefbf609 100644 --- a/app/models/discussion_note.rb +++ b/app/models/discussion_note.rb @@ -1,5 +1,5 @@ class DiscussionNote < Note - NOTEABLE_TYPES = %w(MergeRequest).freeze + NOTEABLE_TYPES = %w(MergeRequest Issue Commit Snippet).freeze validates :noteable_type, inclusion: { in: NOTEABLE_TYPES } From 79889a6aa3dc878d196d0f2f445ab6b10ef10c74 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 17 Mar 2017 13:25:52 -0600 Subject: [PATCH 15/70] Add specs --- app/controllers/projects/notes_controller.rb | 14 +- app/models/commit_discussion.rb | 9 - app/models/concerns/resolvable_note.rb | 15 +- app/models/diff_note.rb | 4 +- app/models/discussion.rb | 21 +- app/models/individual_note_discussion.rb | 3 +- app/models/legacy_diff_discussion.rb | 1 + app/models/note.rb | 27 ++- app/models/out_of_context_discussion.rb | 12 + app/models/sent_notification.rb | 23 +- .../concerns/issues/resolve_discussions.rb | 2 +- app/services/notes/build_service.rb | 6 +- app/views/notify/new_issue_email.html.haml | 10 +- .../new_mention_in_issue_email.html.haml | 10 +- ...w_mention_in_merge_request_email.html.haml | 13 +- .../notify/new_merge_request_email.html.haml | 10 +- app/views/projects/notes/_notes.html.haml | 2 +- .../email/handler/create_note_handler.rb | 7 +- .../projects/notes_controller_spec.rb | 186 ++++++++++++--- spec/factories/discussions.rb | 5 - spec/factories/notes.rb | 14 +- spec/factories/sent_notifications.rb | 2 +- spec/finders/notes_finder_spec.rb | 39 ++- spec/helpers/issues_helper_spec.rb | 2 +- .../email/handler/create_note_handler_spec.rb | 1 + spec/mailers/notify_spec.rb | 142 +++++++++-- spec/models/commit_discussion_spec.rb | 5 - spec/models/concerns/noteable_spec.rb | 84 ++++++- spec/models/concerns/resolvable_note_spec.rb | 73 +++++- spec/models/diff_discussion_spec.rb | 12 +- spec/models/diff_note_spec.rb | 24 +- spec/models/discussion_note_spec.rb | 2 +- spec/models/discussion_spec.rb | 123 ++-------- .../models/individual_note_discussion_spec.rb | 2 +- spec/models/legacy_diff_discussion_spec.rb | 8 +- spec/models/merge_request_spec.rb | 10 +- spec/models/note_spec.rb | 225 +++++++++++++++++- spec/models/out_of_context_discussion_spec.rb | 5 + spec/models/sent_notification_spec.rb | 163 ++++++++++++- spec/models/simple_discussion_spec.rb | 8 +- spec/services/issues/build_service_spec.rb | 6 +- .../issues/resolve_discussions_spec.rb | 2 +- spec/services/notes/build_service_spec.rb | 39 ++- spec/services/notes/create_service_spec.rb | 3 - 44 files changed, 1077 insertions(+), 297 deletions(-) delete mode 100644 app/models/commit_discussion.rb create mode 100644 app/models/out_of_context_discussion.rb delete mode 100644 spec/factories/discussions.rb delete mode 100644 spec/models/commit_discussion_spec.rb create mode 100644 spec/models/out_of_context_discussion_spec.rb diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 186098c67b7..8f82021a464 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -1,4 +1,5 @@ class Projects::NotesController < Projects::ApplicationController + include NotesHelper include ToggleAwardEmoji # Authorize @@ -12,7 +13,8 @@ class Projects::NotesController < Projects::ApplicationController notes_json = { notes: [], last_fetched_at: current_fetched_at } - @notes = notes_finder.execute.inc_author + @notes = notes_finder.execute.inc_relations_for_view + @notes = prepare_notes_for_rendering(@notes) @notes.each do |note| next if note.cross_reference_not_visible_for?(current_user) @@ -117,7 +119,7 @@ class Projects::NotesController < Projects::ApplicationController end def discussion_html(discussion) - return if discussion.render_as_individual_notes? + return if discussion.individual_note? render_to_string( "discussions/_discussion", @@ -153,21 +155,20 @@ class Projects::NotesController < Projects::ApplicationController def note_json(note) attrs = { - id: note.id + commands_changes: note.commands_changes } if note.persisted? - Banzai::NoteRenderer.render([note], @project, current_user) - attrs.merge!( valid: true, + id: note.id, discussion_id: note.discussion_id(noteable), html: note_html(note), note: note.note ) discussion = note.to_discussion(noteable) - unless discussion.render_as_individual_notes? + unless discussion.individual_note? attrs.merge!( discussion_resolvable: discussion.resolvable?, @@ -187,7 +188,6 @@ class Projects::NotesController < Projects::ApplicationController ) end - attrs[:commands_changes] = note.commands_changes attrs end diff --git a/app/models/commit_discussion.rb b/app/models/commit_discussion.rb deleted file mode 100644 index bcca3155335..00000000000 --- a/app/models/commit_discussion.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CommitDiscussion < Discussion - def self.override_discussion_id(note) - discussion_id(note) - end - - def potentially_resolvable? - false - end -end diff --git a/app/models/concerns/resolvable_note.rb b/app/models/concerns/resolvable_note.rb index eecb77ebf80..2aba979938b 100644 --- a/app/models/concerns/resolvable_note.rb +++ b/app/models/concerns/resolvable_note.rb @@ -1,13 +1,18 @@ module ResolvableNote extend ActiveSupport::Concern + RESOLVABLE_TYPES = %w(DiffNote DiscussionNote).freeze + included do belongs_to :resolved_by, class_name: "User" validates :resolved_by, presence: true, if: :resolved? - # Keep this scope in sync with the logic in `#resolvable?` in `Note` subclasses that are resolvable - scope :resolvable, -> { where(type: %w(DiffNote DiscussionNote)).user.where(noteable_type: 'MergeRequest') } + # Keep this scope in sync with the logic in `#potentially_resolvable?` in `Discussion` subclasses that are resolvable + scope :potentially_resolvable, -> { where(type: RESOLVABLE_TYPES).where(noteable_type: 'MergeRequest') } + # Keep this scope in sync with `#resolvable?` + scope :resolvable, -> { potentially_resolvable.user } + scope :resolved, -> { resolvable.where.not(resolved_at: nil) } scope :unresolved, -> { resolvable.where(resolved_at: nil) } end @@ -24,9 +29,11 @@ module ResolvableNote end end - # If you update this method remember to also update the scope `resolvable` + delegate :potentially_resolvable?, to: :to_discussion + + # Keep this method in sync with the `resolvable` scope def resolvable? - to_discussion.potentially_resolvable? && !system? + potentially_resolvable? && !system? end def resolved? diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index e5f437f8647..d24491b44e7 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -1,6 +1,8 @@ class DiffNote < Note include NoteOnDiff + NOTEABLE_TYPES = %w(MergeRequest Commit).freeze + serialize :original_position, Gitlab::Diff::Position serialize :position, Gitlab::Diff::Position @@ -8,7 +10,7 @@ class DiffNote < Note validates :position, presence: true validates :diff_line, presence: true validates :line_code, presence: true, line_code: true - validates :noteable_type, inclusion: { in: %w(Commit MergeRequest) } + validates :noteable_type, inclusion: { in: NOTEABLE_TYPES } validate :positions_complete validate :verify_supported diff --git a/app/models/discussion.rb b/app/models/discussion.rb index 8ab9031e42c..6e97a4862ed 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -1,7 +1,7 @@ class Discussion MEMOIZED_VALUES = [] # rubocop:disable Style/MutableConstant - attr_reader :notes + attr_reader :notes, :noteable delegate :created_at, :project, @@ -61,6 +61,13 @@ class Discussion @noteable = noteable end + def ==(other) + other.class == self.class && + other.noteable == self.noteable && + other.id == self.id && + other.notes == self.notes + end + def last_updated_at last_note.created_at end @@ -83,7 +90,7 @@ class Discussion false end - def render_as_individual_notes? + def individual_note? false end @@ -91,8 +98,9 @@ class Discussion notes.length == 1 end + # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` def potentially_resolvable? - first_note.for_merge_request? + for_merge_request? end def resolvable? @@ -162,12 +170,7 @@ class Discussion end def collapsed? - if resolvable? - # New diff discussions only disappear once they are marked resolved - resolved? - else - false - end + resolved? end def expanded? diff --git a/app/models/individual_note_discussion.rb b/app/models/individual_note_discussion.rb index 8c82d217126..585b8527883 100644 --- a/app/models/individual_note_discussion.rb +++ b/app/models/individual_note_discussion.rb @@ -3,11 +3,12 @@ class IndividualNoteDiscussion < Discussion [*super(note), SecureRandom.hex] end + # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` def potentially_resolvable? false end - def render_as_individual_notes? + def individual_note? true end end diff --git a/app/models/legacy_diff_discussion.rb b/app/models/legacy_diff_discussion.rb index e13f17abdbe..eb9766a9ffe 100644 --- a/app/models/legacy_diff_discussion.rb +++ b/app/models/legacy_diff_discussion.rb @@ -11,6 +11,7 @@ class LegacyDiffDiscussion < DiffDiscussion true end + # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` def potentially_resolvable? false end diff --git a/app/models/note.rb b/app/models/note.rb index 06ceb60b982..00a58afd2b6 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -56,7 +56,7 @@ class Note < ActiveRecord::Base validate unless: [:for_commit?, :importing?, :for_personal_snippet?] do |note| unless note.noteable.try(:project) == note.project - errors.add(:invalid_project, 'Note and noteable project mismatch') + errors.add(:project, 'does not match noteable project') end end @@ -236,14 +236,14 @@ class Note < ActiveRecord::Base end def can_be_discussion_note? - DiscussionNote::NOTEABLE_TYPES.include?(self.noteable_type) + DiscussionNote::NOTEABLE_TYPES.include?(self.noteable_type) && !part_of_discussion? end def discussion_class(noteable = nil) # When commit notes are rendered on an MR's Discussion page, they are # displayed in one discussion instead of individually - if noteable && noteable != self.noteable && for_commit? - CommitDiscussion + if noteable && noteable != self.noteable + OutOfContextDiscussion else IndividualNoteDiscussion end @@ -268,7 +268,24 @@ class Note < ActiveRecord::Base end def part_of_discussion? - !to_discussion.render_as_individual_notes? + !to_discussion.individual_note? + end + + def in_reply_to?(other) + case other + when Note + if part_of_discussion? + in_reply_to?(other.noteable) && in_reply_to?(other.to_discussion) + else + in_reply_to?(other.noteable) + end + when Discussion + self.discussion_id == other.id + when Noteable + self.noteable == other + else + false + end end private diff --git a/app/models/out_of_context_discussion.rb b/app/models/out_of_context_discussion.rb new file mode 100644 index 00000000000..0019064e25c --- /dev/null +++ b/app/models/out_of_context_discussion.rb @@ -0,0 +1,12 @@ +class OutOfContextDiscussion < Discussion + # To make sure all out-of-context notes are displayed in one discussion, + # we override the discussion ID to be a newly generated but consistent ID. + def self.override_discussion_id(note) + discussion_id(note) + end + + # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` + def potentially_resolvable? + false + end +end diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb index 6770af6fffd..81fc2ddac77 100644 --- a/app/models/sent_notification.rb +++ b/app/models/sent_notification.rb @@ -23,9 +23,7 @@ class SentNotification < ActiveRecord::Base find_by(reply_key: reply_key) end - def record(noteable, recipient_id, reply_key, attrs = {}) - return unless reply_key - + def record(noteable, recipient_id, reply_key = self.reply_key, attrs = {}) noteable_id = nil commit_id = nil if noteable.is_a?(Commit) @@ -47,7 +45,7 @@ class SentNotification < ActiveRecord::Base create(attrs) end - def record_note(note, recipient_id, reply_key, attrs = {}) + def record_note(note, recipient_id, reply_key = self.reply_key, attrs = {}) attrs[:in_reply_to_discussion_id] = note.original_discussion_id record(note.noteable, recipient_id, reply_key, attrs) @@ -87,7 +85,14 @@ class SentNotification < ActiveRecord::Base self.reply_key end - def note_params + def create_reply(message, dryrun: false) + klass = dryrun ? Notes::BuildService : Notes::CreateService + klass.new(self.project, self.recipient, reply_params.merge(note: message)).execute + end + + private + + def reply_params attrs = { noteable_type: self.noteable_type, noteable_id: self.noteable_id, @@ -111,10 +116,12 @@ class SentNotification < ActiveRecord::Base attrs end - private - def note_valid - Notes::BuildService.new(self.project, self.recipient, note_params.merge(note: 'Test')).execute.valid? + note = create_reply('Test', dryrun: true) + + unless note.valid? + self.errors.add(:base, "Note parameters are invalid: #{note.errors.full_messages.to_sentence}") + end end def keep_around_commit diff --git a/app/services/concerns/issues/resolve_discussions.rb b/app/services/concerns/issues/resolve_discussions.rb index 378967f0231..910a2a15e5d 100644 --- a/app/services/concerns/issues/resolve_discussions.rb +++ b/app/services/concerns/issues/resolve_discussions.rb @@ -21,7 +21,7 @@ module Issues @discussions_to_resolve ||= if discussion_to_resolve_id discussion_or_nil = merge_request_to_resolve_discussions_of - .find_diff_discussion(discussion_to_resolve_id) + .find_discussion(discussion_to_resolve_id) Array(discussion_or_nil) else merge_request_to_resolve_discussions_of diff --git a/app/services/notes/build_service.rb b/app/services/notes/build_service.rb index 47ed3e3fc3d..8d5a022d319 100644 --- a/app/services/notes/build_service.rb +++ b/app/services/notes/build_service.rb @@ -1,9 +1,6 @@ module Notes class BuildService < BaseService def execute - # TODO: Remove when we use a selectbox instead of a submit button - params[:type] = DiscussionNote.name if params.delete(:new_discussion) - in_reply_to_discussion_id = params.delete(:in_reply_to_discussion_id) if project && in_reply_to_discussion_id.present? discussion = @@ -17,6 +14,9 @@ module Notes end params.merge!(discussion.reply_attributes) + elsif params.delete(:new_discussion) + # TODO: Remove when we use a selectbox instead of a submit button + params[:type] = DiscussionNote.name end note = Note.new(params) diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml index d1855568215..c762578971a 100644 --- a/app/views/notify/new_issue_email.html.haml +++ b/app/views/notify/new_issue_email.html.haml @@ -1,9 +1,11 @@ - if current_application_settings.email_author_in_body - %div - #{link_to @issue.author_name, user_url(@issue.author)} wrote: -- if @issue.description - = markdown(@issue.description, pipeline: :email, author: @issue.author) + %p.details + #{link_to @issue.author_name, user_url(@issue.author)} created an issue: - if @issue.assignee_id.present? %p Assignee: #{@issue.assignee_name} + +- if @issue.description + %div + = markdown(@issue.description, pipeline: :email, author: @issue.author) diff --git a/app/views/notify/new_mention_in_issue_email.html.haml b/app/views/notify/new_mention_in_issue_email.html.haml index 02f21baa368..d7c22219285 100644 --- a/app/views/notify/new_mention_in_issue_email.html.haml +++ b/app/views/notify/new_mention_in_issue_email.html.haml @@ -1,12 +1,4 @@ %p You have been mentioned in an issue. -- if current_application_settings.email_author_in_body - %div - #{link_to @issue.author_name, user_url(@issue.author)} wrote: -- if @issue.description - = markdown(@issue.description, pipeline: :email, author: @issue.author) - -- if @issue.assignee_id.present? - %p - Assignee: #{@issue.assignee_name} += render template: 'new_issue_email' diff --git a/app/views/notify/new_mention_in_merge_request_email.html.haml b/app/views/notify/new_mention_in_merge_request_email.html.haml index cbd434be02a..07d8c301988 100644 --- a/app/views/notify/new_mention_in_merge_request_email.html.haml +++ b/app/views/notify/new_mention_in_merge_request_email.html.haml @@ -1,15 +1,4 @@ %p You have been mentioned in Merge Request #{@merge_request.to_reference} -- if current_application_settings.email_author_in_body - %div - #{link_to @merge_request.author_name, user_url(@merge_request.author)} wrote: -%p.details - != merge_path_description(@merge_request, '→') - -- if @merge_request.assignee_id.present? - %p - Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name} - -- if @merge_request.description - = markdown(@merge_request.description, pipeline: :email, author: @merge_request.author) += render template: 'new_merge_request_email' diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml index 8890b300f7d..951c96bdb9c 100644 --- a/app/views/notify/new_merge_request_email.html.haml +++ b/app/views/notify/new_merge_request_email.html.haml @@ -1,12 +1,14 @@ - if current_application_settings.email_author_in_body - %div - #{link_to @merge_request.author_name, user_url(@merge_request.author)} wrote: + %p.details + #{link_to @merge_request.author_name, user_url(@merge_request.author)} created a merge request: + %p.details != merge_path_description(@merge_request, '→') - if @merge_request.assignee_id.present? %p - Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name} + Assignee: #{@merge_request.assignee_name} - if @merge_request.description - = markdown(@merge_request.description, pipeline: :email, author: @merge_request.author) + %div + = markdown(@merge_request.description, pipeline: :email, author: @merge_request.author) diff --git a/app/views/projects/notes/_notes.html.haml b/app/views/projects/notes/_notes.html.haml index d619f7ac262..2b2bab09c74 100644 --- a/app/views/projects/notes/_notes.html.haml +++ b/app/views/projects/notes/_notes.html.haml @@ -1,6 +1,6 @@ - if defined?(@discussions) - @discussions.each do |discussion| - - if discussion.render_as_individual_notes? + - if discussion.individual_note? = render partial: "projects/notes/note", collection: discussion.notes, as: :note - else = render 'discussions/discussion', discussion: discussion diff --git a/lib/gitlab/email/handler/create_note_handler.rb b/lib/gitlab/email/handler/create_note_handler.rb index 0a9e928d13f..0e22f2189ee 100644 --- a/lib/gitlab/email/handler/create_note_handler.rb +++ b/lib/gitlab/email/handler/create_note_handler.rb @@ -1,4 +1,3 @@ - require 'gitlab/email/handler/base_handler' require 'gitlab/email/handler/reply_processing' @@ -42,11 +41,7 @@ module Gitlab end def create_note - Notes::CreateService.new( - project, - author, - sent_notification.note_params.merge(note: message) - ).execute + sent_notification.create_reply(message) end end end diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb index a3b0e8a252e..b276f9321c7 100644 --- a/spec/controllers/projects/notes_controller_spec.rb +++ b/spec/controllers/projects/notes_controller_spec.rb @@ -15,14 +15,163 @@ describe Projects::NotesController do end describe 'GET index' do - # It renders the discussion partial for any threaded note - # TODO: Test + let(:last_fetched_at) { '1487756246' } + let(:request_params) do + { + namespace_id: project.namespace, + project_id: project, + target_type: 'issue', + target_id: issue.id, + format: 'json' + } + end + + let(:parsed_response) { JSON.parse(response.body).with_indifferent_access } + let(:note_json) { parsed_response[:notes].first } + + before do + sign_in(user) + project.team << [user, :developer] + end + + it 'passes last_fetched_at from headers to NotesFinder' do + request.headers['X-Last-Fetched-At'] = last_fetched_at + + expect(NotesFinder).to receive(:new) + .with(anything, anything, hash_including(last_fetched_at: last_fetched_at)) + .and_call_original + + get :index, request_params + end + + context 'for a discussion note' do + let!(:note) { create(:discussion_note_on_issue, noteable: issue, project: project) } + + it 'includes the ID' do + get :index, request_params + + expect(note_json[:id]).to eq(note.id) + end + + it 'includes discussion_html' do + get :index, request_params + + expect(note_json[:discussion_html]).not_to be_nil + end + + it "doesn't include diff_discussion_html" do + get :index, request_params + + expect(note_json[:diff_discussion_html]).to be_nil + end + end + + context 'for a diff discussion note' do + let(:project) { create(:project, :repository) } + let!(:note) { create(:diff_note_on_merge_request, project: project) } + + let(:params) { request_params.merge(target_type: 'merge_request', target_id: note.noteable_id) } + + it 'includes the ID' do + get :index, params + + expect(note_json[:id]).to eq(note.id) + end + + it 'includes discussion_html' do + get :index, params + + expect(note_json[:discussion_html]).not_to be_nil + end + + it 'includes diff_discussion_html' do + get :index, params + + expect(note_json[:diff_discussion_html]).not_to be_nil + end + end + + context 'for a commit note' do + let(:project) { create(:project, :repository) } + let!(:note) { create(:note_on_commit, project: project) } + + context 'when displayed on a merge request' do + let(:merge_request) { create(:merge_request, source_project: project) } + + let(:params) { request_params.merge(target_type: 'merge_request', target_id: merge_request.id) } + + it 'includes the ID' do + get :index, params + + expect(note_json[:id]).to eq(note.id) + end + + it 'includes discussion_html' do + get :index, params + + expect(note_json[:discussion_html]).not_to be_nil + end + + it "doesn't include diff_discussion_html" do + get :index, params + + expect(note_json[:diff_discussion_html]).to be_nil + end + end + + context 'when displayed on the commit' do + let(:params) { request_params.merge(target_type: 'commit', target_id: note.commit_id) } + + it 'includes the ID' do + get :index, params + + expect(note_json[:id]).to eq(note.id) + end + + it "doesn't include discussion_html" do + get :index, params + + expect(note_json[:discussion_html]).to be_nil + end + + it "doesn't include diff_discussion_html" do + get :index, params + + expect(note_json[:diff_discussion_html]).to be_nil + end + end + end + + context 'for a regular note' do + let!(:note) { create(:note, noteable: issue, project: project) } + + it 'includes the ID' do + get :index, request_params + + expect(note_json[:id]).to eq(note.id) + end + + it 'includes html' do + get :index, request_params + + expect(note_json[:html]).not_to be_nil + end + + it "doesn't include discussion_html" do + get :index, request_params + + expect(note_json[:discussion_html]).to be_nil + end + + it "doesn't include diff_discussion_html" do + get :index, request_params + + expect(note_json[:diff_discussion_html]).to be_nil + end + end end describe 'POST create' do - # Test :type, :new_discussion, :in_reply_to_discussion_id (in_reply_to_id?) - # TODO: Test - let(:merge_request) { create(:merge_request) } let(:project) { merge_request.source_project } let(:request_params) do @@ -210,31 +359,4 @@ describe Projects::NotesController do end end end - - describe 'GET index' do - let(:last_fetched_at) { '1487756246' } - let(:request_params) do - { - namespace_id: project.namespace, - project_id: project, - target_type: 'issue', - target_id: issue.id - } - end - - before do - sign_in(user) - project.team << [user, :developer] - end - - it 'passes last_fetched_at from headers to NotesFinder' do - request.headers['X-Last-Fetched-At'] = last_fetched_at - - expect(NotesFinder).to receive(:new) - .with(anything, anything, hash_including(last_fetched_at: last_fetched_at)) - .and_call_original - - get :index, request_params - end - end end diff --git a/spec/factories/discussions.rb b/spec/factories/discussions.rb deleted file mode 100644 index 5e3a9b1e698..00000000000 --- a/spec/factories/discussions.rb +++ /dev/null @@ -1,5 +0,0 @@ -FactoryGirl.define do - factory :discussion do - # TODO: Implement - end -end diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index 0ad7034e96d..0f9056a4914 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -25,6 +25,14 @@ FactoryGirl.define do end end + factory :discussion_note_on_issue, traits: [:on_issue], class: DiscussionNote do + association :project, :repository + end + + factory :discussion_note_on_commit, traits: [:on_commit], class: DiscussionNote do + association :project, :repository + end + factory :legacy_diff_note_on_commit, traits: [:on_commit, :legacy_diff_note], class: LegacyDiffNote do association :project, :repository end @@ -46,7 +54,7 @@ FactoryGirl.define do new_path: "files/ruby/popen.rb", old_line: nil, new_line: line_number, - diff_refs: noteable.diff_refs + diff_refs: noteable.try(:diff_refs) ) end @@ -127,8 +135,8 @@ FactoryGirl.define do next unless discussion discussion = discussion.to_discussion if discussion.is_a?(Note) next unless discussion - - note.assign_attributes(discussion.reply_attributes) + + note.assign_attributes(discussion.reply_attributes.merge(project: discussion.project)) end end end diff --git a/spec/factories/sent_notifications.rb b/spec/factories/sent_notifications.rb index 6287c40afe9..0590bf999c0 100644 --- a/spec/factories/sent_notifications.rb +++ b/spec/factories/sent_notifications.rb @@ -3,6 +3,6 @@ FactoryGirl.define do project factory: :empty_project recipient factory: :user noteable factory: :issue - reply_key "0123456789abcdef" * 2 + reply_key { SentNotification.reply_key } end end diff --git a/spec/finders/notes_finder_spec.rb b/spec/finders/notes_finder_spec.rb index d2ec42ae70f..765bf44d863 100644 --- a/spec/finders/notes_finder_spec.rb +++ b/spec/finders/notes_finder_spec.rb @@ -204,6 +204,43 @@ describe NotesFinder do end describe '#target' do - # TODO: Test + subject { described_class.new(project, user, params) } + + context 'for a issue target' do + let(:issue) { create(:issue, project: project) } + let(:params) { { target_type: 'issue', target_id: issue.id } } + + it 'returns the issue' do + expect(subject.target).to eq(issue) + end + end + + context 'for a merge request target' do + let(:merge_request) { create(:merge_request, source_project: project) } + let(:params) { { target_type: 'merge_request', target_id: merge_request.id } } + + it 'returns the merge_request' do + expect(subject.target).to eq(merge_request) + end + end + + context 'for a snippet target' do + let(:snippet) { create(:project_snippet, project: project) } + let(:params) { { target_type: 'snippet', target_id: snippet.id } } + + it 'returns the snippet' do + expect(subject.target).to eq(snippet) + end + end + + context 'for a commit target' do + let(:project) { create(:project, :repository) } + let(:commit) { project.commit } + let(:params) { { target_type: 'commit', target_id: commit.id } } + + it 'returns the commit' do + expect(subject.target).to eq(commit) + end + end end end diff --git a/spec/helpers/issues_helper_spec.rb b/spec/helpers/issues_helper_spec.rb index f0554cc068d..540cb0ab1e0 100644 --- a/spec/helpers/issues_helper_spec.rb +++ b/spec/helpers/issues_helper_spec.rb @@ -150,7 +150,7 @@ describe IssuesHelper do describe "when passing a discussion" do let(:diff_note) { create(:diff_note_on_merge_request) } let(:merge_request) { diff_note.noteable } - let(:discussion) { Discussion.new([diff_note]) } + let(:discussion) { diff_note.to_discussion } it "links to the merge request with first note if a single discussion was passed" do expected_path = Gitlab::UrlBuilder.build(diff_note) diff --git a/spec/lib/gitlab/email/handler/create_note_handler_spec.rb b/spec/lib/gitlab/email/handler/create_note_handler_spec.rb index b300feaabe1..3f79eaf7afb 100644 --- a/spec/lib/gitlab/email/handler/create_note_handler_spec.rb +++ b/spec/lib/gitlab/email/handler/create_note_handler_spec.rb @@ -143,6 +143,7 @@ describe Gitlab::Email::Handler::CreateNoteHandler, lib: true do expect(new_note.author).to eq(sent_notification.recipient) expect(new_note.position).to eq(note.position) expect(new_note.note).to include("I could not disagree more.") + expect(new_note.in_reply_to?(note)).to be_truthy end it "adds all attachments" do diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index 01246f87dff..fcbbc3166ed 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -63,7 +63,7 @@ describe Notify do it 'contains a link to note author' do is_expected.to have_html_escaped_body_text(issue.author_name) - is_expected.to have_body_text 'wrote:' + is_expected.to have_body_text 'created an issue:' end end end @@ -215,7 +215,7 @@ describe Notify do it 'contains a link to note author' do is_expected.to have_html_escaped_body_text merge_request.author_name - is_expected.to have_body_text 'wrote:' + is_expected.to have_body_text 'created a merge request:' end end end @@ -536,8 +536,6 @@ describe Notify do allow(Note).to receive(:find).with(note.id).and_return(note) end - # TODO: Test discussions - shared_examples 'a note email' do it_behaves_like 'it should have Gmail Actions links' @@ -556,7 +554,7 @@ describe Notify do end it 'does not contain note author' do - is_expected.not_to have_body_text 'wrote:' + is_expected.not_to have_body_text note.author_name end context 'when enabled email_author_in_body' do @@ -566,7 +564,6 @@ describe Notify do it 'contains a link to note author' do is_expected.to have_html_escaped_body_text note.author_name - is_expected.to have_body_text 'wrote:' end end end @@ -639,7 +636,7 @@ describe Notify do end end - context 'items that are noteable, emails for a note on a diff' do + context 'items that are noteable, the email for a discussion note' do let(:project) { create(:project, :repository) } let(:note_author) { create(:user, name: 'author_name') } @@ -647,7 +644,117 @@ describe Notify do allow(Note).to receive(:find).with(note.id).and_return(note) end - shared_examples 'a note email on a diff' do |model| + shared_examples 'a discussion note email' do |model| + it_behaves_like 'it should have Gmail Actions links' + + it 'is sent as the author' do + sender = subject.header[:from].addrs[0] + expect(sender.display_name).to eq(note_author.name) + expect(sender.address).to eq(gitlab_sender) + end + + it 'is sent to the given recipient' do + is_expected.to deliver_to recipient.notification_email + end + + it 'contains the message from the note' do + is_expected.to have_body_text note.note + end + + it 'contains an introduction' do + is_expected.to have_body_text 'started a new discussion' + end + + context 'when a comment on an existing discussion' do + let!(:second_note) { create(model, author: note_author, noteable: nil, in_reply_to: note) } + + it 'contains an introduction' do + is_expected.to have_body_text 'commented on a' + end + end + end + + describe 'on a commit' do + let(:commit) { project.commit } + let(:note) { create(:discussion_note_on_commit, commit_id: commit.id, project: project, author: note_author) } + + before(:each) { allow(note).to receive(:noteable).and_return(commit) } + + subject { Notify.note_commit_email(recipient.id, note.id) } + + it_behaves_like 'a discussion note email', :discussion_note_on_commit + it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do + let(:model) { commit } + end + it_behaves_like 'it should show Gmail Actions View Commit link' + it_behaves_like 'a user cannot unsubscribe through footer link' + + it 'has the correct subject' do + is_expected.to have_subject "Re: #{project.name} | #{commit.title.strip} (#{commit.short_id})" + end + + it 'contains a link to the commit' do + is_expected.to have_body_text commit.short_id + end + end + + describe 'on a merge request' do + let(:merge_request) { create(:merge_request, source_project: project, target_project: project) } + let(:note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project, author: note_author) } + let(:note_on_merge_request_path) { namespace_project_merge_request_path(project.namespace, project, merge_request, anchor: "note_#{note.id}") } + before(:each) { allow(note).to receive(:noteable).and_return(merge_request) } + + subject { Notify.note_merge_request_email(recipient.id, note.id) } + + it_behaves_like 'a discussion note email', :discussion_note_on_merge_request + it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do + let(:model) { merge_request } + end + it_behaves_like 'it should show Gmail Actions View Merge request link' + it_behaves_like 'an unsubscribeable thread' + + it 'has the correct subject' do + is_expected.to have_referable_subject(merge_request, reply: true) + end + + it 'contains a link to the merge request note' do + is_expected.to have_body_text note_on_merge_request_path + end + end + + describe 'on an issue' do + let(:issue) { create(:issue, project: project) } + let(:note) { create(:discussion_note_on_issue, noteable: issue, project: project, author: note_author) } + let(:note_on_issue_path) { namespace_project_issue_path(project.namespace, project, issue, anchor: "note_#{note.id}") } + before(:each) { allow(note).to receive(:noteable).and_return(issue) } + + subject { Notify.note_issue_email(recipient.id, note.id) } + + it_behaves_like 'a discussion note email', :discussion_note_on_issue + it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do + let(:model) { issue } + end + it_behaves_like 'it should show Gmail Actions View Issue link' + it_behaves_like 'an unsubscribeable thread' + + it 'has the correct subject' do + is_expected.to have_referable_subject(issue, reply: true) + end + + it 'contains a link to the issue note' do + is_expected.to have_body_text note_on_issue_path + end + end + end + + context 'items that are noteable, the email for a diff discussion note' do + let(:note_author) { create(:user, name: 'author_name') } + + before :each do + allow(Note).to receive(:find).with(note.id).and_return(note) + end + + shared_examples 'an email for a note on a diff discussion' do |model| let(:note) { create(model, project: project, author: note_author) } it "includes diffs with character-level highlighting" do @@ -674,18 +781,15 @@ describe Notify do is_expected.to have_html_escaped_body_text note.note end - it 'does not contain note author' do - is_expected.not_to have_body_text 'wrote:' + it 'contains an introduction' do + is_expected.to have_body_text 'started a new discussion on' end - context 'when enabled email_author_in_body' do - before do - stub_application_setting(email_author_in_body: true) - end + context 'when a comment on an existing discussion' do + let!(:second_note) { create(model, author: note_author, noteable: nil, in_reply_to: note) } - it 'contains a link to note author' do - is_expected.to have_html_escaped_body_text note.author_name - is_expected.to have_body_text 'wrote:' + it 'contains an introduction' do + is_expected.to have_body_text 'commented on a discussion on' end end end @@ -696,7 +800,7 @@ describe Notify do subject { Notify.note_commit_email(recipient.id, note.id) } - it_behaves_like 'a note email on a diff', :diff_note_on_commit + it_behaves_like 'an email for a note on a diff discussion', :diff_note_on_commit it_behaves_like 'it should show Gmail Actions View Commit link' it_behaves_like 'a user cannot unsubscribe through footer link' end @@ -707,7 +811,7 @@ describe Notify do subject { Notify.note_merge_request_email(recipient.id, note.id) } - it_behaves_like 'a note email on a diff', :diff_note_on_merge_request + it_behaves_like 'an email for a note on a diff discussion', :diff_note_on_merge_request it_behaves_like 'it should show Gmail Actions View Merge request link' it_behaves_like 'an unsubscribeable thread' end diff --git a/spec/models/commit_discussion_spec.rb b/spec/models/commit_discussion_spec.rb deleted file mode 100644 index 6a5042d8827..00000000000 --- a/spec/models/commit_discussion_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'spec_helper' - -describe CommitDiscussion, model: true do - # TODO: Test -end diff --git a/spec/models/concerns/noteable_spec.rb b/spec/models/concerns/noteable_spec.rb index 51855fb2f0d..24962d3b074 100644 --- a/spec/models/concerns/noteable_spec.rb +++ b/spec/models/concerns/noteable_spec.rb @@ -1,5 +1,85 @@ require 'spec_helper' -describe Noteable, model: true do - # TODO: Test +describe MergeRequest, Noteable, model: true do + let(:merge_request) { create(:merge_request) } + let(:project) { merge_request.project } + let!(:active_diff_note1) { create(:diff_note_on_merge_request, project: project, noteable: merge_request) } + let!(:active_diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: merge_request) } + let!(:active_diff_note3) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: active_position2) } + let!(:outdated_diff_note1) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: outdated_position) } + let!(:outdated_diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: outdated_position) } + let!(:discussion_note1) { create(:discussion_note_on_merge_request, project: project, noteable: merge_request) } + let!(:discussion_note2) { create(:discussion_note_on_merge_request, in_reply_to: discussion_note1) } + let!(:commit_diff_note1) { create(:diff_note_on_commit, project: project) } + let!(:commit_diff_note2) { create(:diff_note_on_commit, project: project) } + let!(:commit_note1) { create(:note_on_commit, project: project) } + let!(:commit_note2) { create(:note_on_commit, project: project) } + let!(:commit_discussion_note1) { create(:discussion_note_on_commit, project: project) } + let!(:commit_discussion_note2) { create(:discussion_note_on_commit, in_reply_to: commit_discussion_note1) } + let!(:commit_discussion_note3) { create(:discussion_note_on_commit, project: project) } + let!(:note1) { create(:note, project: project, noteable: merge_request) } + let!(:note2) { create(:note, project: project, noteable: merge_request) } + + let(:active_position2) do + Gitlab::Diff::Position.new( + old_path: "files/ruby/popen.rb", + new_path: "files/ruby/popen.rb", + old_line: 16, + new_line: 22, + diff_refs: merge_request.diff_refs + ) + end + + let(:outdated_position) do + Gitlab::Diff::Position.new( + old_path: "files/ruby/popen.rb", + new_path: "files/ruby/popen.rb", + old_line: nil, + new_line: 9, + diff_refs: project.commit("874797c3a73b60d2187ed6e2fcabd289ff75171e").diff_refs + ) + end + + describe '#discussions' do + subject { merge_request.discussions } + + it 'includes discussions for diff notes, commit diff notes, commit notes, and regular notes' do + expect(subject).to eq([ + DiffDiscussion.new([active_diff_note1, active_diff_note2], merge_request), + DiffDiscussion.new([active_diff_note3], merge_request), + DiffDiscussion.new([outdated_diff_note1, outdated_diff_note2], merge_request), + SimpleDiscussion.new([discussion_note1, discussion_note2], merge_request), + DiffDiscussion.new([commit_diff_note1, commit_diff_note2], merge_request), + OutOfContextDiscussion.new([commit_note1, commit_note2], merge_request), + SimpleDiscussion.new([commit_discussion_note1, commit_discussion_note2], merge_request), + SimpleDiscussion.new([commit_discussion_note3], merge_request), + IndividualNoteDiscussion.new([note1], merge_request), + IndividualNoteDiscussion.new([note2], merge_request) + ]) + end + end + + describe '#grouped_diff_discussions' do + subject { merge_request.grouped_diff_discussions } + + it "includes active discussions" do + discussions = subject.values + + expect(discussions.count).to eq(2) + expect(discussions.map(&:id)).to eq([active_diff_note1.discussion_id, active_diff_note3.discussion_id]) + expect(discussions.all?(&:active?)).to be true + + expect(discussions.first.notes).to eq([active_diff_note1, active_diff_note2]) + expect(discussions.last.notes).to eq([active_diff_note3]) + end + + it "doesn't include outdated discussions" do + expect(subject.values.map(&:id)).not_to include(outdated_diff_note1.discussion_id) + end + + it "groups the discussions by line code" do + expect(subject[active_diff_note1.line_code].id).to eq(active_diff_note1.discussion_id) + expect(subject[active_diff_note3.line_code].id).to eq(active_diff_note3.discussion_id) + end + end end diff --git a/spec/models/concerns/resolvable_note_spec.rb b/spec/models/concerns/resolvable_note_spec.rb index 3306b311e4a..a5a26958410 100644 --- a/spec/models/concerns/resolvable_note_spec.rb +++ b/spec/models/concerns/resolvable_note_spec.rb @@ -3,16 +3,37 @@ require 'spec_helper' describe Note, ResolvableNote, models: true do subject { create(:discussion_note_on_merge_request) } - describe '.resolvable' do - # TODO: Test - end + context 'resolvability scopes' do + let!(:note1) { create(:note) } + let!(:note2) { create(:diff_note_on_commit) } + let!(:note3) { create(:diff_note_on_merge_request, :resolved) } + let!(:note4) { create(:discussion_note_on_merge_request) } + let!(:note5) { create(:discussion_note_on_issue) } + let!(:note6) { create(:discussion_note_on_merge_request, :system) } - describe '.resolved' do - # TODO: Test - end + describe '.potentially_resolvable' do + it 'includes diff and discussion notes on merge requests' do + expect(Note.potentially_resolvable).to match_array([note3, note4, note6]) + end + end - describe '.unresolved' do - # TODO: Test + describe '.resolvable' do + it 'includes non-system diff and discussion notes on merge requests' do + expect(Note.resolvable).to match_array([note3, note4]) + end + end + + describe '.resolved' do + it 'includes resolved non-system diff and discussion notes on merge requests' do + expect(Note.resolved).to match_array([note3]) + end + end + + describe '.unresolved' do + it 'includes non-resolved non-system diff and discussion notes on merge requests' do + expect(Note.unresolved).to match_array([note4]) + end + end end describe ".resolve!" do @@ -55,7 +76,7 @@ describe Note, ResolvableNote, models: true do describe '#resolvable?' do context "when potentially resolvable" do before do - allow(subject).to receive(:discussion_resolvable?).and_return(true) + allow(subject).to receive(:potentially_resolvable?).and_return(true) end context "when a system note" do @@ -77,7 +98,7 @@ describe Note, ResolvableNote, models: true do context "when not potentially resolvable" do before do - allow(subject).to receive(:discussion_resolvable?).and_return(false) + allow(subject).to receive(:potentially_resolvable?).and_return(false) end it "returns false" do @@ -125,7 +146,37 @@ describe Note, ResolvableNote, models: true do end describe "#resolved?" do - # TODO: Test + let(:current_user) { create(:user) } + + context 'when not resolvable' do + before do + subject.resolve!(current_user) + + allow(subject).to receive(:resolvable?).and_return(false) + end + + it 'returns false' do + expect(subject.resolved?).to be_falsey + end + end + + context 'when resolvable' do + context 'when the note has been resolved' do + before do + subject.resolve!(current_user) + end + + it 'returns true' do + expect(subject.resolved?).to be_truthy + end + end + + context 'when the note has not been resolved' do + it 'returns false' do + expect(subject.resolved?).to be_falsey + end + end + end end describe "#resolve!" do diff --git a/spec/models/diff_discussion_spec.rb b/spec/models/diff_discussion_spec.rb index 6109d77f27c..ba7dd5280bd 100644 --- a/spec/models/diff_discussion_spec.rb +++ b/spec/models/diff_discussion_spec.rb @@ -4,10 +4,16 @@ describe DiffDiscussion, model: true do subject { described_class.new([first_note, second_note, third_note]) } let(:first_note) { create(:diff_note_on_merge_request) } - let(:second_note) { create(:diff_note_on_merge_request) } - let(:third_note) { create(:diff_note_on_merge_request) } + let(:second_note) { create(:diff_note_on_merge_request, in_reply_to: first_note) } + let(:third_note) { create(:diff_note_on_merge_request, in_reply_to: first_note) } -# TODO: Test + describe '#reply_attributes' do + it 'includes position and original_position' do + attributes = subject.reply_attributes + expect(attributes[:position]).to eq(first_note.position.to_json) + expect(attributes[:original_position]).to eq(first_note.original_position.to_json) + end + end describe "#truncated_diff_lines" do let(:truncated_lines) { subject.truncated_diff_lines } diff --git a/spec/models/diff_note_spec.rb b/spec/models/diff_note_spec.rb index 92059936188..533d38c0229 100644 --- a/spec/models/diff_note_spec.rb +++ b/spec/models/diff_note_spec.rb @@ -58,7 +58,29 @@ describe DiffNote, models: true do end describe "#original_position=" do - # TODO: Test + context "when provided a string" do + it "sets the original position" do + subject.original_position = new_position.to_json + + expect(subject.original_position).to eq(new_position) + end + end + + context "when provided a hash" do + it "sets the original position" do + subject.original_position = new_position.to_h + + expect(subject.original_position).to eq(new_position) + end + end + + context "when provided a position object" do + it "sets the original position" do + subject.original_position = new_position + + expect(subject.original_position).to eq(new_position) + end + end end describe "#diff_file" do diff --git a/spec/models/discussion_note_spec.rb b/spec/models/discussion_note_spec.rb index d61ea05e318..49084c854d8 100644 --- a/spec/models/discussion_note_spec.rb +++ b/spec/models/discussion_note_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' describe DiscussionNote, models: true do - # TODO: Test + end diff --git a/spec/models/discussion_spec.rb b/spec/models/discussion_spec.rb index f48450589d0..771ca37cb12 100644 --- a/spec/models/discussion_spec.rb +++ b/spec/models/discussion_spec.rb @@ -4,33 +4,34 @@ describe Discussion, model: true do subject { described_class.new([first_note, second_note, third_note]) } let(:first_note) { create(:discussion_note_on_merge_request) } - let(:second_note) { create(:discussion_note_on_merge_request) } + let(:merge_request) { first_note.noteable } + let(:second_note) { create(:discussion_note_on_merge_request, in_reply_to: first_note) } let(:third_note) { create(:discussion_note_on_merge_request) } describe '.build' do - # TODO: Test + it 'returns a discussion of the right type' do + discussion = described_class.build([first_note, second_note], merge_request) + expect(discussion).to be_a(SimpleDiscussion) + expect(discussion.notes.count).to be(2) + expect(discussion.first_note).to be(first_note) + expect(discussion.noteable).to be(merge_request) + end end describe '.build_collection' do - # TODO: Test - end - - describe '#id' do - # TODO: Test - end - - describe '#original_id' do - # TODO: Test - end - - describe '#potentially_resolvable?' do - # TODO: Test + it 'returns an array of discussions of the right type' do + discussions = described_class.build_collection([first_note, second_note, third_note], merge_request) + expect(discussions).to eq([ + SimpleDiscussion.new([first_note, second_note], merge_request), + SimpleDiscussion.new([third_note], merge_request) + ]) + end end describe "#resolvable?" do context "when potentially resolvable" do before do - allow(subject).to receive(:discussion_resolvable?).and_return(true) + allow(subject).to receive(:potentially_resolvable?).and_return(true) end context "when all notes are unresolvable" do @@ -72,7 +73,7 @@ describe Discussion, model: true do context "when not potentially resolvable" do before do - allow(subject).to receive(:discussion_resolvable?).and_return(false) + allow(subject).to receive(:potentially_resolvable?).and_return(false) end it "returns false" do @@ -542,7 +543,7 @@ describe Discussion, model: true do end describe "#first_note_to_resolve" do - it "returns the first not that still needs to be resolved" do + it "returns the first note that still needs to be resolved" do allow(first_note).to receive(:to_be_resolved?).and_return(false) allow(second_note).to receive(:to_be_resolved?).and_return(true) @@ -551,88 +552,16 @@ describe Discussion, model: true do end describe "#last_resolved_note" do - # TODO: Test - end + let(:current_user) { create(:user) } - describe "#collapsed?" do - context "when potentially resolvable" do - before do - allow(subject).to receive(:discussion_resolvable?).and_return(true) - end - - context "when resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(true) - end - - context "when resolved" do - before do - allow(subject).to receive(:resolved?).and_return(true) - end - - it "returns true" do - expect(subject.collapsed?).to be true - end - end - - context "when not resolved" do - before do - allow(subject).to receive(:resolved?).and_return(false) - end - - it "returns false" do - expect(subject.collapsed?).to be false - end - end - end - - context "when not resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(false) - end - - context "when a diff discussion" do - before do - allow(subject).to receive(:diff_discussion?).and_return(true) - end - - context "when active" do - before do - allow(subject).to receive(:active?).and_return(true) - end - - it "returns false" do - expect(subject.collapsed?).to be false - end - end - - context "when outdated" do - before do - allow(subject).to receive(:active?).and_return(false) - end - - it "returns true" do - expect(subject.collapsed?).to be true - end - end - end - - context "when not a diff discussion" do - it "returns false" do - expect(subject.collapsed?).to be false - end - end - end + before do + first_note.resolve!(current_user) + third_note.resolve!(current_user) + second_note.resolve!(current_user) end - context "when not potentially resolvable" do - before do - allow(subject).to receive(:discussion_resolvable?).and_return(false) - end - - it "returns false" do - expect(subject.collapsed?).to be false - end + it "returns the last note that was resolved" do + expect(subject.last_resolved_note).to eq(second_note) end end end diff --git a/spec/models/individual_note_discussion_spec.rb b/spec/models/individual_note_discussion_spec.rb index 33de682aedc..3938dfc4bb1 100644 --- a/spec/models/individual_note_discussion_spec.rb +++ b/spec/models/individual_note_discussion_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' describe IndividualNoteDiscussion, models: true do - # TODO: Test + end diff --git a/spec/models/legacy_diff_discussion_spec.rb b/spec/models/legacy_diff_discussion_spec.rb index 72e33877b40..153e757a0ef 100644 --- a/spec/models/legacy_diff_discussion_spec.rb +++ b/spec/models/legacy_diff_discussion_spec.rb @@ -1,5 +1,11 @@ require 'spec_helper' describe LegacyDiffDiscussion, models: true do - # TODO: Test + subject { create(:legacy_diff_note_on_merge_request).to_discussion } + + describe '#reply_attributes' do + it 'includes line_code' do + expect(subject.reply_attributes[:line_code]).to eq(subject.line_code) + end + end end diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 3d26049b54a..5d0862abb92 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1225,18 +1225,14 @@ describe MergeRequest, models: true do end context "discussion status" do - let(:first_discussion) { Discussion.new([create(:discussion_note_on_merge_request)]) } - let(:second_discussion) { Discussion.new([create(:discussion_note_on_merge_request)]) } - let(:third_discussion) { Discussion.new([create(:discussion_note_on_merge_request)]) } + let(:first_discussion) { create(:discussion_note_on_merge_request).to_discussion } + let(:second_discussion) { create(:discussion_note_on_merge_request).to_discussion } + let(:third_discussion) { create(:discussion_note_on_merge_request).to_discussion } before do allow(subject).to receive(:resolvable_discussions).and_return([first_discussion, second_discussion, third_discussion]) end - describe '#resolvable_discussions' do - # TODO: Test - end - describe "#discussions_resolvable?" do context "when all discussions are unresolvable" do before do diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 7a85c5f22ff..67b4fed5f8f 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -245,16 +245,32 @@ describe Note, models: true do end end - describe '.discussions' do - # TODO: Test - end - describe '.find_original_discussion' do - # TODO: Test + let!(:note) { create(:discussion_note_on_merge_request) } + let!(:note2) { create(:discussion_note_on_merge_request, in_reply_to: note) } + let(:merge_request) { note.noteable } + + it 'returns a discussion with one note' do + discussion = merge_request.notes.find_original_discussion(note.original_discussion_id) + + expect(discussion).not_to be_nil + expect(discussion.notes.count).to be(1) + expect(discussion.first_note.original_discussion_id).to eq(note.original_discussion_id) + end end describe '.find_discussion' do - # TODO: Test + let!(:note) { create(:discussion_note_on_merge_request) } + let!(:note2) { create(:discussion_note_on_merge_request, in_reply_to: note) } + let(:merge_request) { note.noteable } + + it 'returns a discussion with multiple note' do + discussion = merge_request.notes.find_discussion(note.discussion_id) + + expect(discussion).not_to be_nil + expect(discussion.notes).to match_array([note, note2]) + expect(discussion.first_note.discussion_id).to eq(note.discussion_id) + end end describe ".grouped_diff_discussions" do @@ -376,15 +392,82 @@ describe Note, models: true do end describe '#can_be_discussion_note?' do - # TODO: Test + context 'for a note on a merge request' do + let(:note) { build(:note_on_merge_request) } + + it 'returns true' do + expect(note.can_be_discussion_note?).to be_truthy + end + end + + context 'for a note on an issue' do + let(:note) { build(:note_on_issue) } + + it 'returns true' do + expect(note.can_be_discussion_note?).to be_truthy + end + end + + context 'for a note on a commit' do + let(:note) { build(:note_on_commit) } + + it 'returns true' do + expect(note.can_be_discussion_note?).to be_truthy + end + end + + context 'for a note on a snippet' do + let(:note) { build(:note_on_project_snippet) } + + it 'returns true' do + expect(note.can_be_discussion_note?).to be_truthy + end + end + + context 'for a diff note on merge request' do + let(:note) { build(:diff_note_on_merge_request) } + + it 'returns false' do + expect(note.can_be_discussion_note?).to be_falsey + end + end + + context 'for a diff note on commit' do + let(:note) { build(:diff_note_on_commit) } + + it 'returns false' do + expect(note.can_be_discussion_note?).to be_falsey + end + end + + context 'for a discussion note' do + let(:note) { build(:discussion_note_on_merge_request) } + + it 'returns false' do + expect(note.can_be_discussion_note?).to be_falsey + end + end end describe '#discussion_class' do - # TODO: Test + let(:note) { build(:note_on_commit) } + let(:merge_request) { create(:merge_request) } + + context 'when the note is displayed out of context' do + it 'returns OutOfContextDiscussion' do + expect(note.discussion_class(merge_request)).to be(OutOfContextDiscussion) + end + end + + context 'when the note is displayed in the original context' do + it 'returns IndividualNoteDiscussion' do + expect(note.discussion_class(note.noteable)).to be(IndividualNoteDiscussion) + end + end end describe "#discussion_id" do - let(:note) { create(:note) } + let(:note) { create(:note_on_commit) } context "when it is newly created" do it "has a discussion id" do @@ -406,10 +489,39 @@ describe Note, models: true do expect(reloaded_note.discussion_id).to match(/\A\h{40}\z/) end end + + context 'when the note is displayed out of context' do + let(:merge_request) { create(:merge_request) } + + it 'overrides the discussion id' do + expect(note.discussion_id(merge_request)).not_to eq(note.discussion_id) + end + end end describe "#original_discussion_id" do - # TODO: Test + let(:note) { create(:diff_note_on_merge_request) } + + context "when it is newly created" do + it "has a discussion id" do + expect(note.original_discussion_id).not_to be_nil + expect(note.original_discussion_id).to match(/\A\h{40}\z/) + end + end + + context "when it didn't store a discussion id before" do + before do + note.update_column(:original_discussion_id, nil) + end + + it "has a discussion id" do + # The original_discussion_id is set in `after_initialize`, so `reload` won't work + reloaded_note = Note.find(note.id) + + expect(reloaded_note.original_discussion_id).not_to be_nil + expect(reloaded_note.original_discussion_id).to match(/\A\h{40}\z/) + end + end end describe '#to_discussion' do @@ -452,7 +564,98 @@ describe Note, models: true do end describe "#part_of_discussion?" do - # TODO: Test + context 'for a regular note' do + let(:note) { build(:note) } + + it 'returns false' do + expect(note.part_of_discussion?).to be_falsey + end + end + + context 'for a diff note' do + let(:note) { build(:diff_note_on_commit) } + + it 'returns true' do + expect(note.part_of_discussion?).to be_truthy + end + end + + context 'for a discussion note' do + let(:note) { build(:discussion_note_on_merge_request) } + + it 'returns true' do + expect(note.part_of_discussion?).to be_truthy + end + end + end + + describe '#in_reply_to?' do + context 'for a note' do + context 'when part of a discussion' do + subject { create(:discussion_note_on_issue) } + let(:note) { create(:discussion_note_on_issue, in_reply_to: subject) } + + it 'checks if the note is in reply to the other discussion' do + expect(subject).to receive(:in_reply_to?).with(note).and_call_original + expect(subject).to receive(:in_reply_to?).with(note.noteable).and_call_original + expect(subject).to receive(:in_reply_to?).with(note.to_discussion).and_call_original + + subject.in_reply_to?(note) + end + end + + context 'when not part of a discussion' do + subject { create(:note) } + let(:note) { create(:note, in_reply_to: subject) } + + it 'checks if the note is in reply to the other noteable' do + expect(subject).to receive(:in_reply_to?).with(note).and_call_original + expect(subject).to receive(:in_reply_to?).with(note.noteable).and_call_original + + subject.in_reply_to?(note) + end + end + end + + context 'for a discussion' do + context 'when part of the same discussion' do + subject { create(:diff_note_on_merge_request) } + let(:note) { create(:diff_note_on_merge_request, in_reply_to: subject) } + + it 'returns true' do + expect(subject.in_reply_to?(note.to_discussion)).to be_truthy + end + end + + context 'when not part of the same discussion' do + subject { create(:diff_note_on_merge_request) } + let(:note) { create(:diff_note_on_merge_request) } + + it 'returns false' do + expect(subject.in_reply_to?(note.to_discussion)).to be_falsey + end + end + end + + context 'for a noteable' do + context 'when a comment on the same noteable' do + subject { create(:note) } + let(:note) { create(:note, in_reply_to: subject) } + + it 'returns true' do + expect(subject.in_reply_to?(note.noteable)).to be_truthy + end + end + + context 'when not a comment on the same noteable' do + subject { create(:note) } + let(:note) { create(:note) } + + it 'returns false' do + expect(subject.in_reply_to?(note.noteable)).to be_falsey + end + end + end end describe 'expiring ETag cache' do diff --git a/spec/models/out_of_context_discussion_spec.rb b/spec/models/out_of_context_discussion_spec.rb new file mode 100644 index 00000000000..d765e7052d1 --- /dev/null +++ b/spec/models/out_of_context_discussion_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe OutOfContextDiscussion, model: true do + +end diff --git a/spec/models/sent_notification_spec.rb b/spec/models/sent_notification_spec.rb index 2fc6cce471f..7a7ece24fc9 100644 --- a/spec/models/sent_notification_spec.rb +++ b/spec/models/sent_notification_spec.rb @@ -1,5 +1,166 @@ require 'spec_helper' describe SentNotification, model: true do - # TODO: Test + describe 'validation' do + describe 'note validity' do + context "when the project doesn't match the noteable's project" do + subject { build(:sent_notification, project: create(:project)) } + + it "is invalid" do + expect(subject).not_to be_valid + end + end + + context "when the project doesn't match the discussion project" do + let(:discussion_id) { create(:note).original_discussion_id } + subject { build(:sent_notification, in_reply_to_discussion_id: discussion_id) } + + it "is invalid" do + expect(subject).not_to be_valid + end + end + + context "when the noteable project and discussion project match" do + let(:project) { create(:project) } + let(:issue) { create(:issue, project: project) } + let(:discussion_id) { create(:note, project: project, noteable: issue).original_discussion_id } + subject { build(:sent_notification, project: project, noteable: issue, in_reply_to_discussion_id: discussion_id) } + + it "is valid" do + expect(subject).to be_valid + end + end + end + end + + describe '.record' do + let(:user) { create(:user) } + let(:issue) { create(:issue) } + + it 'creates a new SentNotification' do + expect { described_class.record(issue, user.id) }.to change { SentNotification.count }.by(1) + end + end + + describe '.record_note' do + let(:user) { create(:user) } + let(:note) { create(:diff_note_on_merge_request) } + + it 'creates a new SentNotification' do + expect { described_class.record_note(note, user.id) }.to change { SentNotification.count }.by(1) + end + end + + describe '#create_reply' do + context 'for issue' do + let(:issue) { create(:issue) } + subject { described_class.record(issue, issue.author.id) } + + it 'creates a comment on the issue' do + note = subject.create_reply('Test') + expect(note.in_reply_to?(issue)).to be_truthy + end + end + + context 'for issue comment' do + let(:note) { create(:note_on_issue) } + subject { described_class.record_note(note, note.author.id) } + + it 'creates a comment on the issue' do + new_note = subject.create_reply('Test') + expect(new_note.in_reply_to?(note)).to be_truthy + end + end + + context 'for issue discussion' do + let(:note) { create(:discussion_note_on_issue) } + subject { described_class.record_note(note, note.author.id) } + + it 'creates a reply on the discussion' do + new_note = subject.create_reply('Test') + expect(new_note.in_reply_to?(note)).to be_truthy + end + end + + context 'for merge request' do + let(:merge_request) { create(:merge_request) } + subject { described_class.record(merge_request, merge_request.author.id) } + + it 'creates a comment on the merge_request' do + note = subject.create_reply('Test') + expect(note.in_reply_to?(merge_request)).to be_truthy + end + end + + context 'for merge request comment' do + let(:note) { create(:note_on_merge_request) } + subject { described_class.record_note(note, note.author.id) } + + it 'creates a comment on the merge request' do + new_note = subject.create_reply('Test') + expect(new_note.in_reply_to?(note)).to be_truthy + end + end + + context 'for merge request diff discussion' do + let(:note) { create(:diff_note_on_merge_request) } + subject { described_class.record_note(note, note.author.id) } + + it 'creates a reply on the discussion' do + new_note = subject.create_reply('Test') + expect(new_note.in_reply_to?(note)).to be_truthy + end + end + + context 'for merge request non-diff discussion' do + let(:note) { create(:discussion_note_on_merge_request) } + subject { described_class.record_note(note, note.author.id) } + + it 'creates a reply on the discussion' do + new_note = subject.create_reply('Test') + expect(new_note.in_reply_to?(note)).to be_truthy + end + end + + context 'for commit' do + let(:project) { create(:project) } + let(:commit) { project.commit } + subject { described_class.record(commit, project.creator.id) } + + it 'creates a comment on the commit' do + note = subject.create_reply('Test') + expect(note.in_reply_to?(commit)).to be_truthy + end + end + + context 'for commit comment' do + let(:note) { create(:note_on_commit) } + subject { described_class.record_note(note, note.author.id) } + + it 'creates a comment on the commit' do + new_note = subject.create_reply('Test') + expect(new_note.in_reply_to?(note)).to be_truthy + end + end + + context 'for commit diff discussion' do + let(:note) { create(:diff_note_on_commit) } + subject { described_class.record_note(note, note.author.id) } + + it 'creates a reply on the discussion' do + new_note = subject.create_reply('Test') + expect(new_note.in_reply_to?(note)).to be_truthy + end + end + + context 'for commit non-diff discussion' do + let(:note) { create(:discussion_note_on_commit) } + subject { described_class.record_note(note, note.author.id) } + + it 'creates a reply on the discussion' do + new_note = subject.create_reply('Test') + expect(new_note.in_reply_to?(note)).to be_truthy + end + end + end end diff --git a/spec/models/simple_discussion_spec.rb b/spec/models/simple_discussion_spec.rb index 1cb149aa270..1a342fbc740 100644 --- a/spec/models/simple_discussion_spec.rb +++ b/spec/models/simple_discussion_spec.rb @@ -1,5 +1,11 @@ require 'spec_helper' describe SimpleDiscussion, model: true do - # TODO: Test + subject { create(:discussion_note_on_issue).to_discussion } + + describe '#reply_attributes' do + it 'includes discussion_id' do + expect(subject.reply_attributes[:discussion_id]).to eq(subject.id) + end + end end diff --git a/spec/services/issues/build_service_spec.rb b/spec/services/issues/build_service_spec.rb index d166b9783ad..6fa8806d270 100644 --- a/spec/services/issues/build_service_spec.rb +++ b/spec/services/issues/build_service_spec.rb @@ -11,7 +11,7 @@ describe Issues::BuildService, services: true do context 'for a single discussion' do describe '#execute' do let(:merge_request) { create(:merge_request, title: "Hello world", source_project: project) } - let(:discussion) { Discussion.new([create(:diff_note_on_merge_request, project: project, noteable: merge_request, note: "Almost done")]) } + let(:discussion) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, note: "Almost done").to_discussion } let(:service) { described_class.new(project, user, merge_request_to_resolve_discussions_of: merge_request.iid, discussion_to_resolve: discussion.id) } it 'references the noteable title in the issue title' do @@ -47,7 +47,7 @@ describe Issues::BuildService, services: true do let(:service) { described_class.new(project, user, merge_request_to_resolve_discussions_of: merge_request.iid) } it 'mentions the author of the note' do - discussion = Discussion.new([create(:diff_note_on_merge_request, author: create(:user, username: 'author'))]) + discussion = create(:diff_note_on_merge_request, author: create(:user, username: 'author')).to_discussion expect(service.item_for_discussion(discussion)).to include('@author') end @@ -60,7 +60,7 @@ describe Issues::BuildService, services: true do note_result = " > This is a string\n"\ " > > with a blockquote\n"\ " > > > That has a quote\n" - discussion = Discussion.new([create(:diff_note_on_merge_request, note: note_text)]) + discussion = create(:diff_note_on_merge_request, note: note_text).to_discussion expect(service.item_for_discussion(discussion)).to include(note_result) end end diff --git a/spec/services/issues/resolve_discussions_spec.rb b/spec/services/issues/resolve_discussions_spec.rb index 3a72f92383c..4a4929daefc 100644 --- a/spec/services/issues/resolve_discussions_spec.rb +++ b/spec/services/issues/resolve_discussions_spec.rb @@ -18,7 +18,7 @@ describe DummyService, services: true do end describe "for resolving discussions" do - let(:discussion) { Discussion.new([create(:diff_note_on_merge_request, project: project, note: "Almost done")]) } + let(:discussion) { create(:diff_note_on_merge_request, project: project, note: "Almost done").to_discussion } let(:merge_request) { discussion.noteable } let(:other_merge_request) { create(:merge_request, source_project: project, source_branch: "other") } diff --git a/spec/services/notes/build_service_spec.rb b/spec/services/notes/build_service_spec.rb index 065f6eeeacb..464b24cb447 100644 --- a/spec/services/notes/build_service_spec.rb +++ b/spec/services/notes/build_service_spec.rb @@ -1,5 +1,40 @@ require 'spec_helper' -describe Notes::CreateService, services: true do - # TODO: Test +describe Notes::BuildService, services: true do + let(:note) { create(:discussion_note_on_issue) } + let(:project) { note.project } + let(:author) { note.author } + + describe '#execute' do + context 'when in_reply_to_discussion_id is specified' do + context 'when a note with that original discussion ID exists' do + it 'sets the note up to be in reply to that note' do + new_note = described_class.new(project, author, note: 'Test', in_reply_to_discussion_id: note.original_discussion_id).execute + expect(new_note).to be_valid + expect(new_note.in_reply_to?(note)).to be_truthy + end + end + + context 'when a note with that discussion ID exists' do + it 'sets the note up to be in reply to that note' do + new_note = described_class.new(project, author, note: 'Test', in_reply_to_discussion_id: note.discussion_id).execute + expect(new_note).to be_valid + expect(new_note.in_reply_to?(note)).to be_truthy + end + end + + context 'when no note with that discussion ID exists' do + it 'sets an error' do + new_note = described_class.new(project, author, note: 'Test', in_reply_to_discussion_id: 'foo').execute + expect(new_note.errors[:base]).to include('Discussion to reply to cannot be found') + end + end + end + + it 'builds a note without saving it' do + new_note = described_class.new(project, author, noteable_type: note.noteable_type, noteable_id: note.noteable_id, note: 'Test').execute + expect(new_note).to be_valid + expect(new_note).not_to be_persisted + end + end end diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb index b406afeb34d..152c6d20daa 100644 --- a/spec/services/notes/create_service_spec.rb +++ b/spec/services/notes/create_service_spec.rb @@ -13,9 +13,6 @@ describe Notes::CreateService, services: true do project.team << [user, :master] end - # TODO: Test in_reply_to_discussion_id - # TODO: Test new_discussion - context "valid params" do it 'returns a valid note' do note = described_class.new(project, user, opts).execute From 874413cf701870a0fc1051f7c0a5fc4b4f884657 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 21 Mar 2017 09:28:47 -0600 Subject: [PATCH 16/70] Fix specs --- app/mailers/emails/notes.rb | 1 + app/mailers/notify.rb | 4 ++-- app/services/notes/build_service.rb | 4 +++- app/views/discussions/_notes.html.haml | 2 +- app/views/layouts/notify.html.haml | 4 ++-- app/views/notify/new_mention_in_issue_email.html.haml | 2 +- app/views/notify/new_mention_in_merge_request_email.html.haml | 2 +- spec/factories/sent_notifications.rb | 2 +- spec/models/discussion_note_spec.rb | 1 - spec/models/individual_note_discussion_spec.rb | 1 - spec/models/out_of_context_discussion_spec.rb | 1 - spec/models/sent_notification_spec.rb | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb index de58314fef2..a42745acd71 100644 --- a/app/mailers/emails/notes.rb +++ b/app/mailers/emails/notes.rb @@ -66,6 +66,7 @@ module Emails def setup_note_mail(note_id, recipient_id) @note = Note.find(note_id) @project = @note.project + return unless @project @sent_notification = SentNotification.record_note(@note, recipient_id, reply_key) end diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 14df6f8f0a3..f315e38bcaa 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -111,7 +111,7 @@ class Notify < BaseMailer headers["X-GitLab-#{model.class.name}-ID"] = model.id headers['X-GitLab-Reply-Key'] = reply_key - if Gitlab::IncomingEmail.enabled? + if Gitlab::IncomingEmail.enabled? && @sent_notification address = Mail::Address.new(Gitlab::IncomingEmail.reply_address(reply_key)) address.display_name = @project.name_with_namespace @@ -176,6 +176,6 @@ class Notify < BaseMailer end headers['List-Unsubscribe'] = list_unsubscribe_methods.map { |e| "<#{e}>" }.join(',') - @sent_notification_url = unsubscribe_sent_notification_url(@sent_notification) + @unsubscribe_url = unsubscribe_sent_notification_url(@sent_notification) end end diff --git a/app/services/notes/build_service.rb b/app/services/notes/build_service.rb index 8d5a022d319..eddfcf5f391 100644 --- a/app/services/notes/build_service.rb +++ b/app/services/notes/build_service.rb @@ -2,6 +2,8 @@ module Notes class BuildService < BaseService def execute in_reply_to_discussion_id = params.delete(:in_reply_to_discussion_id) + new_discussion = params.delete(:new_discussion) + if project && in_reply_to_discussion_id.present? discussion = project.notes.find_original_discussion(in_reply_to_discussion_id) || @@ -14,7 +16,7 @@ module Notes end params.merge!(discussion.reply_attributes) - elsif params.delete(:new_discussion) + elsif new_discussion # TODO: Remove when we use a selectbox instead of a submit button params[:type] = DiscussionNote.name end diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index c8fcc37d1ab..d7b2abf1269 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -11,7 +11,7 @@ = link_to_reply_discussion(discussion, line_type) = render "discussions/resolve_all", discussion: discussion - + .btn-group.discussion-actions = render "discussions/new_issue_for_discussion", discussion: discussion, merge_request: discussion.noteable = render "discussions/jump_to_next", discussion: discussion diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index 76268c1b705..40bf45cece7 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -25,8 +25,8 @@ - if @labels_url adjust your #{link_to 'label subscriptions', @labels_url}. - else - - if @sent_notification_url - = link_to "unsubscribe", @sent_notification_url + - if @unsubscribe_url + = link_to "unsubscribe", @unsubscribe_url from this thread or adjust your notification settings. diff --git a/app/views/notify/new_mention_in_issue_email.html.haml b/app/views/notify/new_mention_in_issue_email.html.haml index d7c22219285..6b45ac265f7 100644 --- a/app/views/notify/new_mention_in_issue_email.html.haml +++ b/app/views/notify/new_mention_in_issue_email.html.haml @@ -1,4 +1,4 @@ %p You have been mentioned in an issue. -= render template: 'new_issue_email' += render template: 'notify/new_issue_email' diff --git a/app/views/notify/new_mention_in_merge_request_email.html.haml b/app/views/notify/new_mention_in_merge_request_email.html.haml index 07d8c301988..b061f9c106e 100644 --- a/app/views/notify/new_mention_in_merge_request_email.html.haml +++ b/app/views/notify/new_mention_in_merge_request_email.html.haml @@ -1,4 +1,4 @@ %p You have been mentioned in Merge Request #{@merge_request.to_reference} -= render template: 'new_merge_request_email' += render template: 'notify/new_merge_request_email' diff --git a/spec/factories/sent_notifications.rb b/spec/factories/sent_notifications.rb index 0590bf999c0..99253be5a22 100644 --- a/spec/factories/sent_notifications.rb +++ b/spec/factories/sent_notifications.rb @@ -2,7 +2,7 @@ FactoryGirl.define do factory :sent_notification do project factory: :empty_project recipient factory: :user - noteable factory: :issue + noteable { create(:issue, project: project) } reply_key { SentNotification.reply_key } end end diff --git a/spec/models/discussion_note_spec.rb b/spec/models/discussion_note_spec.rb index 49084c854d8..c9dd3d45270 100644 --- a/spec/models/discussion_note_spec.rb +++ b/spec/models/discussion_note_spec.rb @@ -1,5 +1,4 @@ require 'spec_helper' describe DiscussionNote, models: true do - end diff --git a/spec/models/individual_note_discussion_spec.rb b/spec/models/individual_note_discussion_spec.rb index 3938dfc4bb1..1f7c2c820e0 100644 --- a/spec/models/individual_note_discussion_spec.rb +++ b/spec/models/individual_note_discussion_spec.rb @@ -1,5 +1,4 @@ require 'spec_helper' describe IndividualNoteDiscussion, models: true do - end diff --git a/spec/models/out_of_context_discussion_spec.rb b/spec/models/out_of_context_discussion_spec.rb index d765e7052d1..1bcd118855e 100644 --- a/spec/models/out_of_context_discussion_spec.rb +++ b/spec/models/out_of_context_discussion_spec.rb @@ -1,5 +1,4 @@ require 'spec_helper' describe OutOfContextDiscussion, model: true do - end diff --git a/spec/models/sent_notification_spec.rb b/spec/models/sent_notification_spec.rb index 7a7ece24fc9..e482cafa831 100644 --- a/spec/models/sent_notification_spec.rb +++ b/spec/models/sent_notification_spec.rb @@ -4,7 +4,7 @@ describe SentNotification, model: true do describe 'validation' do describe 'note validity' do context "when the project doesn't match the noteable's project" do - subject { build(:sent_notification, project: create(:project)) } + subject { build(:sent_notification, noteable: create(:issue)) } it "is invalid" do expect(subject).not_to be_valid From 2058e71e63c9ac471137f831b4d04b6626968532 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 30 Mar 2017 18:38:21 -0600 Subject: [PATCH 17/70] Extract commonalities between DiffDiscussion and LegacyDiffDiscussion --- app/models/concerns/discussion_on_diff.rb | 56 ++++++++++++++ app/models/concerns/resolvable_discussion.rb | 79 +++++++++++++++++++ app/models/diff_discussion.rb | 60 ++------------- app/models/diff_note.rb | 15 +--- app/models/discussion.rb | 81 ++------------------ app/models/legacy_diff_discussion.rb | 14 ++-- app/models/legacy_diff_note.rb | 8 -- app/models/merge_request.rb | 4 +- app/models/note.rb | 9 +-- 9 files changed, 162 insertions(+), 164 deletions(-) create mode 100644 app/models/concerns/discussion_on_diff.rb create mode 100644 app/models/concerns/resolvable_discussion.rb diff --git a/app/models/concerns/discussion_on_diff.rb b/app/models/concerns/discussion_on_diff.rb new file mode 100644 index 00000000000..28abed967f0 --- /dev/null +++ b/app/models/concerns/discussion_on_diff.rb @@ -0,0 +1,56 @@ +module DiscussionOnDiff + extend ActiveSupport::Concern + + included do + NUMBER_OF_TRUNCATED_DIFF_LINES = 16 + + memoized_values << :active + + delegate :line_code, + :original_line_code, + :diff_file, + :diff_line, + :for_line?, + :active?, + + to: :first_note + + delegate :file_path, + :blob, + :highlighted_diff_lines, + :diff_lines, + + to: :diff_file, + allow_nil: true + end + + def diff_discussion? + true + end + + def active? + return @active if @active.present? + + @active = first_note.active? + end + + # Returns an array of at most 16 highlighted lines above a diff note + def truncated_diff_lines(highlight: true) + lines = highlight ? highlighted_diff_lines : diff_lines + prev_lines = [] + + lines.each do |line| + if line.meta? + prev_lines.clear + else + prev_lines << line + + break if for_line?(line) + + prev_lines.shift if prev_lines.length >= NUMBER_OF_TRUNCATED_DIFF_LINES + end + end + + prev_lines + end +end diff --git a/app/models/concerns/resolvable_discussion.rb b/app/models/concerns/resolvable_discussion.rb new file mode 100644 index 00000000000..3141c150ac9 --- /dev/null +++ b/app/models/concerns/resolvable_discussion.rb @@ -0,0 +1,79 @@ +module ResolvableDiscussion + extend ActiveSupport::Concern + + included do + memoized_values << :resolvable + memoized_values << :resolved + memoized_values << :first_note + memoized_values << :first_note_to_resolve + memoized_values << :last_resolved_note + memoized_values << :last_note + + delegate :resolved_at, + :resolved_by, + + to: :last_resolved_note, + allow_nil: true + end + + # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` + def potentially_resolvable? + for_merge_request? + end + + def resolvable? + return @resolvable if @resolvable.present? + + @resolvable = potentially_resolvable? && notes.any?(&:resolvable?) + end + + def resolved? + return @resolved if @resolved.present? + + @resolved = resolvable? && notes.none?(&:to_be_resolved?) + end + + def first_note + @first_note ||= notes.first + end + + def first_note_to_resolve + return unless resolvable? + + @first_note_to_resolve ||= notes.find(&:to_be_resolved?) + end + + def last_resolved_note + return unless resolved? + + @last_resolved_note ||= resolved_notes.sort_by(&:resolved_at).last + end + + def resolved_notes + notes.select(&:resolved?) + end + + def to_be_resolved? + resolvable? && !resolved? + end + + def can_resolve?(current_user) + return false unless current_user + return false unless resolvable? + + current_user == self.noteable.author || + current_user.can?(:resolve_note, self.project) + end + + def resolve!(current_user) + return unless resolvable? + + update { |notes| notes.resolve!(current_user) } + end + + def unresolve! + return unless resolvable? + + update { |notes| notes.unresolve! } + end +end diff --git a/app/models/diff_discussion.rb b/app/models/diff_discussion.rb index 9c80b190b74..e349f743fdd 100644 --- a/app/models/diff_discussion.rb +++ b/app/models/diff_discussion.rb @@ -1,71 +1,27 @@ class DiffDiscussion < Discussion - NUMBER_OF_TRUNCATED_DIFF_LINES = 16 + include DiscussionOnDiff - delegate :line_code, - :original_line_code, - :diff_file, - :diff_line, - :for_line?, - :active?, + delegate :position, + :original_position, to: :first_note - delegate :file_path, - :blob, - :highlighted_diff_lines, - :diff_lines, - - to: :diff_file, - allow_nil: true - def self.build_discussion_id(note) - [*super(note), *unique_position_identifier(note)] + [*super(note), *note.position.key] end def self.build_original_discussion_id(note) [*Discussion.build_discussion_id(note), *note.original_position.key] end - def self.unique_position_identifier(note) - note.position.key - end - - def diff_discussion? - true - end - def legacy_diff_discussion? false end - def active? - return @active if @active.present? - - @active = first_note.active? - end - MEMOIZED_VALUES << :active - def reply_attributes - super.merge(first_note.diff_attributes) - end - - # Returns an array of at most 16 highlighted lines above a diff note - def truncated_diff_lines(highlight: true) - lines = highlight ? highlighted_diff_lines : diff_lines - prev_lines = [] - - lines.each do |line| - if line.meta? - prev_lines.clear - else - prev_lines << line - - break if for_line?(line) - - prev_lines.shift if prev_lines.length >= NUMBER_OF_TRUNCATED_DIFF_LINES - end - end - - prev_lines + super.merge( + original_position: original_position.to_json, + position: position.to_json, + ) end end diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index d24491b44e7..38477528279 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -21,23 +21,12 @@ class DiffNote < Note before_validation :set_discussion_id, if: :position_changed? after_save :keep_around_commits - def new_diff_note? - true - end - def discussion_class(*) DiffDiscussion end - def diff_attributes - { - original_position: original_position.to_json, - position: position.to_json, - } - end - - %i(original_position= position=).each do |meth| - define_method meth do |new_position| + %i(original_position position).each do |meth| + define_method "#{meth}=" do |new_position| if new_position.is_a?(String) new_position = JSON.parse(new_position) rescue nil end diff --git a/app/models/discussion.rb b/app/models/discussion.rb index 6e97a4862ed..27ed0480e6d 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -1,5 +1,9 @@ class Discussion - MEMOIZED_VALUES = [] # rubocop:disable Style/MutableConstant + cattr_accessor :memoized_values, instance_accessor: false do + [] + end + + include ResolvableDiscussion attr_reader :notes, :noteable @@ -13,12 +17,6 @@ class Discussion to: :first_note - delegate :resolved_at, - :resolved_by, - - to: :last_resolved_note, - allow_nil: true - def self.build(notes, noteable = nil) notes.first.discussion_class(noteable).new(notes, noteable) end @@ -98,76 +96,9 @@ class Discussion notes.length == 1 end - # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` - def potentially_resolvable? - for_merge_request? - end - - def resolvable? - return @resolvable if @resolvable.present? - - @resolvable = potentially_resolvable? && notes.any?(&:resolvable?) - end - MEMOIZED_VALUES << :resolvable - - def resolved? - return @resolved if @resolved.present? - - @resolved = resolvable? && notes.none?(&:to_be_resolved?) - end - MEMOIZED_VALUES << :resolved - - def first_note - @first_note ||= notes.first - end - MEMOIZED_VALUES << :first_note - - def first_note_to_resolve - return unless resolvable? - - @first_note_to_resolve ||= notes.find(&:to_be_resolved?) - end - MEMOIZED_VALUES << :first_note_to_resolve - - def last_resolved_note - return unless resolved? - - @last_resolved_note ||= resolved_notes.sort_by(&:resolved_at).last - end - MEMOIZED_VALUES << :last_resolved_note - def last_note @last_note ||= notes.last end - MEMOIZED_VALUES << :last_note - - def resolved_notes - notes.select(&:resolved?) - end - - def to_be_resolved? - resolvable? && !resolved? - end - - def can_resolve?(current_user) - return false unless current_user - return false unless resolvable? - - current_user == self.noteable.author || - current_user.can?(:resolve_note, self.project) - end - - def resolve!(current_user) - return unless resolvable? - - update { |notes| notes.resolve!(current_user) } - end - - def unresolve! - return unless resolvable? - - update { |notes| notes.unresolve! } - end def collapsed? resolved? @@ -192,7 +123,7 @@ class Discussion # Set the notes array to the updated notes @notes = notes_relation.fresh.to_a - MEMOIZED_VALUES.each do |var| + self.class.memoized_values.each do |var| instance_variable_set(:"@#{var}", nil) end end diff --git a/app/models/legacy_diff_discussion.rb b/app/models/legacy_diff_discussion.rb index eb9766a9ffe..53fe9fbab06 100644 --- a/app/models/legacy_diff_discussion.rb +++ b/app/models/legacy_diff_discussion.rb @@ -1,10 +1,8 @@ -class LegacyDiffDiscussion < DiffDiscussion - def self.unique_position_identifier(note) - note.line_code - end +class LegacyDiffDiscussion < Discussion + include DiscussionOnDiff - def self.build_original_discussion_id(note) - Discussion.build_original_discussion_id(note) + def self.build_discussion_id(note) + [*super(note), note.line_code] end def legacy_diff_discussion? @@ -19,4 +17,8 @@ class LegacyDiffDiscussion < DiffDiscussion def collapsed? !active? end + + def reply_attributes + super.merge(line_code: line_code) + end end diff --git a/app/models/legacy_diff_note.rb b/app/models/legacy_diff_note.rb index 4952a1ce2ca..0d86610e473 100644 --- a/app/models/legacy_diff_note.rb +++ b/app/models/legacy_diff_note.rb @@ -11,14 +11,6 @@ class LegacyDiffNote < Note LegacyDiffDiscussion end - def legacy_diff_note? - true - end - - def diff_attributes - { line_code: line_code } - end - def project_repository if RequestStore.active? RequestStore.fetch("project:#{project_id}:repository") { self.project.repository } diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 546fd2b8e35..a1efa17180e 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -846,8 +846,8 @@ class MergeRequest < ActiveRecord::Base return unless has_complete_diff_refs? return if new_diff_refs == old_diff_refs - active_diff_notes = self.notes.diff_notes.select do |note| - note.new_diff_note? && note.active?(old_diff_refs) + active_diff_notes = self.notes.new_diff_notes.select do |note| + note.active?(old_diff_refs) end return if active_diff_notes.empty? diff --git a/app/models/note.rb b/app/models/note.rb index 00a58afd2b6..eef868a05d6 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -75,6 +75,7 @@ class Note < ActiveRecord::Base end scope :diff_notes, ->{ where(type: %w(LegacyDiffNote DiffNote)) } + scope :new_diff_notes, ->{ where(type: 'DiffNote') } scope :non_diff_notes, ->{ where(type: ['Note', 'DiscussionNote', nil]) } scope :with_associations, -> do @@ -136,14 +137,6 @@ class Note < ActiveRecord::Base false end - def legacy_diff_note? - false - end - - def new_diff_note? - false - end - def active? true end From bb8cc946689bfafb1e3a65aa00b8e75fb8a5006b Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 30 Mar 2017 19:33:45 -0600 Subject: [PATCH 18/70] Don't use original_discussion_id --- .../components/comment_resolve_btn.js | 12 ++++-- .../javascripts/files_comment_button.js | 2 +- app/assets/javascripts/notes.js | 32 +++++++-------- app/controllers/projects/notes_controller.rb | 7 +--- app/helpers/notes_helper.rb | 12 ++---- app/models/concerns/noteable.rb | 2 +- app/models/diff_discussion.rb | 8 ---- app/models/diff_note.rb | 3 -- app/models/discussion.rb | 23 ++--------- app/models/individual_note_discussion.rb | 4 -- app/models/legacy_diff_discussion.rb | 4 -- app/models/note.rb | 27 ++----------- app/models/out_of_context_discussion.rb | 2 +- app/models/sent_notification.rb | 2 +- app/models/simple_discussion.rb | 7 ---- app/services/notes/build_service.rb | 4 +- app/views/discussions/_discussion.html.haml | 2 +- app/views/discussions/_notes.html.haml | 2 +- lib/gitlab/diff/position.rb | 2 +- .../import_export/safe_model_attributes.yml | 1 - spec/models/diff_note_spec.rb | 25 ------------ spec/models/note_spec.rb | 39 ------------------- spec/models/sent_notification_spec.rb | 4 +- spec/services/notes/build_service_spec.rb | 2 +- spec/services/notification_service_spec.rb | 2 +- 25 files changed, 47 insertions(+), 183 deletions(-) diff --git a/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js b/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js index fc2f20e3bcb..eb76b7d15fd 100644 --- a/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js +++ b/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js @@ -42,10 +42,14 @@ import Vue from 'vue'; } }, created() { - this.discussion = CommentsStore.state[this.discussionId]; + if (this.discussionId) { + this.discussion = CommentsStore.state[this.discussionId]; + } }, mounted: function () { - const $textarea = $(`#new-discussion-note-form-${this.discussionId} .note-textarea`); + if (!this.discussionId) return; + + const $textarea = $(`.js-discussion-note-form[data-discussion-id=${this.discussionId}] .note-textarea`); this.textareaIsEmpty = $textarea.val() === ''; $textarea.on('input.comment-and-resolve-btn', () => { @@ -53,7 +57,9 @@ import Vue from 'vue'; }); }, destroyed: function () { - $(`#new-discussion-note-form-${this.discussionId} .note-textarea`).off('input.comment-and-resolve-btn'); + if (!this.discussionId) return; + + $(`.js-discussion-note-form[data-discussion-id=${this.discussionId}] .note-textarea`).off('input.comment-and-resolve-btn'); } }); diff --git a/app/assets/javascripts/files_comment_button.js b/app/assets/javascripts/files_comment_button.js index 7f91bdd38ab..59d6508fc02 100644 --- a/app/assets/javascripts/files_comment_button.js +++ b/app/assets/javascripts/files_comment_button.js @@ -131,7 +131,7 @@ window.FilesCommentButton = (function() { }; FilesCommentButton.prototype.validateLineContent = function(lineContentElement) { - return lineContentElement.attr('data-discussion-id') && lineContentElement.attr('data-discussion-id') !== ''; + return lineContentElement.attr('data-note-type') && lineContentElement.attr('data-note-type') !== ''; }; return FilesCommentButton; diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 08bbc15f6b9..57335c77e40 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -272,10 +272,10 @@ require('./task_list'); Note: for rendering inline notes use renderDiscussionNote */ - Notes.prototype.renderNote = function(note) { + Notes.prototype.renderNote = function(note, $form) { var $notesList; if (note.discussion_html != null) { - return this.renderDiscussionNote(note); + return this.renderDiscussionNote(note, $form); } if (!note.valid) { @@ -317,16 +317,13 @@ require('./task_list'); Note: for rendering inline notes use renderDiscussionNote */ - Notes.prototype.renderDiscussionNote = function(note) { + Notes.prototype.renderDiscussionNote = function(note, $form) { var discussionContainer, form, note_html, row, lineType, diffAvatarContainer; if (!this.isNewNote(note)) { return; } this.note_ids.push(note.id); - form = $(".js-discussion-note-form[data-discussion-id='" + note.discussion_id + "']"); - if (form.length === 0) { - form = $(".js-discussion-note-form[data-original-discussion-id='" + note.original_discussion_id + "']"); - } + form = $form || $(".js-discussion-note-form[data-discussion-id='" + note.discussion_id + "']"); row = form.closest("tr"); lineType = this.isParallelView() ? form.find('#line_type').val() : 'old'; diffAvatarContainer = row.prevAll('.line_holder').first().find('.js-avatar-container.' + lineType + '_line'); @@ -334,8 +331,8 @@ require('./task_list'); note_html.renderGFM(); // is this the first note of discussion? discussionContainer = $(".notes[data-discussion-id='" + note.discussion_id + "']"); - if (discussionContainer.length === 0) { - discussionContainer = $(".notes[data-original-discussion-id='" + note.original_discussion_id + "']"); + if (!discussionContainer.length) { + discussionContainer = form.closest('.discussion').find('.notes'); } if (discussionContainer.length === 0) { if (!this.isParallelView() || row.hasClass('js-temp-notes-holder')) { @@ -525,7 +522,7 @@ require('./task_list'); } } - this.renderNote(note); + this.renderNote(note, $form); // cleanup after successfully creating a diff/discussion note this.removeDiscussionNoteForm($form); }; @@ -749,13 +746,13 @@ require('./task_list'); // setup note target var discussionID = dataHolder.data("discussionId"); - form.attr('id', "new-discussion-note-form-" + discussionID); - form.attr("data-discussion-id", discussionID); - form.attr("data-original-discussion-id", dataHolder.data("originalDiscussionId") || discussionID); - form.attr("data-line-code", dataHolder.data("lineCode")); + if (discussionID) { + form.attr("data-discussion-id", discussionID); + form.find("#in_reply_to_discussion_id").val(discussionID); + } + form.attr("data-line-code", dataHolder.data("lineCode")); form.find("#line_type").val(dataHolder.data("lineType")); - form.find("#in_reply_to_discussion_id").val(dataHolder.data("originalDiscussionId")); form.find("#note_noteable_type").val(dataHolder.data("noteableType")); form.find("#note_noteable_id").val(dataHolder.data("noteableId")); @@ -775,8 +772,7 @@ require('./task_list'); if (typeof gl.diffNotesCompileComponents !== 'undefined') { var $commentBtn = form.find('comment-and-resolve-btn'); - $commentBtn - .attr(':discussion-id', "'" + dataHolder.data('discussionId') + "'"); + $commentBtn.attr(':discussion-id', "'" + discussionID + "'"); gl.diffNotesCompileComponents(); } @@ -784,7 +780,7 @@ require('./task_list'); form.find(".js-note-text").focus(); form .find('.js-comment-resolve-button') - .attr('data-discussion-id', dataHolder.data('discussionId')); + .attr('data-discussion-id', discussionID); form .removeClass('js-main-target-form') .addClass("discussion-form js-discussion-note-form"); diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 8f82021a464..fb9195bb08d 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -173,12 +173,7 @@ class Projects::NotesController < Projects::ApplicationController discussion_resolvable: discussion.resolvable?, diff_discussion_html: diff_discussion_html(discussion), - discussion_html: discussion_html(discussion), - - # Since the `discussion_id` can change, for example when new commits are pushed into an MR, - # the never-changing `original_discussion_id` is used as a fallback to the find the relevant - # discussion container to add this note to. - original_discussion_id: note.original_discussion_id + discussion_html: discussion_html(discussion) ) end else diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index e2fa9905e86..61805021b39 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -53,23 +53,19 @@ module NotesHelper } if use_legacy_diff_note - new_note = LegacyDiffNote.new(@new_diff_note_attrs.merge(line_code: line_code)) + data[:note_type] = LegacyDiffNote.name else - new_note = DiffNote.new(@new_diff_note_attrs.merge(position: position)) - + data[:note_type] = DiffNote.name data[:position] = position.to_json end - data.merge( - note_type: new_note.type, - discussion_id: new_note.discussion_class.discussion_id(new_note) - ) + data end def link_to_reply_discussion(discussion, line_type = nil) return unless current_user - data = { discussion_id: discussion.id, original_discussion_id: discussion.original_id, line_type: line_type } + data = { discussion_id: discussion.id, line_type: line_type } data[:line_code] = discussion.line_code if discussion.respond_to?(:line_code) button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button', diff --git a/app/models/concerns/noteable.rb b/app/models/concerns/noteable.rb index 7900af6aaac..d378152eb56 100644 --- a/app/models/concerns/noteable.rb +++ b/app/models/concerns/noteable.rb @@ -3,7 +3,7 @@ module Noteable notes end - delegate :find_discussion, :find_original_discussion, to: :discussion_notes + delegate :find_discussion, to: :discussion_notes def discussions @discussions ||= discussion_notes diff --git a/app/models/diff_discussion.rb b/app/models/diff_discussion.rb index e349f743fdd..8acb70eb7cb 100644 --- a/app/models/diff_discussion.rb +++ b/app/models/diff_discussion.rb @@ -6,14 +6,6 @@ class DiffDiscussion < Discussion to: :first_note - def self.build_discussion_id(note) - [*super(note), *note.position.key] - end - - def self.build_original_discussion_id(note) - [*Discussion.build_discussion_id(note), *note.original_position.key] - end - def legacy_diff_discussion? false end diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index 38477528279..6029fc42e9c 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -16,9 +16,6 @@ class DiffNote < Note before_validation :set_original_position, :update_position, on: :create before_validation :set_line_code - # We need to do this again, because it's already in `Note`, but is affected by - # `update_position` and needs to run after that. - before_validation :set_discussion_id, if: :position_changed? after_save :keep_around_commits def discussion_class(*) diff --git a/app/models/discussion.rb b/app/models/discussion.rb index 27ed0480e6d..782db4044ed 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -34,24 +34,13 @@ class Discussion nil end - def self.build_discussion_id(note) + def self.build_discussion_id_base(note) noteable_id = note.noteable_id || note.commit_id [:discussion, note.noteable_type.try(:underscore), noteable_id] end - def self.original_discussion_id(note) - original_discussion_id = build_original_discussion_id(note) - if original_discussion_id - Digest::SHA1.hexdigest(original_discussion_id.join("-")) - else - note.discussion_id - end - end - - # Optionally build a separate original discussion ID that will never change, - # if the main discussion ID _can_ change, like in the case of DiffDiscussion. - def self.build_original_discussion_id(note) - nil + def self.build_discussion_id(note) + [*build_discussion_id_base(note), SecureRandom.hex] end def initialize(notes, noteable = nil) @@ -80,10 +69,6 @@ class Discussion alias_method :to_param, :id - def original_id - first_note.original_discussion_id - end - def diff_discussion? false end @@ -109,7 +94,7 @@ class Discussion end def reply_attributes - first_note.slice(:type, :noteable_type, :noteable_id, :commit_id) + first_note.slice(:type, :noteable_type, :noteable_id, :commit_id, :discussion_id) end private diff --git a/app/models/individual_note_discussion.rb b/app/models/individual_note_discussion.rb index 585b8527883..ebcf60beaf3 100644 --- a/app/models/individual_note_discussion.rb +++ b/app/models/individual_note_discussion.rb @@ -1,8 +1,4 @@ class IndividualNoteDiscussion < Discussion - def self.build_discussion_id(note) - [*super(note), SecureRandom.hex] - end - # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` def potentially_resolvable? false diff --git a/app/models/legacy_diff_discussion.rb b/app/models/legacy_diff_discussion.rb index 53fe9fbab06..36612a28ba1 100644 --- a/app/models/legacy_diff_discussion.rb +++ b/app/models/legacy_diff_discussion.rb @@ -1,10 +1,6 @@ class LegacyDiffDiscussion < Discussion include DiscussionOnDiff - def self.build_discussion_id(note) - [*super(note), note.line_code] - end - def legacy_diff_discussion? true end diff --git a/app/models/note.rb b/app/models/note.rb index eef868a05d6..3db1656ba57 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -52,7 +52,7 @@ class Note < ActiveRecord::Base validates :noteable_id, presence: true, unless: [:for_commit?, :importing?] validates :commit_id, presence: true, if: :for_commit? validates :author, presence: true - validates :discussion_id, :original_discussion_id, presence: true, format: { with: /\A\h{40}\z/ } + validates :discussion_id, presence: true, format: { with: /\A\h{40}\z/ } validate unless: [:for_commit?, :importing?, :for_personal_snippet?] do |note| unless note.noteable.try(:project) == note.project @@ -84,9 +84,9 @@ class Note < ActiveRecord::Base project: [:project_members, { group: [:group_members] }]) end - after_initialize :ensure_discussion_id, :ensure_original_discussion_id + after_initialize :ensure_discussion_id before_validation :nullify_blank_type, :nullify_blank_line_code - before_validation :set_discussion_id, :set_original_discussion_id, on: :create + before_validation :set_discussion_id, on: :create after_save :keep_around_commit, unless: :for_personal_snippet? after_save :expire_etag_cache @@ -99,13 +99,6 @@ class Note < ActiveRecord::Base Discussion.build_collection(fresh, noteable) end - def find_original_discussion(discussion_id) - note = find_by(original_discussion_id: discussion_id) - return unless note - - note.to_discussion - end - def find_discussion(discussion_id) notes = where(discussion_id: discussion_id).fresh.to_a return if notes.empty? @@ -309,20 +302,6 @@ class Note < ActiveRecord::Base self.discussion_id ||= discussion_class.discussion_id(self) end - def ensure_original_discussion_id - return unless self.persisted? - # Needed in case the SELECT statement doesn't ask for `original_discussion_id` - return unless self.has_attribute?(:original_discussion_id) - return if self.original_discussion_id - - set_original_discussion_id - update_column(:original_discussion_id, self.original_discussion_id) - end - - def set_original_discussion_id - self.original_discussion_id = discussion_class.original_discussion_id(self) - end - def expire_etag_cache return unless for_issue? diff --git a/app/models/out_of_context_discussion.rb b/app/models/out_of_context_discussion.rb index 0019064e25c..ecbfd97699f 100644 --- a/app/models/out_of_context_discussion.rb +++ b/app/models/out_of_context_discussion.rb @@ -2,7 +2,7 @@ class OutOfContextDiscussion < Discussion # To make sure all out-of-context notes are displayed in one discussion, # we override the discussion ID to be a newly generated but consistent ID. def self.override_discussion_id(note) - discussion_id(note) + Digest::SHA1.hexdigest(build_discussion_id_base(note).join("-")) end # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb index 81fc2ddac77..7d65b2b7993 100644 --- a/app/models/sent_notification.rb +++ b/app/models/sent_notification.rb @@ -46,7 +46,7 @@ class SentNotification < ActiveRecord::Base end def record_note(note, recipient_id, reply_key = self.reply_key, attrs = {}) - attrs[:in_reply_to_discussion_id] = note.original_discussion_id + attrs[:in_reply_to_discussion_id] = note.discussion_id record(note.noteable, recipient_id, reply_key, attrs) end diff --git a/app/models/simple_discussion.rb b/app/models/simple_discussion.rb index a5ef5c565e7..41c679daf2d 100644 --- a/app/models/simple_discussion.rb +++ b/app/models/simple_discussion.rb @@ -1,9 +1,2 @@ class SimpleDiscussion < Discussion - def self.build_discussion_id(note) - [*super(note), SecureRandom.hex] - end - - def reply_attributes - super.merge(discussion_id: self.id) - end end diff --git a/app/services/notes/build_service.rb b/app/services/notes/build_service.rb index eddfcf5f391..4619ba552d7 100644 --- a/app/services/notes/build_service.rb +++ b/app/services/notes/build_service.rb @@ -5,9 +5,7 @@ module Notes new_discussion = params.delete(:new_discussion) if project && in_reply_to_discussion_id.present? - discussion = - project.notes.find_original_discussion(in_reply_to_discussion_id) || - project.notes.find_discussion(in_reply_to_discussion_id) + discussion = project.notes.find_discussion(in_reply_to_discussion_id) unless discussion note = Note.new diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index 38112f67881..e04958817e4 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -5,7 +5,7 @@ = link_to user_path(discussion.author) do = image_tag avatar_icon(discussion.author), class: "avatar s40" .timeline-content - .discussion.js-toggle-container{ class: discussion.id, data: { discussion_id: discussion.id } } + .discussion.js-toggle-container{ data: { discussion_id: discussion.id } } .discussion-header .discussion-actions %button.note-action-button.discussion-toggle-button.js-toggle-button{ type: "button" } diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index d7b2abf1269..ad778612f92 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -1,4 +1,4 @@ -%ul.notes{ data: { discussion_id: discussion.id, original_discussion_id: discussion.original_id } } +%ul.notes{ data: { discussion_id: discussion.id } } = render partial: "projects/notes/note", collection: discussion.notes, as: :note - if current_user diff --git a/lib/gitlab/diff/position.rb b/lib/gitlab/diff/position.rb index fc728123c97..fa567dd9da4 100644 --- a/lib/gitlab/diff/position.rb +++ b/lib/gitlab/diff/position.rb @@ -42,7 +42,7 @@ module Gitlab def encode_with(coder) coder['attributes'] = self.to_h end - + def key @key ||= [base_sha, start_sha, head_sha, Digest::SHA1.hexdigest(old_path || ""), Digest::SHA1.hexdigest(new_path || ""), old_line, new_line] end diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 1ad16a9b57d..4c3c7d8cce2 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -55,7 +55,6 @@ Note: - resolved_at - resolved_by_id - discussion_id -- original_discussion_id LabelLink: - id - label_id diff --git a/spec/models/diff_note_spec.rb b/spec/models/diff_note_spec.rb index 533d38c0229..fb80b74b226 100644 --- a/spec/models/diff_note_spec.rb +++ b/spec/models/diff_note_spec.rb @@ -239,29 +239,4 @@ describe DiffNote, models: true do end end end - - describe "#original_discussion_id" do - let(:note) { create(:diff_note_on_merge_request) } - - context "when it is newly created" do - it "has a discussion id" do - expect(note.original_discussion_id).not_to be_nil - expect(note.original_discussion_id).to match(/\A\h{40}\z/) - end - end - - context "when it didn't store a discussion id before" do - before do - note.update_column(:original_discussion_id, nil) - end - - it "has a discussion id" do - # The original_discussion_id is set in `after_initialize`, so `reload` won't work - reloaded_note = Note.find(note.id) - - expect(reloaded_note.original_discussion_id).not_to be_nil - expect(reloaded_note.original_discussion_id).to match(/\A\h{40}\z/) - end - end - end end diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 67b4fed5f8f..3cdabb2875f 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -245,20 +245,6 @@ describe Note, models: true do end end - describe '.find_original_discussion' do - let!(:note) { create(:discussion_note_on_merge_request) } - let!(:note2) { create(:discussion_note_on_merge_request, in_reply_to: note) } - let(:merge_request) { note.noteable } - - it 'returns a discussion with one note' do - discussion = merge_request.notes.find_original_discussion(note.original_discussion_id) - - expect(discussion).not_to be_nil - expect(discussion.notes.count).to be(1) - expect(discussion.first_note.original_discussion_id).to eq(note.original_discussion_id) - end - end - describe '.find_discussion' do let!(:note) { create(:discussion_note_on_merge_request) } let!(:note2) { create(:discussion_note_on_merge_request, in_reply_to: note) } @@ -499,31 +485,6 @@ describe Note, models: true do end end - describe "#original_discussion_id" do - let(:note) { create(:diff_note_on_merge_request) } - - context "when it is newly created" do - it "has a discussion id" do - expect(note.original_discussion_id).not_to be_nil - expect(note.original_discussion_id).to match(/\A\h{40}\z/) - end - end - - context "when it didn't store a discussion id before" do - before do - note.update_column(:original_discussion_id, nil) - end - - it "has a discussion id" do - # The original_discussion_id is set in `after_initialize`, so `reload` won't work - reloaded_note = Note.find(note.id) - - expect(reloaded_note.original_discussion_id).not_to be_nil - expect(reloaded_note.original_discussion_id).to match(/\A\h{40}\z/) - end - end - end - describe '#to_discussion' do subject { create(:discussion_note_on_merge_request) } let!(:note2) { create(:discussion_note_on_merge_request, project: subject.project, noteable: subject.noteable, in_reply_to: subject) } diff --git a/spec/models/sent_notification_spec.rb b/spec/models/sent_notification_spec.rb index e482cafa831..6b7eef388be 100644 --- a/spec/models/sent_notification_spec.rb +++ b/spec/models/sent_notification_spec.rb @@ -12,7 +12,7 @@ describe SentNotification, model: true do end context "when the project doesn't match the discussion project" do - let(:discussion_id) { create(:note).original_discussion_id } + let(:discussion_id) { create(:note).discussion_id } subject { build(:sent_notification, in_reply_to_discussion_id: discussion_id) } it "is invalid" do @@ -23,7 +23,7 @@ describe SentNotification, model: true do context "when the noteable project and discussion project match" do let(:project) { create(:project) } let(:issue) { create(:issue, project: project) } - let(:discussion_id) { create(:note, project: project, noteable: issue).original_discussion_id } + let(:discussion_id) { create(:note, project: project, noteable: issue).discussion_id } subject { build(:sent_notification, project: project, noteable: issue, in_reply_to_discussion_id: discussion_id) } it "is valid" do diff --git a/spec/services/notes/build_service_spec.rb b/spec/services/notes/build_service_spec.rb index 464b24cb447..f9dd5541b10 100644 --- a/spec/services/notes/build_service_spec.rb +++ b/spec/services/notes/build_service_spec.rb @@ -9,7 +9,7 @@ describe Notes::BuildService, services: true do context 'when in_reply_to_discussion_id is specified' do context 'when a note with that original discussion ID exists' do it 'sets the note up to be in reply to that note' do - new_note = described_class.new(project, author, note: 'Test', in_reply_to_discussion_id: note.original_discussion_id).execute + new_note = described_class.new(project, author, note: 'Test', in_reply_to_discussion_id: note.discussion_id).execute expect(new_note).to be_valid expect(new_note.in_reply_to?(note)).to be_truthy end diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb index c4e00fcf080..617c8eaf3d5 100644 --- a/spec/services/notification_service_spec.rb +++ b/spec/services/notification_service_spec.rb @@ -439,7 +439,7 @@ describe NotificationService, services: true do notification.new_note(note) - expect(SentNotification.last.in_reply_to_discussion_id).to eq(note.original_discussion_id) + expect(SentNotification.last.in_reply_to_discussion_id).to eq(note.discussion_id) end end end From fe26b8af94e8e12a66249e28e34196a4f8b987c4 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 30 Mar 2017 20:34:14 -0600 Subject: [PATCH 19/70] Correctly display multiple separate discussions on the same diff line --- app/assets/javascripts/notes.js | 11 +++---- app/assets/stylesheets/pages/notes.scss | 12 +++++++ app/controllers/projects/commit_controller.rb | 2 +- .../projects/merge_requests_controller.rb | 2 +- app/controllers/projects/notes_controller.rb | 6 ++-- app/helpers/diff_helper.rb | 8 ++--- app/helpers/notes_helper.rb | 17 +--------- app/models/note.rb | 5 ++- .../discussions/_diff_discussion.html.haml | 2 +- .../discussions/_diff_with_notes.html.haml | 2 +- app/views/discussions/_notes.html.haml | 31 ++++++++++--------- .../_parallel_diff_discussion.html.haml | 14 ++++----- app/views/projects/diffs/_line.html.haml | 9 +++--- .../projects/diffs/_parallel_view.html.haml | 8 +++-- 14 files changed, 64 insertions(+), 65 deletions(-) diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 57335c77e40..edfcda7c214 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -668,7 +668,7 @@ require('./task_list'); return function(i, el) { var note, notes; note = $(el); - notes = note.closest(".notes"); + notes = note.closest(".discussion-notes"); if (typeof gl.diffNotesCompileComponents !== 'undefined') { if (gl.diffNoteApps[noteElId]) { @@ -685,14 +685,13 @@ require('./task_list'); // "Discussions" tab notes.closest(".timeline-entry").remove(); - if (!_this.isParallelView() || notesTr.find('.note').length === 0) { - // "Changes" tab / commit view - notesTr.remove(); + // The notes tr can contain multiple lists of notes, like on the parallel diff + if (notesTr.find('.discussion-notes').length > 1) { + notes.remove(); } else { - notes.closest('.content').empty(); + notesTr.remove(); } } - return note.remove(); }; })(this)); // Decrement the "Discussions" counter only once diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 57cf8e136e2..33efba923b0 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -294,6 +294,18 @@ ul.notes { border-width: 1px; } + .discussion-notes { + &:not(:first-child) { + border-top: 1px solid $white-normal; + margin-top: 20px; + } + + &:not(:last-child) { + border-bottom: 1px solid $white-normal; + margin-bottom: 20px; + } + } + .notes { background-color: $white-light; } diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 98cd4ce344a..d1558bdfba8 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -123,7 +123,7 @@ class Projects::CommitController < Projects::ApplicationController @grouped_diff_discussions = commit.grouped_diff_discussions @discussions = commit.discussions - @notes = (@grouped_diff_discussions.values + @discussions).flat_map(&:notes) + @notes = (@grouped_diff_discussions.values.flatten + @discussions).flat_map(&:notes) @notes = prepare_notes_for_rendering(@notes) end diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 7863fe18f32..48a10fbe9cc 100755 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -591,7 +591,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs? @grouped_diff_discussions = @merge_request.grouped_diff_discussions - @notes = prepare_notes_for_rendering(@grouped_diff_discussions.values.flat_map(&:notes)) + @notes = prepare_notes_for_rendering(@grouped_diff_discussions.values.flatten.flat_map(&:notes)) end def define_pipelines_vars diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index fb9195bb08d..7ae590d3de1 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -136,13 +136,13 @@ class Projects::NotesController < Projects::ApplicationController template = "discussions/_parallel_diff_discussion" locals = if params[:line_type] == 'old' - { discussion_left: discussion, discussion_right: nil } + { discussions_left: [discussion], discussions_right: nil } else - { discussion_left: nil, discussion_right: discussion } + { discussions_left: nil, discussions_right: [discussion] } end else template = "discussions/_diff_discussion" - locals = { discussion: discussion } + locals = { discussions: [discussion] } end render_to_string( diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index aed1d7c839f..5e0886cc599 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -62,19 +62,19 @@ module DiffHelper end def parallel_diff_discussions(left, right, diff_file) - discussion_left = discussion_right = nil + discussions_left = discussions_right = nil if left && (left.unchanged? || left.removed?) line_code = diff_file.line_code(left) - discussion_left = @grouped_diff_discussions[line_code] + discussions_left = @grouped_diff_discussions[line_code] end if right && right.added? line_code = diff_file.line_code(right) - discussion_right = @grouped_diff_discussions[line_code] + discussions_right = @grouped_diff_discussions[line_code] end - [discussion_left, discussion_right] + [discussions_left, discussions_right] end def inline_diff_btn diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index 61805021b39..8ec72d5f43a 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -32,27 +32,12 @@ module NotesHelper def diff_view_line_data(line_code, position, line_type) return if @diff_notes_disabled - use_legacy_diff_note = @use_legacy_diff_notes - # If the controller doesn't force the use of legacy diff notes, we - # determine this on a line-by-line basis by seeing if there already exist - # active legacy diff notes at this line, in which case newly created notes - # will use the legacy technology as well. - # We do this because the discussion_id values of legacy and "new" diff - # notes, which are used to group notes on the merge request discussion tab, - # are incompatible. - # If we didn't, diff notes that would show for the same line on the changes - # tab, would show in different discussions on the discussion tab. - use_legacy_diff_note ||= begin - discussion = @grouped_diff_discussions[line_code] - discussion && discussion.legacy_diff_discussion? - end - data = { line_code: line_code, line_type: line_type, } - if use_legacy_diff_note + if @use_legacy_diff_notes data[:note_type] = LegacyDiffNote.name else data[:note_type] = DiffNote.name diff --git a/app/models/note.rb b/app/models/note.rb index 3db1656ba57..9d4f99ac9c8 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -109,10 +109,9 @@ class Note < ActiveRecord::Base def grouped_diff_discussions diff_notes. fresh. + discussions. select(&:active?). - group_by(&:line_code). - map { |line_code, notes| [line_code, DiffDiscussion.build(notes)] }. - to_h + group_by(&:line_code) end def count_for_collection(ids, type) diff --git a/app/views/discussions/_diff_discussion.html.haml b/app/views/discussions/_diff_discussion.html.haml index ee452add394..e6d307e5568 100644 --- a/app/views/discussions/_diff_discussion.html.haml +++ b/app/views/discussions/_diff_discussion.html.haml @@ -3,4 +3,4 @@ %td.notes_line{ colspan: 2 } %td.notes_content .content{ class: ('hide' unless expanded) } - = render "discussions/notes", discussion: discussion + = render partial: "discussions/notes", collection: discussions, as: :discussion diff --git a/app/views/discussions/_diff_with_notes.html.haml b/app/views/discussions/_diff_with_notes.html.haml index 94408b92374..549364761e6 100644 --- a/app/views/discussions/_diff_with_notes.html.haml +++ b/app/views/discussions/_diff_with_notes.html.haml @@ -7,7 +7,7 @@ .diff-content.code.js-syntax-highlight %table - - discussions = { discussion.original_line_code => discussion } + - discussions = { discussion.original_line_code => [discussion] } = render partial: "projects/diffs/line", collection: discussion.truncated_diff_lines, as: :line, diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index ad778612f92..34789808f10 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -1,19 +1,20 @@ -%ul.notes{ data: { discussion_id: discussion.id } } - = render partial: "projects/notes/note", collection: discussion.notes, as: :note +.discussion-notes + %ul.notes{ data: { discussion_id: discussion.id } } + = render partial: "projects/notes/note", collection: discussion.notes, as: :note -- if current_user - .discussion-reply-holder - - if discussion.potentially_resolvable? - - line_type = local_assigns.fetch(:line_type, nil) + - if current_user + .discussion-reply-holder + - if discussion.potentially_resolvable? + - line_type = local_assigns.fetch(:line_type, nil) - .btn-group-justified.discussion-with-resolve-btn{ role: "group" } - .btn-group{ role: "group" } - = link_to_reply_discussion(discussion, line_type) + .btn-group-justified.discussion-with-resolve-btn{ role: "group" } + .btn-group{ role: "group" } + = link_to_reply_discussion(discussion, line_type) - = render "discussions/resolve_all", discussion: discussion + = render "discussions/resolve_all", discussion: discussion - .btn-group.discussion-actions - = render "discussions/new_issue_for_discussion", discussion: discussion, merge_request: discussion.noteable - = render "discussions/jump_to_next", discussion: discussion - - else - = link_to_reply_discussion(discussion) + .btn-group.discussion-actions + = render "discussions/new_issue_for_discussion", discussion: discussion, merge_request: discussion.noteable + = render "discussions/jump_to_next", discussion: discussion + - else + = link_to_reply_discussion(discussion) diff --git a/app/views/discussions/_parallel_diff_discussion.html.haml b/app/views/discussions/_parallel_diff_discussion.html.haml index 3a19e021643..253cd336882 100644 --- a/app/views/discussions/_parallel_diff_discussion.html.haml +++ b/app/views/discussions/_parallel_diff_discussion.html.haml @@ -1,20 +1,20 @@ -- expanded = discussion_left.try(:expanded?) || discussion_right.try(:expanded?) +- expanded = [*discussions_left, *discussions_right].any?(&:expanded?) %tr.notes_holder{ class: ('hide' unless expanded) } - - if discussion_left + - if discussions_left %td.notes_line.old %td.notes_content.parallel.old - .content{ class: ('hide' unless discussion_left.expanded?) } - = render "discussions/notes", discussion: discussion_left, line_type: 'old' + .content{ class: ('hide' unless discussions_left.any?(&:expanded?)) } + = render partial: "discussions/notes", collection: discussions_left, as: :discussion, line_type: 'old' - else %td.notes_line.old= ("") %td.notes_content.parallel.old .content - - if discussion_right + - if discussions_right %td.notes_line.new %td.notes_content.parallel.new - .content{ class: ('hide' unless discussion_right.expanded?) } - = render "discussions/notes", discussion: discussion_right, line_type: 'new' + .content{ class: ('hide' unless discussions_right.any?(&:expanded?)) } + = render partial: "discussions/notes", collection: discussions_right, as: :discussion, line_type: 'new' - else %td.notes_line.new= ("") %td.notes_content.parallel.new diff --git a/app/views/projects/diffs/_line.html.haml b/app/views/projects/diffs/_line.html.haml index c09c7b87e24..3e426ee9e7d 100644 --- a/app/views/projects/diffs/_line.html.haml +++ b/app/views/projects/diffs/_line.html.haml @@ -4,7 +4,7 @@ - type = line.type - line_code = diff_file.line_code(line) - if discussions && !line.meta? - - discussion = discussions[line_code] + - line_discussions = discussions[line_code] %tr.line_holder{ class: type, id: (line_code unless plain) } - case type - when 'match' @@ -20,6 +20,7 @@ = link_text - else %a{ href: "##{line_code}", data: { linenumber: link_text } } + - discussion = line_discussions.try(:first) - if discussion && discussion.resolvable? && !plain %diff-note-avatars{ "discussion-id" => discussion.id } %td.new_line.diff-line-num{ class: type, data: { linenumber: line.new_pos } } @@ -34,6 +35,6 @@ - else = diff_line_content(line.text) -- if discussion - - discussion_expanded = local_assigns.fetch(:discussion_expanded, discussion.expanded?) - = render "discussions/diff_discussion", discussion: discussion, expanded: discussion_expanded +- if line_discussions + - discussion_expanded = local_assigns.fetch(:discussion_expanded, line_discussions.any?(&:expanded?)) + = render "discussions/diff_discussion", discussions: line_discussions, expanded: discussion_expanded diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml index b7346f27ddb..f920f359de2 100644 --- a/app/views/projects/diffs/_parallel_view.html.haml +++ b/app/views/projects/diffs/_parallel_view.html.haml @@ -6,7 +6,7 @@ - right = line[:right] - last_line = right.new_pos if right - unless @diff_notes_disabled - - discussion_left, discussion_right = parallel_diff_discussions(left, right, diff_file) + - discussions_left, discussions_right = parallel_diff_discussions(left, right, diff_file) %tr.line_holder.parallel - if left - case left.type @@ -20,6 +20,7 @@ - left_position = diff_file.position(left) %td.old_line.diff-line-num.js-avatar-container{ id: left_line_code, class: left.type, data: { linenumber: left.old_pos } } %a{ href: "##{left_line_code}", data: { linenumber: left.old_pos } } + - discussion_left = discussions_left.try(:first) - if discussion_left && discussion_left.resolvable? %diff-note-avatars{ "discussion-id" => discussion_left.id } %td.line_content.parallel.noteable_line{ class: left.type, data: diff_view_line_data(left_line_code, left_position, 'old') }= diff_line_content(left.text) @@ -39,6 +40,7 @@ - right_position = diff_file.position(right) %td.new_line.diff-line-num.js-avatar-container{ id: right_line_code, class: right.type, data: { linenumber: right.new_pos } } %a{ href: "##{right_line_code}", data: { linenumber: right.new_pos } } + - discussion_right = discussions_right.try(:first) - if discussion_right && discussion_right.resolvable? %diff-note-avatars{ "discussion-id" => discussion_right.id } %td.line_content.parallel.noteable_line{ class: right.type, data: diff_view_line_data(right_line_code, right_position, 'new') }= diff_line_content(right.text) @@ -46,8 +48,8 @@ %td.old_line.diff-line-num.empty-cell %td.line_content.parallel - - if discussion_left || discussion_right - = render "discussions/parallel_diff_discussion", discussion_left: discussion_left, discussion_right: discussion_right + - if discussions_left || discussions_right + = render "discussions/parallel_diff_discussion", discussions_left: discussions_left, discussions_right: discussions_right - if !diff_file.new_file && !diff_file.deleted_file && diff_file.diff_lines.any? - last_line = diff_file.diff_lines.last - if last_line.new_pos < total_lines From 21e10888c3fc0fe545c0443cf0e23f593df847a4 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 30 Mar 2017 21:06:09 -0600 Subject: [PATCH 20/70] Address review comments --- app/controllers/concerns/renders_notes.rb | 20 ++++++ app/controllers/projects/commit_controller.rb | 2 +- app/controllers/projects/issues_controller.rb | 2 +- .../projects/merge_requests_controller.rb | 2 +- app/controllers/projects/notes_controller.rb | 2 +- .../projects/snippets_controller.rb | 2 +- app/finders/notes_finder.rb | 21 +++--- app/helpers/notes_helper.rb | 17 ----- app/mailers/emails/notes.rb | 5 -- app/models/concerns/resolvable_discussion.rb | 14 ++-- app/models/concerns/resolvable_note.rb | 4 +- app/models/diff_discussion.rb | 1 + app/models/diff_note.rb | 1 + app/models/discussion.rb | 1 + app/models/discussion_note.rb | 1 + app/models/individual_note_discussion.rb | 2 + app/models/legacy_diff_discussion.rb | 1 + app/models/legacy_diff_note.rb | 1 + app/models/note.rb | 17 +++-- app/models/out_of_context_discussion.rb | 2 + app/models/simple_discussion.rb | 1 + app/views/notify/_note_email.html.haml | 17 ++--- app/views/notify/_note_email.text.erb | 13 ++-- app/views/notify/note_commit_email.text.erb | 2 +- app/views/notify/note_issue_email.text.erb | 2 +- .../note_personal_snippet_email.text.erb | 2 +- app/views/notify/note_snippet_email.text.erb | 2 +- .../projects/notes_controller_spec.rb | 68 ++----------------- 28 files changed, 97 insertions(+), 128 deletions(-) create mode 100644 app/controllers/concerns/renders_notes.rb diff --git a/app/controllers/concerns/renders_notes.rb b/app/controllers/concerns/renders_notes.rb new file mode 100644 index 00000000000..dd21066ac13 --- /dev/null +++ b/app/controllers/concerns/renders_notes.rb @@ -0,0 +1,20 @@ +module RendersNotes + def prepare_notes_for_rendering(notes) + preload_noteable_for_regular_notes(notes) + preload_max_access_for_authors(notes, @project) + Banzai::NoteRenderer.render(notes, @project, current_user) + + notes + end + + private + + def preload_max_access_for_authors(notes, project) + user_ids = notes.map(&:author_id) + project.team.max_member_access_for_user_ids(user_ids) + end + + def preload_noteable_for_regular_notes(notes) + ActiveRecord::Associations::Preloader.new.preload(notes.reject(&:for_commit?), :noteable) + end +end diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index d1558bdfba8..8362bfc39dd 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -2,7 +2,7 @@ # # Not to be confused with CommitsController, plural. class Projects::CommitController < Projects::ApplicationController - include NotesHelper + include RendersNotes include CreatesCommit include DiffForPath include DiffHelper diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 0c6267f065b..ed2f06692d4 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -1,5 +1,5 @@ class Projects::IssuesController < Projects::ApplicationController - include NotesHelper + include RendersNotes include ToggleSubscriptionAction include IssuableActions include ToggleAwardEmoji diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 48a10fbe9cc..09ccd19abc2 100755 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -3,7 +3,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController include DiffForPath include DiffHelper include IssuableActions - include NotesHelper + include RendersNotes include ToggleAwardEmoji include IssuableCollections diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 7ae590d3de1..881e6d8d4b5 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -1,5 +1,5 @@ class Projects::NotesController < Projects::ApplicationController - include NotesHelper + include RendersNotes include ToggleAwardEmoji # Authorize diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb index 2600a9d7256..5c9e0d4d1a1 100644 --- a/app/controllers/projects/snippets_controller.rb +++ b/app/controllers/projects/snippets_controller.rb @@ -1,5 +1,5 @@ class Projects::SnippetsController < Projects::ApplicationController - include NotesHelper + include RendersNotes include ToggleAwardEmoji include SpammableActions include SnippetsActions diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb index 855940762f3..c20bfb20171 100644 --- a/app/finders/notes_finder.rb +++ b/app/finders/notes_finder.rb @@ -20,9 +20,9 @@ class NotesFinder end def execute - @notes = init_collection - @notes = since_fetch_at(@params[:last_fetched_at], @notes) if @params[:last_fetched_at] - @notes + notes = init_collection + notes = since_fetch_at(notes) + notes.fresh end def target @@ -56,7 +56,7 @@ class NotesFinder def notes_of_any_type types = %w(commit issue merge_request snippet) note_relations = types.map { |t| notes_for_type(t) } - note_relations.map! { |notes| search(@params[:search], notes) } if @params[:search] + note_relations.map! { |notes| search(notes) } UnionFinder.new.find_union(note_relations, Note) end @@ -98,16 +98,21 @@ class NotesFinder # # This method uses ILIKE on PostgreSQL and LIKE on MySQL. # - def search(query, notes_relation = @notes) + def search(query, notes) + query = @params[:search] + return unless query + pattern = "%#{query}%" - notes_relation.where(Note.arel_table[:note].matches(pattern)) + notes.where(Note.arel_table[:note].matches(pattern)) end # Notes changed since last fetch # Uses overlapping intervals to avoid worrying about race conditions - def since_fetch_at(fetch_time, notes_relation = @notes) + def since_fetch_at(notes) + return notes unless @params[:last_fetched_at] + # Default to 0 to remain compatible with old clients last_fetched_at = Time.at(@params.fetch(:last_fetched_at, 0).to_i) - notes_relation.where('updated_at > ?', last_fetched_at - FETCH_OVERLAP).fresh + notes.updated_after(last_fetched_at - FETCH_OVERLAP) end end diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index 8ec72d5f43a..443e0143647 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -57,23 +57,6 @@ module NotesHelper data: data, title: 'Add a reply' end - def preload_max_access_for_authors(notes, project) - user_ids = notes.map(&:author_id) - project.team.max_member_access_for_user_ids(user_ids) - end - - def preload_noteable_for_regular_notes(notes) - ActiveRecord::Associations::Preloader.new.preload(notes.reject(&:for_commit?), :noteable) - end - - def prepare_notes_for_rendering(notes) - preload_noteable_for_regular_notes(notes) - preload_max_access_for_authors(notes, @project) - Banzai::NoteRenderer.render(notes, @project, current_user) - - notes - end - def note_max_access_for_user(note) note.project.team.human_max_access(note.author_id) end diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb index a42745acd71..3c78e1fcd68 100644 --- a/app/mailers/emails/notes.rb +++ b/app/mailers/emails/notes.rb @@ -4,7 +4,6 @@ module Emails setup_note_mail(note_id, recipient_id) @commit = @note.noteable - @discussion = @note.discussion if @note.part_of_discussion? @target_url = namespace_project_commit_url(*note_target_url_options) mail_answer_thread(@commit, @@ -17,7 +16,6 @@ module Emails setup_note_mail(note_id, recipient_id) @issue = @note.noteable - @discussion = @note.discussion if @note.part_of_discussion? @target_url = namespace_project_issue_url(*note_target_url_options) mail_answer_thread(@issue, note_thread_options(recipient_id)) end @@ -26,7 +24,6 @@ module Emails setup_note_mail(note_id, recipient_id) @merge_request = @note.noteable - @discussion = @note.discussion if @note.part_of_discussion? @target_url = namespace_project_merge_request_url(*note_target_url_options) mail_answer_thread(@merge_request, note_thread_options(recipient_id)) end @@ -35,7 +32,6 @@ module Emails setup_note_mail(note_id, recipient_id) @snippet = @note.noteable - @discussion = @note.discussion if @note.part_of_discussion? @target_url = namespace_project_snippet_url(*note_target_url_options) mail_answer_thread(@snippet, note_thread_options(recipient_id)) end @@ -44,7 +40,6 @@ module Emails setup_note_mail(note_id, recipient_id) @snippet = @note.noteable - @discussion = @note.discussion if @note.part_of_discussion? @target_url = snippet_url(@note.noteable) mail_answer_thread(@snippet, note_thread_options(recipient_id)) end diff --git a/app/models/concerns/resolvable_discussion.rb b/app/models/concerns/resolvable_discussion.rb index 3141c150ac9..22cd9bb7fd4 100644 --- a/app/models/concerns/resolvable_discussion.rb +++ b/app/models/concerns/resolvable_discussion.rb @@ -2,12 +2,14 @@ module ResolvableDiscussion extend ActiveSupport::Concern included do - memoized_values << :resolvable - memoized_values << :resolved - memoized_values << :first_note - memoized_values << :first_note_to_resolve - memoized_values << :last_resolved_note - memoized_values << :last_note + memoized_values.push( + :resolvable, + :resolved, + :first_note, + :first_note_to_resolve, + :last_resolved_note, + :last_note + ) delegate :resolved_at, :resolved_by, diff --git a/app/models/concerns/resolvable_note.rb b/app/models/concerns/resolvable_note.rb index 2aba979938b..1155ec22369 100644 --- a/app/models/concerns/resolvable_note.rb +++ b/app/models/concerns/resolvable_note.rb @@ -8,7 +8,9 @@ module ResolvableNote validates :resolved_by, presence: true, if: :resolved? - # Keep this scope in sync with the logic in `#potentially_resolvable?` in `Discussion` subclasses that are resolvable + # Keep this scope in sync with the logic in `#potentially_resolvable?` in `Discussion` subclasses that are resolvable. + # `RESOLVABLE_TYPES` should include names of all subclasses that are resolvable (where the method can return true), and + # the scope should also match the criteria `ResolvableDiscussion#potentially_resolvable?` puts on resolvability. scope :potentially_resolvable, -> { where(type: RESOLVABLE_TYPES).where(noteable_type: 'MergeRequest') } # Keep this scope in sync with `#resolvable?` scope :resolvable, -> { potentially_resolvable.user } diff --git a/app/models/diff_discussion.rb b/app/models/diff_discussion.rb index 8acb70eb7cb..a89cce4bf5e 100644 --- a/app/models/diff_discussion.rb +++ b/app/models/diff_discussion.rb @@ -1,3 +1,4 @@ +# A discussion on merge request or commit diffs consisting of `DiffNote` notes class DiffDiscussion < Discussion include DiscussionOnDiff diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index 6029fc42e9c..9185a5a0ad8 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -1,3 +1,4 @@ +# A note on merge request or commit diffs class DiffNote < Note include NoteOnDiff diff --git a/app/models/discussion.rb b/app/models/discussion.rb index 782db4044ed..a77076f02b6 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -39,6 +39,7 @@ class Discussion [:discussion, note.noteable_type.try(:underscore), noteable_id] end + # Returns an array of discussion ID components def self.build_discussion_id(note) [*build_discussion_id_base(note), SecureRandom.hex] end diff --git a/app/models/discussion_note.rb b/app/models/discussion_note.rb index 510aefbf609..8957161805a 100644 --- a/app/models/discussion_note.rb +++ b/app/models/discussion_note.rb @@ -1,3 +1,4 @@ +# A note in a non-diff discussion on an issue, merge request, commit, or snippet class DiscussionNote < Note NOTEABLE_TYPES = %w(MergeRequest Issue Commit Snippet).freeze diff --git a/app/models/individual_note_discussion.rb b/app/models/individual_note_discussion.rb index ebcf60beaf3..506b0a98528 100644 --- a/app/models/individual_note_discussion.rb +++ b/app/models/individual_note_discussion.rb @@ -1,3 +1,5 @@ +# A discussion to wrap a single `Note` note on the root of an issue, merge request, +# commit, or snippet, that is not displayed as a discussion class IndividualNoteDiscussion < Discussion # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` def potentially_resolvable? diff --git a/app/models/legacy_diff_discussion.rb b/app/models/legacy_diff_discussion.rb index 36612a28ba1..39b57f6d743 100644 --- a/app/models/legacy_diff_discussion.rb +++ b/app/models/legacy_diff_discussion.rb @@ -1,3 +1,4 @@ +# A discussion on merge request or commit diffs consisting of `LegacyDiffNote` notes class LegacyDiffDiscussion < Discussion include DiscussionOnDiff diff --git a/app/models/legacy_diff_note.rb b/app/models/legacy_diff_note.rb index 0d86610e473..8fdebef042b 100644 --- a/app/models/legacy_diff_note.rb +++ b/app/models/legacy_diff_note.rb @@ -1,3 +1,4 @@ +# A note on merge request or commit diffs, using the legacy implementation class LegacyDiffNote < Note include NoteOnDiff diff --git a/app/models/note.rb b/app/models/note.rb index 9d4f99ac9c8..3d2decf6930 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -68,6 +68,7 @@ class Note < ActiveRecord::Base scope :user, ->{ where(system: false) } scope :common, ->{ where(noteable_type: ["", nil]) } scope :fresh, ->{ order(created_at: :asc, id: :asc) } + scope :updated_after, ->(time){ where('updated_at > ?', time) } scope :inc_author_project, ->{ includes(:project, :author) } scope :inc_author, ->{ includes(:author) } scope :inc_relations_for_view, -> do @@ -238,18 +239,20 @@ class Note < ActiveRecord::Base discussion_class(noteable).override_discussion_id(self) || super() end - # Returns a discussion containing just this note + # Returns a discussion containing just this note. + # This method exists as an alternative to `#discussion` to use when the methods + # we intend to call on the Discussion object don't require it to have all of its notes, + # and just depend on the first note or the type of discussion. This saves us a DB query. def to_discussion(noteable = nil) Discussion.build([self], noteable) end - # Returns the entire discussion this note is part of + # Returns the entire discussion this note is part of. + # Consider using `#to_discussion` if we do not need to render the discussion + # and all its notes and if we don't care about the discussion's resolvability status. def discussion - if part_of_discussion? - self.noteable.notes.find_discussion(self.discussion_id) || to_discussion - else - to_discussion - end + full_discussion = self.noteable.notes.find_discussion(self.discussion_id) if part_of_discussion? + full_discussion || to_discussion end def part_of_discussion? diff --git a/app/models/out_of_context_discussion.rb b/app/models/out_of_context_discussion.rb index ecbfd97699f..7be9aa19707 100644 --- a/app/models/out_of_context_discussion.rb +++ b/app/models/out_of_context_discussion.rb @@ -1,3 +1,5 @@ +# A discussion to wrap a number of `Note` notes on the root of a commit when they +# are displayed in context of a merge request as if they were part of a discussion. class OutOfContextDiscussion < Discussion # To make sure all out-of-context notes are displayed in one discussion, # we override the discussion ID to be a newly generated but consistent ID. diff --git a/app/models/simple_discussion.rb b/app/models/simple_discussion.rb index 41c679daf2d..cd2c142211c 100644 --- a/app/models/simple_discussion.rb +++ b/app/models/simple_discussion.rb @@ -1,2 +1,3 @@ +# A non-diff discussion on an issue, merge request, commit, or snippet, consisting of `DiscussionNote` notes class SimpleDiscussion < Discussion end diff --git a/app/views/notify/_note_email.html.haml b/app/views/notify/_note_email.html.haml index 8b139a150b7..9e5aaed6f49 100644 --- a/app/views/notify/_note_email.html.haml +++ b/app/views/notify/_note_email.html.haml @@ -1,17 +1,18 @@ -- if @discussion +- discussion = @note.discussion unless @discussion.individual_note? +- if discussion %p.details = succeed ':' do = link_to @note.author_name, user_url(@note.author) - - if @discussion.diff_discussion? - - if @discussion.new_discussion? + - if discussion.diff_discussion? + - if discussion.new_discussion? started a new discussion - else commented on a discussion - on #{link_to @discussion.file_path, @target_url} + on #{link_to discussion.file_path, @target_url} - else - - if @discussion.new_discussion? + - if discussion.new_discussion? started a new discussion - else commented on a #{link_to 'discussion', @target_url} @@ -20,15 +21,15 @@ %p.details #{link_to @note.author_name, user_url(@note.author)} commented: -- if @discussion&.diff_discussion? +- if discussion&.diff_discussion? = content_for :head do = stylesheet_link_tag 'mailers/highlighted_diff_email' %table = render partial: "projects/diffs/line", - collection: @discussion.truncated_diff_lines, + collection: discussion.truncated_diff_lines, as: :line, - locals: { diff_file: @discussion.diff_file, + locals: { diff_file: discussion.diff_file, plain: true, email: true } diff --git a/app/views/notify/_note_email.text.erb b/app/views/notify/_note_email.text.erb index f2db321859f..b25b513f4d8 100644 --- a/app/views/notify/_note_email.text.erb +++ b/app/views/notify/_note_email.text.erb @@ -1,12 +1,13 @@ -<% if @discussion -%> +<% discussion = @note.discussion unless @discussion.individual_note? -%> +<% if discussion && !discussion.individual_note? -%> <%= @note.author_name -%> -<% if @discussion.new_discussion? -%> +<% if discussion.new_discussion? -%> <%= " started a new discussion" -%> <% else -%> <%= " commented on a discussion" -%> <% end -%> -<% if @discussion.diff_discussion? -%> -<%= " on #{@discussion.file_path}" -%> +<% if discussion.diff_discussion? -%> +<%= " on #{discussion.file_path}" -%> <% end -%> <%= ":" -%> @@ -16,8 +17,8 @@ <% end -%> -<% if @discussion&.diff_discussion? -%> -<% @discussion.truncated_diff_lines(highlight: false).each do |line| -%> +<% if discussion&.diff_discussion? -%> +<% discussion.truncated_diff_lines(highlight: false).each do |line| -%> <%= "> #{line.text}\n" -%> <% end -%> diff --git a/app/views/notify/note_commit_email.text.erb b/app/views/notify/note_commit_email.text.erb index 5585e7c3ee8..413d9e6e9ac 100644 --- a/app/views/notify/note_commit_email.text.erb +++ b/app/views/notify/note_commit_email.text.erb @@ -1 +1 @@ -<%= render partial: 'note_email' %> +<%= render 'note_email' %> diff --git a/app/views/notify/note_issue_email.text.erb b/app/views/notify/note_issue_email.text.erb index 5585e7c3ee8..413d9e6e9ac 100644 --- a/app/views/notify/note_issue_email.text.erb +++ b/app/views/notify/note_issue_email.text.erb @@ -1 +1 @@ -<%= render partial: 'note_email' %> +<%= render 'note_email' %> diff --git a/app/views/notify/note_personal_snippet_email.text.erb b/app/views/notify/note_personal_snippet_email.text.erb index 5585e7c3ee8..413d9e6e9ac 100644 --- a/app/views/notify/note_personal_snippet_email.text.erb +++ b/app/views/notify/note_personal_snippet_email.text.erb @@ -1 +1 @@ -<%= render partial: 'note_email' %> +<%= render 'note_email' %> diff --git a/app/views/notify/note_snippet_email.text.erb b/app/views/notify/note_snippet_email.text.erb index 5585e7c3ee8..413d9e6e9ac 100644 --- a/app/views/notify/note_snippet_email.text.erb +++ b/app/views/notify/note_snippet_email.text.erb @@ -1 +1 @@ -<%= render partial: 'note_email' %> +<%= render 'note_email' %> diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb index b276f9321c7..52a76776239 100644 --- a/spec/controllers/projects/notes_controller_spec.rb +++ b/spec/controllers/projects/notes_controller_spec.rb @@ -15,7 +15,6 @@ describe Projects::NotesController do end describe 'GET index' do - let(:last_fetched_at) { '1487756246' } let(:request_params) do { namespace_id: project.namespace, @@ -35,6 +34,8 @@ describe Projects::NotesController do end it 'passes last_fetched_at from headers to NotesFinder' do + last_fetched_at = 3.hours.ago.to_i + request.headers['X-Last-Fetched-At'] = last_fetched_at expect(NotesFinder).to receive(:new) @@ -47,21 +48,11 @@ describe Projects::NotesController do context 'for a discussion note' do let!(:note) { create(:discussion_note_on_issue, noteable: issue, project: project) } - it 'includes the ID' do + it 'responds with the expected attributes' do get :index, request_params expect(note_json[:id]).to eq(note.id) - end - - it 'includes discussion_html' do - get :index, request_params - expect(note_json[:discussion_html]).not_to be_nil - end - - it "doesn't include diff_discussion_html" do - get :index, request_params - expect(note_json[:diff_discussion_html]).to be_nil end end @@ -72,21 +63,11 @@ describe Projects::NotesController do let(:params) { request_params.merge(target_type: 'merge_request', target_id: note.noteable_id) } - it 'includes the ID' do + it 'responds with the expected attributes' do get :index, params expect(note_json[:id]).to eq(note.id) - end - - it 'includes discussion_html' do - get :index, params - expect(note_json[:discussion_html]).not_to be_nil - end - - it 'includes diff_discussion_html' do - get :index, params - expect(note_json[:diff_discussion_html]).not_to be_nil end end @@ -100,21 +81,11 @@ describe Projects::NotesController do let(:params) { request_params.merge(target_type: 'merge_request', target_id: merge_request.id) } - it 'includes the ID' do + it 'responds with the expected attributes' do get :index, params expect(note_json[:id]).to eq(note.id) - end - - it 'includes discussion_html' do - get :index, params - expect(note_json[:discussion_html]).not_to be_nil - end - - it "doesn't include diff_discussion_html" do - get :index, params - expect(note_json[:diff_discussion_html]).to be_nil end end @@ -122,21 +93,11 @@ describe Projects::NotesController do context 'when displayed on the commit' do let(:params) { request_params.merge(target_type: 'commit', target_id: note.commit_id) } - it 'includes the ID' do + it 'responds with the expected attributes' do get :index, params expect(note_json[:id]).to eq(note.id) - end - - it "doesn't include discussion_html" do - get :index, params - expect(note_json[:discussion_html]).to be_nil - end - - it "doesn't include diff_discussion_html" do - get :index, params - expect(note_json[:diff_discussion_html]).to be_nil end end @@ -145,27 +106,12 @@ describe Projects::NotesController do context 'for a regular note' do let!(:note) { create(:note, noteable: issue, project: project) } - it 'includes the ID' do + it 'responds with the expected attributes' do get :index, request_params expect(note_json[:id]).to eq(note.id) - end - - it 'includes html' do - get :index, request_params - expect(note_json[:html]).not_to be_nil - end - - it "doesn't include discussion_html" do - get :index, request_params - expect(note_json[:discussion_html]).to be_nil - end - - it "doesn't include diff_discussion_html" do - get :index, request_params - expect(note_json[:diff_discussion_html]).to be_nil end end From afa53810deab37c95da245510a7cf85e8846a162 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 31 Mar 2017 15:52:38 -0600 Subject: [PATCH 21/70] Fix specs --- app/assets/javascripts/notes.js | 7 +- app/finders/notes_finder.rb | 4 +- app/views/notify/_note_email.html.haml | 2 +- app/views/notify/_note_email.text.erb | 2 +- lib/gitlab/diff/position.rb | 2 +- .../merge_requests/diff_notes_avatars_spec.rb | 6 +- .../merge_requests/diff_notes_resolve_spec.rb | 2 +- spec/helpers/notes_helper_spec.rb | 17 - .../import_export/safe_model_attributes.yml | 1 + spec/mailers/notify_spec.rb | 2 +- spec/models/concerns/noteable_spec.rb | 14 +- .../concerns/resolvable_discussion_spec.rb | 547 ++++++++++++++++++ spec/models/discussion_spec.rb | 537 ----------------- spec/models/note_spec.rb | 12 +- spec/services/issues/build_service_spec.rb | 6 +- 15 files changed, 576 insertions(+), 585 deletions(-) create mode 100644 spec/models/concerns/resolvable_discussion_spec.rb diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index edfcda7c214..63a5d25a1dc 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -769,6 +769,10 @@ require('./task_list'); form.find('.js-note-new-discussion').remove(); this.setupNoteForm(form); + form + .removeClass('js-main-target-form') + .addClass("discussion-form js-discussion-note-form"); + if (typeof gl.diffNotesCompileComponents !== 'undefined') { var $commentBtn = form.find('comment-and-resolve-btn'); $commentBtn.attr(':discussion-id', "'" + discussionID + "'"); @@ -780,9 +784,6 @@ require('./task_list'); form .find('.js-comment-resolve-button') .attr('data-discussion-id', discussionID); - form - .removeClass('js-main-target-form') - .addClass("discussion-form js-discussion-note-form"); }; /* diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb index c20bfb20171..3c499184b41 100644 --- a/app/finders/notes_finder.rb +++ b/app/finders/notes_finder.rb @@ -98,9 +98,9 @@ class NotesFinder # # This method uses ILIKE on PostgreSQL and LIKE on MySQL. # - def search(query, notes) + def search(notes) query = @params[:search] - return unless query + return notes unless query pattern = "%#{query}%" notes.where(Note.arel_table[:note].matches(pattern)) diff --git a/app/views/notify/_note_email.html.haml b/app/views/notify/_note_email.html.haml index 9e5aaed6f49..a80518f7986 100644 --- a/app/views/notify/_note_email.html.haml +++ b/app/views/notify/_note_email.html.haml @@ -1,4 +1,4 @@ -- discussion = @note.discussion unless @discussion.individual_note? +- discussion = @note.discussion if @note.part_of_discussion? - if discussion %p.details = succeed ':' do diff --git a/app/views/notify/_note_email.text.erb b/app/views/notify/_note_email.text.erb index b25b513f4d8..cb2e7fab6d5 100644 --- a/app/views/notify/_note_email.text.erb +++ b/app/views/notify/_note_email.text.erb @@ -1,4 +1,4 @@ -<% discussion = @note.discussion unless @discussion.individual_note? -%> +<% discussion = @note.discussion if @note.part_of_discussion? -%> <% if discussion && !discussion.individual_note? -%> <%= @note.author_name -%> <% if discussion.new_discussion? -%> diff --git a/lib/gitlab/diff/position.rb b/lib/gitlab/diff/position.rb index fa567dd9da4..fc728123c97 100644 --- a/lib/gitlab/diff/position.rb +++ b/lib/gitlab/diff/position.rb @@ -42,7 +42,7 @@ module Gitlab def encode_with(coder) coder['attributes'] = self.to_h end - + def key @key ||= [base_sha, start_sha, head_sha, Digest::SHA1.hexdigest(old_path || ""), Digest::SHA1.hexdigest(new_path || ""), old_line, new_line] end diff --git a/spec/features/merge_requests/diff_notes_avatars_spec.rb b/spec/features/merge_requests/diff_notes_avatars_spec.rb index a6c72b0b3ac..5769769a5ba 100644 --- a/spec/features/merge_requests/diff_notes_avatars_spec.rb +++ b/spec/features/merge_requests/diff_notes_avatars_spec.rb @@ -163,11 +163,9 @@ feature 'Diff note avatars', feature: true, js: true do end context 'multiple comments' do - before do - create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: position) - create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: position) - create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: position) + let!(:notes) { create_list(:diff_note_on_merge_request, 3, project: project, noteable: merge_request, in_reply_to: note) } + before do visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request, view: view) wait_for_ajax diff --git a/spec/features/merge_requests/diff_notes_resolve_spec.rb b/spec/features/merge_requests/diff_notes_resolve_spec.rb index 69164aabdb2..88d28b649a4 100644 --- a/spec/features/merge_requests/diff_notes_resolve_spec.rb +++ b/spec/features/merge_requests/diff_notes_resolve_spec.rb @@ -191,7 +191,7 @@ feature 'Diff notes resolve', feature: true, js: true do context 'multiple notes' do before do - create(:diff_note_on_merge_request, project: project, noteable: merge_request) + create(:diff_note_on_merge_request, project: project, noteable: merge_request, in_reply_to: note) visit_merge_request end diff --git a/spec/helpers/notes_helper_spec.rb b/spec/helpers/notes_helper_spec.rb index 9c577501f00..a427de32c4c 100644 --- a/spec/helpers/notes_helper_spec.rb +++ b/spec/helpers/notes_helper_spec.rb @@ -36,21 +36,4 @@ describe NotesHelper do expect(helper.note_max_access_for_user(other_note)).to eq('Reporter') end end - - describe '#preload_max_access_for_authors' do - before do - # This method reads cache from RequestStore, so make sure it's clean. - RequestStore.clear! - end - - it 'loads multiple users' do - expected_access = { - owner.id => Gitlab::Access::OWNER, - master.id => Gitlab::Access::MASTER, - reporter.id => Gitlab::Access::REPORTER - } - - expect(helper.preload_max_access_for_authors(notes, project)).to eq(expected_access) - end - end end diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 4c3c7d8cce2..1ad16a9b57d 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -55,6 +55,7 @@ Note: - resolved_at - resolved_by_id - discussion_id +- original_discussion_id LabelLink: - id - label_id diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index fcbbc3166ed..c107e4c4457 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -755,7 +755,7 @@ describe Notify do end shared_examples 'an email for a note on a diff discussion' do |model| - let(:note) { create(model, project: project, author: note_author) } + let(:note) { create(model, author: note_author) } it "includes diffs with character-level highlighting" do is_expected.to have_body_text '}' diff --git a/spec/models/concerns/noteable_spec.rb b/spec/models/concerns/noteable_spec.rb index 24962d3b074..0a181c008f3 100644 --- a/spec/models/concerns/noteable_spec.rb +++ b/spec/models/concerns/noteable_spec.rb @@ -4,14 +4,14 @@ describe MergeRequest, Noteable, model: true do let(:merge_request) { create(:merge_request) } let(:project) { merge_request.project } let!(:active_diff_note1) { create(:diff_note_on_merge_request, project: project, noteable: merge_request) } - let!(:active_diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: merge_request) } + let!(:active_diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, in_reply_to: active_diff_note1) } let!(:active_diff_note3) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: active_position2) } let!(:outdated_diff_note1) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: outdated_position) } - let!(:outdated_diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: outdated_position) } + let!(:outdated_diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: outdated_position, in_reply_to: outdated_diff_note1) } let!(:discussion_note1) { create(:discussion_note_on_merge_request, project: project, noteable: merge_request) } let!(:discussion_note2) { create(:discussion_note_on_merge_request, in_reply_to: discussion_note1) } let!(:commit_diff_note1) { create(:diff_note_on_commit, project: project) } - let!(:commit_diff_note2) { create(:diff_note_on_commit, project: project) } + let!(:commit_diff_note2) { create(:diff_note_on_commit, project: project, in_reply_to: commit_diff_note1) } let!(:commit_note1) { create(:note_on_commit, project: project) } let!(:commit_note2) { create(:note_on_commit, project: project) } let!(:commit_discussion_note1) { create(:discussion_note_on_commit, project: project) } @@ -63,7 +63,7 @@ describe MergeRequest, Noteable, model: true do subject { merge_request.grouped_diff_discussions } it "includes active discussions" do - discussions = subject.values + discussions = subject.values.flatten expect(discussions.count).to eq(2) expect(discussions.map(&:id)).to eq([active_diff_note1.discussion_id, active_diff_note3.discussion_id]) @@ -74,12 +74,12 @@ describe MergeRequest, Noteable, model: true do end it "doesn't include outdated discussions" do - expect(subject.values.map(&:id)).not_to include(outdated_diff_note1.discussion_id) + expect(subject.values.flatten.map(&:id)).not_to include(outdated_diff_note1.discussion_id) end it "groups the discussions by line code" do - expect(subject[active_diff_note1.line_code].id).to eq(active_diff_note1.discussion_id) - expect(subject[active_diff_note3.line_code].id).to eq(active_diff_note3.discussion_id) + expect(subject[active_diff_note1.line_code].first.id).to eq(active_diff_note1.discussion_id) + expect(subject[active_diff_note3.line_code].first.id).to eq(active_diff_note3.discussion_id) end end end diff --git a/spec/models/concerns/resolvable_discussion_spec.rb b/spec/models/concerns/resolvable_discussion_spec.rb new file mode 100644 index 00000000000..2d2182fbae9 --- /dev/null +++ b/spec/models/concerns/resolvable_discussion_spec.rb @@ -0,0 +1,547 @@ +require 'spec_helper' + +describe Discussion, ResolvableDiscussion, models: true do + subject { described_class.new([first_note, second_note, third_note]) } + + let(:first_note) { create(:discussion_note_on_merge_request) } + let(:merge_request) { first_note.noteable } + let(:second_note) { create(:discussion_note_on_merge_request, in_reply_to: first_note) } + let(:third_note) { create(:discussion_note_on_merge_request) } + + describe "#resolvable?" do + context "when potentially resolvable" do + before do + allow(subject).to receive(:potentially_resolvable?).and_return(true) + end + + context "when all notes are unresolvable" do + before do + allow(first_note).to receive(:resolvable?).and_return(false) + allow(second_note).to receive(:resolvable?).and_return(false) + allow(third_note).to receive(:resolvable?).and_return(false) + end + + it "returns false" do + expect(subject.resolvable?).to be false + end + end + + context "when some notes are unresolvable and some notes are resolvable" do + before do + allow(first_note).to receive(:resolvable?).and_return(true) + allow(second_note).to receive(:resolvable?).and_return(false) + allow(third_note).to receive(:resolvable?).and_return(true) + end + + it "returns true" do + expect(subject.resolvable?).to be true + end + end + + context "when all notes are resolvable" do + before do + allow(first_note).to receive(:resolvable?).and_return(true) + allow(second_note).to receive(:resolvable?).and_return(true) + allow(third_note).to receive(:resolvable?).and_return(true) + end + + it "returns true" do + expect(subject.resolvable?).to be true + end + end + end + + context "when not potentially resolvable" do + before do + allow(subject).to receive(:potentially_resolvable?).and_return(false) + end + + it "returns false" do + expect(subject.resolvable?).to be false + end + end + end + + describe "#resolved?" do + context "when not resolvable" do + before do + allow(subject).to receive(:resolvable?).and_return(false) + end + + it "returns false" do + expect(subject.resolved?).to be false + end + end + + context "when resolvable" do + before do + allow(subject).to receive(:resolvable?).and_return(true) + + allow(first_note).to receive(:resolvable?).and_return(true) + allow(second_note).to receive(:resolvable?).and_return(false) + allow(third_note).to receive(:resolvable?).and_return(true) + end + + context "when all resolvable notes are resolved" do + before do + allow(first_note).to receive(:resolved?).and_return(true) + allow(third_note).to receive(:resolved?).and_return(true) + end + + it "returns true" do + expect(subject.resolved?).to be true + end + end + + context "when some resolvable notes are not resolved" do + before do + allow(first_note).to receive(:resolved?).and_return(true) + allow(third_note).to receive(:resolved?).and_return(false) + end + + it "returns false" do + expect(subject.resolved?).to be false + end + end + end + end + + describe "#to_be_resolved?" do + context "when not resolvable" do + before do + allow(subject).to receive(:resolvable?).and_return(false) + end + + it "returns false" do + expect(subject.to_be_resolved?).to be false + end + end + + context "when resolvable" do + before do + allow(subject).to receive(:resolvable?).and_return(true) + + allow(first_note).to receive(:resolvable?).and_return(true) + allow(second_note).to receive(:resolvable?).and_return(false) + allow(third_note).to receive(:resolvable?).and_return(true) + end + + context "when all resolvable notes are resolved" do + before do + allow(first_note).to receive(:resolved?).and_return(true) + allow(third_note).to receive(:resolved?).and_return(true) + end + + it "returns false" do + expect(subject.to_be_resolved?).to be false + end + end + + context "when some resolvable notes are not resolved" do + before do + allow(first_note).to receive(:resolved?).and_return(true) + allow(third_note).to receive(:resolved?).and_return(false) + end + + it "returns true" do + expect(subject.to_be_resolved?).to be true + end + end + end + end + + describe "#can_resolve?" do + let(:current_user) { create(:user) } + + context "when not resolvable" do + before do + allow(subject).to receive(:resolvable?).and_return(false) + end + + it "returns false" do + expect(subject.can_resolve?(current_user)).to be false + end + end + + context "when resolvable" do + before do + allow(subject).to receive(:resolvable?).and_return(true) + end + + context "when not signed in" do + let(:current_user) { nil } + + it "returns false" do + expect(subject.can_resolve?(current_user)).to be false + end + end + + context "when signed in" do + context "when the signed in user is the noteable author" do + before do + subject.noteable.author = current_user + end + + it "returns true" do + expect(subject.can_resolve?(current_user)).to be true + end + end + + context "when the signed in user can push to the project" do + before do + subject.project.team << [current_user, :master] + end + + it "returns true" do + expect(subject.can_resolve?(current_user)).to be true + end + end + + context "when the signed in user is a random user" do + it "returns false" do + expect(subject.can_resolve?(current_user)).to be false + end + end + end + end + end + + describe "#resolve!" do + let(:current_user) { create(:user) } + + context "when not resolvable" do + before do + allow(subject).to receive(:resolvable?).and_return(false) + end + + it "returns nil" do + expect(subject.resolve!(current_user)).to be_nil + end + + it "doesn't set resolved_at" do + subject.resolve!(current_user) + + expect(subject.resolved_at).to be_nil + end + + it "doesn't set resolved_by" do + subject.resolve!(current_user) + + expect(subject.resolved_by).to be_nil + end + + it "doesn't mark as resolved" do + subject.resolve!(current_user) + + expect(subject.resolved?).to be false + end + end + + context "when resolvable" do + let(:user) { create(:user) } + let(:second_note) { create(:diff_note_on_commit) } # unresolvable + + before do + allow(subject).to receive(:resolvable?).and_return(true) + end + + context "when all resolvable notes are resolved" do + before do + first_note.resolve!(user) + third_note.resolve!(user) + + first_note.reload + third_note.reload + end + + it "doesn't change resolved_at on the resolved notes" do + expect(first_note.resolved_at).not_to be_nil + expect(third_note.resolved_at).not_to be_nil + + expect { subject.resolve!(current_user) }.not_to change { first_note.resolved_at } + expect { subject.resolve!(current_user) }.not_to change { third_note.resolved_at } + end + + it "doesn't change resolved_by on the resolved notes" do + expect(first_note.resolved_by).to eq(user) + expect(third_note.resolved_by).to eq(user) + + expect { subject.resolve!(current_user) }.not_to change { first_note.resolved_by } + expect { subject.resolve!(current_user) }.not_to change { third_note.resolved_by } + end + + it "doesn't change the resolved state on the resolved notes" do + expect(first_note.resolved?).to be true + expect(third_note.resolved?).to be true + + expect { subject.resolve!(current_user) }.not_to change { first_note.resolved? } + expect { subject.resolve!(current_user) }.not_to change { third_note.resolved? } + end + + it "doesn't change resolved_at" do + expect(subject.resolved_at).not_to be_nil + + expect { subject.resolve!(current_user) }.not_to change { subject.resolved_at } + end + + it "doesn't change resolved_by" do + expect(subject.resolved_by).to eq(user) + + expect { subject.resolve!(current_user) }.not_to change { subject.resolved_by } + end + + it "doesn't change resolved state" do + expect(subject.resolved?).to be true + + expect { subject.resolve!(current_user) }.not_to change { subject.resolved? } + end + end + + context "when some resolvable notes are resolved" do + before do + first_note.resolve!(user) + end + + it "doesn't change resolved_at on the resolved note" do + expect(first_note.resolved_at).not_to be_nil + + expect { subject.resolve!(current_user) }. + not_to change { first_note.reload.resolved_at } + end + + it "doesn't change resolved_by on the resolved note" do + expect(first_note.resolved_by).to eq(user) + + expect { subject.resolve!(current_user) }. + not_to change { first_note.reload && first_note.resolved_by } + end + + it "doesn't change the resolved state on the resolved note" do + expect(first_note.resolved?).to be true + + expect { subject.resolve!(current_user) }. + not_to change { first_note.reload && first_note.resolved? } + end + + it "sets resolved_at on the unresolved note" do + subject.resolve!(current_user) + third_note.reload + + expect(third_note.resolved_at).not_to be_nil + end + + it "sets resolved_by on the unresolved note" do + subject.resolve!(current_user) + third_note.reload + + expect(third_note.resolved_by).to eq(current_user) + end + + it "marks the unresolved note as resolved" do + subject.resolve!(current_user) + third_note.reload + + expect(third_note.resolved?).to be true + end + + it "sets resolved_at" do + subject.resolve!(current_user) + + expect(subject.resolved_at).not_to be_nil + end + + it "sets resolved_by" do + subject.resolve!(current_user) + + expect(subject.resolved_by).to eq(current_user) + end + + it "marks as resolved" do + subject.resolve!(current_user) + + expect(subject.resolved?).to be true + end + end + + context "when no resolvable notes are resolved" do + it "sets resolved_at on the unresolved notes" do + subject.resolve!(current_user) + first_note.reload + third_note.reload + + expect(first_note.resolved_at).not_to be_nil + expect(third_note.resolved_at).not_to be_nil + end + + it "sets resolved_by on the unresolved notes" do + subject.resolve!(current_user) + first_note.reload + third_note.reload + + expect(first_note.resolved_by).to eq(current_user) + expect(third_note.resolved_by).to eq(current_user) + end + + it "marks the unresolved notes as resolved" do + subject.resolve!(current_user) + first_note.reload + third_note.reload + + expect(first_note.resolved?).to be true + expect(third_note.resolved?).to be true + end + + it "sets resolved_at" do + subject.resolve!(current_user) + first_note.reload + third_note.reload + + expect(subject.resolved_at).not_to be_nil + end + + it "sets resolved_by" do + subject.resolve!(current_user) + first_note.reload + third_note.reload + + expect(subject.resolved_by).to eq(current_user) + end + + it "marks as resolved" do + subject.resolve!(current_user) + first_note.reload + third_note.reload + + expect(subject.resolved?).to be true + end + end + end + end + + describe "#unresolve!" do + context "when not resolvable" do + before do + allow(subject).to receive(:resolvable?).and_return(false) + end + + it "returns nil" do + expect(subject.unresolve!).to be_nil + end + end + + context "when resolvable" do + let(:user) { create(:user) } + + before do + allow(subject).to receive(:resolvable?).and_return(true) + + allow(first_note).to receive(:resolvable?).and_return(true) + allow(second_note).to receive(:resolvable?).and_return(false) + allow(third_note).to receive(:resolvable?).and_return(true) + end + + context "when all resolvable notes are resolved" do + before do + first_note.resolve!(user) + third_note.resolve!(user) + end + + it "unsets resolved_at on the resolved notes" do + subject.unresolve! + first_note.reload + third_note.reload + + expect(first_note.resolved_at).to be_nil + expect(third_note.resolved_at).to be_nil + end + + it "unsets resolved_by on the resolved notes" do + subject.unresolve! + first_note.reload + third_note.reload + + expect(first_note.resolved_by).to be_nil + expect(third_note.resolved_by).to be_nil + end + + it "unmarks the resolved notes as resolved" do + subject.unresolve! + first_note.reload + third_note.reload + + expect(first_note.resolved?).to be false + expect(third_note.resolved?).to be false + end + + it "unsets resolved_at" do + subject.unresolve! + first_note.reload + third_note.reload + + expect(subject.resolved_at).to be_nil + end + + it "unsets resolved_by" do + subject.unresolve! + first_note.reload + third_note.reload + + expect(subject.resolved_by).to be_nil + end + + it "unmarks as resolved" do + subject.unresolve! + + expect(subject.resolved?).to be false + end + end + + context "when some resolvable notes are resolved" do + before do + first_note.resolve!(user) + end + + it "unsets resolved_at on the resolved note" do + subject.unresolve! + + expect(subject.first_note.resolved_at).to be_nil + end + + it "unsets resolved_by on the resolved note" do + subject.unresolve! + + expect(subject.first_note.resolved_by).to be_nil + end + + it "unmarks the resolved note as resolved" do + subject.unresolve! + + expect(subject.first_note.resolved?).to be false + end + end + end + end + + describe "#first_note_to_resolve" do + it "returns the first note that still needs to be resolved" do + allow(first_note).to receive(:to_be_resolved?).and_return(false) + allow(second_note).to receive(:to_be_resolved?).and_return(true) + + expect(subject.first_note_to_resolve).to eq(second_note) + end + end + + describe "#last_resolved_note" do + let(:current_user) { create(:user) } + + before do + first_note.resolve!(current_user) + third_note.resolve!(current_user) + second_note.resolve!(current_user) + end + + it "returns the last note that was resolved" do + expect(subject.last_resolved_note).to eq(second_note) + end + end +end diff --git a/spec/models/discussion_spec.rb b/spec/models/discussion_spec.rb index 771ca37cb12..718b208e8f8 100644 --- a/spec/models/discussion_spec.rb +++ b/spec/models/discussion_spec.rb @@ -27,541 +27,4 @@ describe Discussion, model: true do ]) end end - - describe "#resolvable?" do - context "when potentially resolvable" do - before do - allow(subject).to receive(:potentially_resolvable?).and_return(true) - end - - context "when all notes are unresolvable" do - before do - allow(first_note).to receive(:resolvable?).and_return(false) - allow(second_note).to receive(:resolvable?).and_return(false) - allow(third_note).to receive(:resolvable?).and_return(false) - end - - it "returns false" do - expect(subject.resolvable?).to be false - end - end - - context "when some notes are unresolvable and some notes are resolvable" do - before do - allow(first_note).to receive(:resolvable?).and_return(true) - allow(second_note).to receive(:resolvable?).and_return(false) - allow(third_note).to receive(:resolvable?).and_return(true) - end - - it "returns true" do - expect(subject.resolvable?).to be true - end - end - - context "when all notes are resolvable" do - before do - allow(first_note).to receive(:resolvable?).and_return(true) - allow(second_note).to receive(:resolvable?).and_return(true) - allow(third_note).to receive(:resolvable?).and_return(true) - end - - it "returns true" do - expect(subject.resolvable?).to be true - end - end - end - - context "when not potentially resolvable" do - before do - allow(subject).to receive(:potentially_resolvable?).and_return(false) - end - - it "returns false" do - expect(subject.resolvable?).to be false - end - end - end - - describe "#resolved?" do - context "when not resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(false) - end - - it "returns false" do - expect(subject.resolved?).to be false - end - end - - context "when resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(true) - - allow(first_note).to receive(:resolvable?).and_return(true) - allow(second_note).to receive(:resolvable?).and_return(false) - allow(third_note).to receive(:resolvable?).and_return(true) - end - - context "when all resolvable notes are resolved" do - before do - allow(first_note).to receive(:resolved?).and_return(true) - allow(third_note).to receive(:resolved?).and_return(true) - end - - it "returns true" do - expect(subject.resolved?).to be true - end - end - - context "when some resolvable notes are not resolved" do - before do - allow(first_note).to receive(:resolved?).and_return(true) - allow(third_note).to receive(:resolved?).and_return(false) - end - - it "returns false" do - expect(subject.resolved?).to be false - end - end - end - end - - describe "#to_be_resolved?" do - context "when not resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(false) - end - - it "returns false" do - expect(subject.to_be_resolved?).to be false - end - end - - context "when resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(true) - - allow(first_note).to receive(:resolvable?).and_return(true) - allow(second_note).to receive(:resolvable?).and_return(false) - allow(third_note).to receive(:resolvable?).and_return(true) - end - - context "when all resolvable notes are resolved" do - before do - allow(first_note).to receive(:resolved?).and_return(true) - allow(third_note).to receive(:resolved?).and_return(true) - end - - it "returns false" do - expect(subject.to_be_resolved?).to be false - end - end - - context "when some resolvable notes are not resolved" do - before do - allow(first_note).to receive(:resolved?).and_return(true) - allow(third_note).to receive(:resolved?).and_return(false) - end - - it "returns true" do - expect(subject.to_be_resolved?).to be true - end - end - end - end - - describe "#can_resolve?" do - let(:current_user) { create(:user) } - - context "when not resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(false) - end - - it "returns false" do - expect(subject.can_resolve?(current_user)).to be false - end - end - - context "when resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(true) - end - - context "when not signed in" do - let(:current_user) { nil } - - it "returns false" do - expect(subject.can_resolve?(current_user)).to be false - end - end - - context "when signed in" do - context "when the signed in user is the noteable author" do - before do - subject.noteable.author = current_user - end - - it "returns true" do - expect(subject.can_resolve?(current_user)).to be true - end - end - - context "when the signed in user can push to the project" do - before do - subject.project.team << [current_user, :master] - end - - it "returns true" do - expect(subject.can_resolve?(current_user)).to be true - end - end - - context "when the signed in user is a random user" do - it "returns false" do - expect(subject.can_resolve?(current_user)).to be false - end - end - end - end - end - - describe "#resolve!" do - let(:current_user) { create(:user) } - - context "when not resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(false) - end - - it "returns nil" do - expect(subject.resolve!(current_user)).to be_nil - end - - it "doesn't set resolved_at" do - subject.resolve!(current_user) - - expect(subject.resolved_at).to be_nil - end - - it "doesn't set resolved_by" do - subject.resolve!(current_user) - - expect(subject.resolved_by).to be_nil - end - - it "doesn't mark as resolved" do - subject.resolve!(current_user) - - expect(subject.resolved?).to be false - end - end - - context "when resolvable" do - let(:user) { create(:user) } - let(:second_note) { create(:diff_note_on_commit) } # unresolvable - - before do - allow(subject).to receive(:resolvable?).and_return(true) - end - - context "when all resolvable notes are resolved" do - before do - first_note.resolve!(user) - third_note.resolve!(user) - - first_note.reload - third_note.reload - end - - it "doesn't change resolved_at on the resolved notes" do - expect(first_note.resolved_at).not_to be_nil - expect(third_note.resolved_at).not_to be_nil - - expect { subject.resolve!(current_user) }.not_to change { first_note.resolved_at } - expect { subject.resolve!(current_user) }.not_to change { third_note.resolved_at } - end - - it "doesn't change resolved_by on the resolved notes" do - expect(first_note.resolved_by).to eq(user) - expect(third_note.resolved_by).to eq(user) - - expect { subject.resolve!(current_user) }.not_to change { first_note.resolved_by } - expect { subject.resolve!(current_user) }.not_to change { third_note.resolved_by } - end - - it "doesn't change the resolved state on the resolved notes" do - expect(first_note.resolved?).to be true - expect(third_note.resolved?).to be true - - expect { subject.resolve!(current_user) }.not_to change { first_note.resolved? } - expect { subject.resolve!(current_user) }.not_to change { third_note.resolved? } - end - - it "doesn't change resolved_at" do - expect(subject.resolved_at).not_to be_nil - - expect { subject.resolve!(current_user) }.not_to change { subject.resolved_at } - end - - it "doesn't change resolved_by" do - expect(subject.resolved_by).to eq(user) - - expect { subject.resolve!(current_user) }.not_to change { subject.resolved_by } - end - - it "doesn't change resolved state" do - expect(subject.resolved?).to be true - - expect { subject.resolve!(current_user) }.not_to change { subject.resolved? } - end - end - - context "when some resolvable notes are resolved" do - before do - first_note.resolve!(user) - end - - it "doesn't change resolved_at on the resolved note" do - expect(first_note.resolved_at).not_to be_nil - - expect { subject.resolve!(current_user) }. - not_to change { first_note.reload.resolved_at } - end - - it "doesn't change resolved_by on the resolved note" do - expect(first_note.resolved_by).to eq(user) - - expect { subject.resolve!(current_user) }. - not_to change { first_note.reload && first_note.resolved_by } - end - - it "doesn't change the resolved state on the resolved note" do - expect(first_note.resolved?).to be true - - expect { subject.resolve!(current_user) }. - not_to change { first_note.reload && first_note.resolved? } - end - - it "sets resolved_at on the unresolved note" do - subject.resolve!(current_user) - third_note.reload - - expect(third_note.resolved_at).not_to be_nil - end - - it "sets resolved_by on the unresolved note" do - subject.resolve!(current_user) - third_note.reload - - expect(third_note.resolved_by).to eq(current_user) - end - - it "marks the unresolved note as resolved" do - subject.resolve!(current_user) - third_note.reload - - expect(third_note.resolved?).to be true - end - - it "sets resolved_at" do - subject.resolve!(current_user) - - expect(subject.resolved_at).not_to be_nil - end - - it "sets resolved_by" do - subject.resolve!(current_user) - - expect(subject.resolved_by).to eq(current_user) - end - - it "marks as resolved" do - subject.resolve!(current_user) - - expect(subject.resolved?).to be true - end - end - - context "when no resolvable notes are resolved" do - it "sets resolved_at on the unresolved notes" do - subject.resolve!(current_user) - first_note.reload - third_note.reload - - expect(first_note.resolved_at).not_to be_nil - expect(third_note.resolved_at).not_to be_nil - end - - it "sets resolved_by on the unresolved notes" do - subject.resolve!(current_user) - first_note.reload - third_note.reload - - expect(first_note.resolved_by).to eq(current_user) - expect(third_note.resolved_by).to eq(current_user) - end - - it "marks the unresolved notes as resolved" do - subject.resolve!(current_user) - first_note.reload - third_note.reload - - expect(first_note.resolved?).to be true - expect(third_note.resolved?).to be true - end - - it "sets resolved_at" do - subject.resolve!(current_user) - first_note.reload - third_note.reload - - expect(subject.resolved_at).not_to be_nil - end - - it "sets resolved_by" do - subject.resolve!(current_user) - first_note.reload - third_note.reload - - expect(subject.resolved_by).to eq(current_user) - end - - it "marks as resolved" do - subject.resolve!(current_user) - first_note.reload - third_note.reload - - expect(subject.resolved?).to be true - end - end - end - end - - describe "#unresolve!" do - context "when not resolvable" do - before do - allow(subject).to receive(:resolvable?).and_return(false) - end - - it "returns nil" do - expect(subject.unresolve!).to be_nil - end - end - - context "when resolvable" do - let(:user) { create(:user) } - - before do - allow(subject).to receive(:resolvable?).and_return(true) - - allow(first_note).to receive(:resolvable?).and_return(true) - allow(second_note).to receive(:resolvable?).and_return(false) - allow(third_note).to receive(:resolvable?).and_return(true) - end - - context "when all resolvable notes are resolved" do - before do - first_note.resolve!(user) - third_note.resolve!(user) - end - - it "unsets resolved_at on the resolved notes" do - subject.unresolve! - first_note.reload - third_note.reload - - expect(first_note.resolved_at).to be_nil - expect(third_note.resolved_at).to be_nil - end - - it "unsets resolved_by on the resolved notes" do - subject.unresolve! - first_note.reload - third_note.reload - - expect(first_note.resolved_by).to be_nil - expect(third_note.resolved_by).to be_nil - end - - it "unmarks the resolved notes as resolved" do - subject.unresolve! - first_note.reload - third_note.reload - - expect(first_note.resolved?).to be false - expect(third_note.resolved?).to be false - end - - it "unsets resolved_at" do - subject.unresolve! - first_note.reload - third_note.reload - - expect(subject.resolved_at).to be_nil - end - - it "unsets resolved_by" do - subject.unresolve! - first_note.reload - third_note.reload - - expect(subject.resolved_by).to be_nil - end - - it "unmarks as resolved" do - subject.unresolve! - - expect(subject.resolved?).to be false - end - end - - context "when some resolvable notes are resolved" do - before do - first_note.resolve!(user) - end - - it "unsets resolved_at on the resolved note" do - subject.unresolve! - - expect(subject.first_note.resolved_at).to be_nil - end - - it "unsets resolved_by on the resolved note" do - subject.unresolve! - - expect(subject.first_note.resolved_by).to be_nil - end - - it "unmarks the resolved note as resolved" do - subject.unresolve! - - expect(subject.first_note.resolved?).to be false - end - end - end - end - - describe "#first_note_to_resolve" do - it "returns the first note that still needs to be resolved" do - allow(first_note).to receive(:to_be_resolved?).and_return(false) - allow(second_note).to receive(:to_be_resolved?).and_return(true) - - expect(subject.first_note_to_resolve).to eq(second_note) - end - end - - describe "#last_resolved_note" do - let(:current_user) { create(:user) } - - before do - first_note.resolve!(current_user) - third_note.resolve!(current_user) - second_note.resolve!(current_user) - end - - it "returns the last note that was resolved" do - expect(subject.last_resolved_note).to eq(second_note) - end - end end diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 3cdabb2875f..2c7f6e59b19 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -263,10 +263,10 @@ describe Note, models: true do let!(:merge_request) { create(:merge_request) } let(:project) { merge_request.project } let!(:active_diff_note1) { create(:diff_note_on_merge_request, project: project, noteable: merge_request) } - let!(:active_diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: merge_request) } + let!(:active_diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, in_reply_to: active_diff_note1) } let!(:active_diff_note3) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: active_position2) } let!(:outdated_diff_note1) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: outdated_position) } - let!(:outdated_diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: outdated_position) } + let!(:outdated_diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, in_reply_to: outdated_diff_note1) } let(:active_position2) do Gitlab::Diff::Position.new( @@ -291,7 +291,7 @@ describe Note, models: true do subject { merge_request.notes.grouped_diff_discussions } it "includes active discussions" do - discussions = subject.values + discussions = subject.values.flatten expect(discussions.count).to eq(2) expect(discussions.map(&:id)).to eq([active_diff_note1.discussion_id, active_diff_note3.discussion_id]) @@ -302,12 +302,12 @@ describe Note, models: true do end it "doesn't include outdated discussions" do - expect(subject.values.map(&:id)).not_to include(outdated_diff_note1.discussion_id) + expect(subject.values.flatten.map(&:id)).not_to include(outdated_diff_note1.discussion_id) end it "groups the discussions by line code" do - expect(subject[active_diff_note1.line_code].id).to eq(active_diff_note1.discussion_id) - expect(subject[active_diff_note3.line_code].id).to eq(active_diff_note3.discussion_id) + expect(subject[active_diff_note1.line_code].first.id).to eq(active_diff_note1.discussion_id) + expect(subject[active_diff_note3.line_code].first.id).to eq(active_diff_note3.discussion_id) end end diff --git a/spec/services/issues/build_service_spec.rb b/spec/services/issues/build_service_spec.rb index 6fa8806d270..55d635235b0 100644 --- a/spec/services/issues/build_service_spec.rb +++ b/spec/services/issues/build_service_spec.rb @@ -91,9 +91,7 @@ describe Issues::BuildService, services: true do end describe 'with multiple discussions' do - before do - create(:diff_note_on_merge_request, noteable: merge_request, project: merge_request.target_project, line_number: 15) - end + let!(:diff_note) { create(:diff_note_on_merge_request, noteable: merge_request, project: merge_request.target_project, line_number: 15) } it 'mentions all the authors in the description' do authors = merge_request.resolvable_discussions.map(&:author) @@ -109,7 +107,7 @@ describe Issues::BuildService, services: true do end it 'mentions additional notes' do - create_list(:diff_note_on_merge_request, 2, noteable: merge_request, project: merge_request.target_project, line_number: 15) + create_list(:diff_note_on_merge_request, 2, noteable: merge_request, project: merge_request.target_project, in_reply_to: diff_note) expect(issue.description).to include('(+2 comments)') end From c319f2114177f011cd0c6c23b04f7c19971268bf Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 4 Apr 2017 17:27:23 -0500 Subject: [PATCH 22/70] Address review comments --- app/helpers/notes_helper.rb | 1 - app/mailers/emails/notes.rb | 16 +- app/models/concerns/discussion_on_diff.rb | 1 + app/models/concerns/note_on_diff.rb | 1 + app/models/concerns/noteable.rb | 26 ++ app/models/concerns/resolvable_discussion.rb | 25 ++ app/models/concerns/resolvable_note.rb | 2 +- app/models/diff_discussion.rb | 2 +- app/models/discussion.rb | 46 ++-- app/models/discussion_note.rb | 2 +- app/models/individual_note_discussion.rb | 3 +- app/models/legacy_diff_discussion.rb | 5 +- app/models/legacy_diff_note.rb | 4 +- app/models/merge_request.rb | 24 -- app/models/note.rb | 4 +- app/models/out_of_context_discussion.rb | 19 +- app/models/sent_notification.rb | 2 + app/models/simple_discussion.rb | 3 - app/services/notes/build_service.rb | 2 +- app/services/notes/create_service.rb | 2 +- .../notify/note_merge_request_email.text.erb | 2 +- .../unreleased/new-resolvable-discussion.yml | 4 +- ...dd_index_to_note_original_discussion_id.rb | 18 -- db/schema.rb | 1 - spec/factories/notes.rb | 12 +- .../merge_requests/diff_notes_avatars_spec.rb | 4 +- spec/mailers/notify_spec.rb | 12 +- spec/mailers/previews/notify_preview.rb | 115 +++++++++ .../concerns/discussion_on_diff_spec.rb | 24 ++ spec/models/concerns/noteable_spec.rb | 232 +++++++++++++++--- .../concerns/resolvable_discussion_spec.rb | 5 +- spec/models/concerns/resolvable_note_spec.rb | 24 +- spec/models/diff_discussion_spec.rb | 25 +- spec/models/discussion_note_spec.rb | 4 - spec/models/discussion_spec.rb | 12 +- .../models/individual_note_discussion_spec.rb | 4 - spec/models/merge_request_spec.rb | 176 ------------- spec/models/note_spec.rb | 30 +-- spec/models/out_of_context_discussion_spec.rb | 4 - spec/models/simple_discussion_spec.rb | 11 - 40 files changed, 506 insertions(+), 403 deletions(-) delete mode 100644 app/models/simple_discussion.rb delete mode 100644 db/migrate/20170308220217_add_index_to_note_original_discussion_id.rb create mode 100644 spec/mailers/previews/notify_preview.rb create mode 100644 spec/models/concerns/discussion_on_diff_spec.rb delete mode 100644 spec/models/discussion_note_spec.rb delete mode 100644 spec/models/individual_note_discussion_spec.rb delete mode 100644 spec/models/out_of_context_discussion_spec.rb delete mode 100644 spec/models/simple_discussion_spec.rb diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index 443e0143647..5f3d89cf6cb 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -51,7 +51,6 @@ module NotesHelper return unless current_user data = { discussion_id: discussion.id, line_type: line_type } - data[:line_code] = discussion.line_code if discussion.respond_to?(:line_code) button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button', data: data, title: 'Add a reply' diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb index 3c78e1fcd68..00707a0023e 100644 --- a/app/mailers/emails/notes.rb +++ b/app/mailers/emails/notes.rb @@ -5,11 +5,7 @@ module Emails @commit = @note.noteable @target_url = namespace_project_commit_url(*note_target_url_options) - - mail_answer_thread(@commit, - from: sender(@note.author_id), - to: recipient(recipient_id), - subject: subject("#{@commit.title} (#{@commit.short_id})")) + mail_answer_thread(@commit, note_thread_options(recipient_id)) end def note_issue_email(recipient_id, note_id) @@ -54,16 +50,18 @@ module Emails { from: sender(@note.author_id), to: recipient(recipient_id), - subject: subject("#{@note.noteable.title} (#{@note.noteable.to_reference})") + subject: subject("#{@note.noteable.title} (#{@note.noteable.reference_link_text})") } end def setup_note_mail(note_id, recipient_id) - @note = Note.find(note_id) + # `note_id` is a `Note` when originating in `NotifyPreview` + @note = note_id.is_a?(Note) ? note_id : Note.find(note_id) @project = @note.project - return unless @project - @sent_notification = SentNotification.record_note(@note, recipient_id, reply_key) + if @project && @note.persisted? + @sent_notification = SentNotification.record_note(@note, recipient_id, reply_key) + end end end end diff --git a/app/models/concerns/discussion_on_diff.rb b/app/models/concerns/discussion_on_diff.rb index 28abed967f0..87db0c810c3 100644 --- a/app/models/concerns/discussion_on_diff.rb +++ b/app/models/concerns/discussion_on_diff.rb @@ -1,3 +1,4 @@ +# Contains functionality shared between `DiffDiscussion` and `LegacyDiffDiscussion`. module DiscussionOnDiff extend ActiveSupport::Concern diff --git a/app/models/concerns/note_on_diff.rb b/app/models/concerns/note_on_diff.rb index 9ce40f329d8..1a5a7007a2b 100644 --- a/app/models/concerns/note_on_diff.rb +++ b/app/models/concerns/note_on_diff.rb @@ -1,3 +1,4 @@ +# Contains functionality shared between `DiffNote` and `LegacyDiffNote`. module NoteOnDiff extend ActiveSupport::Concern diff --git a/app/models/concerns/noteable.rb b/app/models/concerns/noteable.rb index d378152eb56..631df4757a4 100644 --- a/app/models/concerns/noteable.rb +++ b/app/models/concerns/noteable.rb @@ -12,6 +12,32 @@ module Noteable end def grouped_diff_discussions + # Doesn't use `discussion_notes`, because this may include commit diff notes + # besides MR diff notes, that we do no want to display on the MR Changes tab. notes.inc_relations_for_view.grouped_diff_discussions end + + def resolvable_discussions + @resolvable_discussions ||= discussion_notes.resolvable.discussions(self) + end + + def discussions_resolvable? + resolvable_discussions.any?(&:resolvable?) + end + + def discussions_resolved? + discussions_resolvable? && resolvable_discussions.none?(&:to_be_resolved?) + end + + def discussions_to_be_resolved? + discussions_resolvable? && !discussions_resolved? + end + + def discussions_to_be_resolved + @discussions_to_be_resolved ||= resolvable_discussions.select(&:to_be_resolved?) + end + + def discussions_can_be_resolved_by?(user) + discussions_to_be_resolved.all? { |discussion| discussion.can_resolve?(user) } + end end diff --git a/app/models/concerns/resolvable_discussion.rb b/app/models/concerns/resolvable_discussion.rb index 22cd9bb7fd4..5cb51196a94 100644 --- a/app/models/concerns/resolvable_discussion.rb +++ b/app/models/concerns/resolvable_discussion.rb @@ -2,6 +2,15 @@ module ResolvableDiscussion extend ActiveSupport::Concern included do + # A number of properties of this `Discussion`, like `first_note` and `resolvable?`, are memoized. + # When this discussion is resolved or unresolved, the values of these properties potentially change. + # To make sure all memoized values are reset when this happens, `update` resets all instance variables with names in + # `memoized_variables`. If you add a memoized method in `ResolvableDiscussion` or any `Discussion` subclass, + # please make sure the instance variable name is added to `memoized_values`, like below. + cattr_accessor :memoized_values, instance_accessor: false do + [] + end + memoized_values.push( :resolvable, :resolved, @@ -78,4 +87,20 @@ module ResolvableDiscussion update { |notes| notes.unresolve! } end + + private + + def update + # Do not select `Note.resolvable`, so that system notes remain in the collection + notes_relation = Note.where(id: notes.map(&:id)) + + yield(notes_relation) + + # Set the notes array to the updated notes + @notes = notes_relation.fresh.to_a + + self.class.memoized_values.each do |var| + instance_variable_set(:"@#{var}", nil) + end + end end diff --git a/app/models/concerns/resolvable_note.rb b/app/models/concerns/resolvable_note.rb index 1155ec22369..2c70678429a 100644 --- a/app/models/concerns/resolvable_note.rb +++ b/app/models/concerns/resolvable_note.rb @@ -8,7 +8,7 @@ module ResolvableNote validates :resolved_by, presence: true, if: :resolved? - # Keep this scope in sync with the logic in `#potentially_resolvable?` in `Discussion` subclasses that are resolvable. + # Keep this scope in sync with the logic in `#potentially_resolvable?` in subclasses of `Discussion` that are resolvable. # `RESOLVABLE_TYPES` should include names of all subclasses that are resolvable (where the method can return true), and # the scope should also match the criteria `ResolvableDiscussion#potentially_resolvable?` puts on resolvability. scope :potentially_resolvable, -> { where(type: RESOLVABLE_TYPES).where(noteable_type: 'MergeRequest') } diff --git a/app/models/diff_discussion.rb b/app/models/diff_discussion.rb index a89cce4bf5e..22912b30c6a 100644 --- a/app/models/diff_discussion.rb +++ b/app/models/diff_discussion.rb @@ -1,4 +1,4 @@ -# A discussion on merge request or commit diffs consisting of `DiffNote` notes +# A discussion on merge request or commit diffs consisting of `DiffNote` notes. class DiffDiscussion < Discussion include DiscussionOnDiff diff --git a/app/models/discussion.rb b/app/models/discussion.rb index a77076f02b6..22130b8a508 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -1,8 +1,5 @@ +# A non-diff discussion on an issue, merge request, commit, or snippet, consisting of `DiscussionNote` notes. class Discussion - cattr_accessor :memoized_values, instance_accessor: false do - [] - end - include ResolvableDiscussion attr_reader :notes, :noteable @@ -25,23 +22,34 @@ class Discussion notes.group_by { |n| n.discussion_id(noteable) }.values.map { |notes| build(notes, noteable) } end + # Returns an alphanumeric discussion ID based on `build_discussion_id` def self.discussion_id(note) Digest::SHA1.hexdigest(build_discussion_id(note).join("-")) end - # Optionally override the discussion ID at runtime depending on circumstances - def self.override_discussion_id(note) - nil + # Returns an array of discussion ID components + def self.build_discussion_id(note) + [*base_discussion_id(note), SecureRandom.hex] end - def self.build_discussion_id_base(note) + def self.base_discussion_id(note) noteable_id = note.noteable_id || note.commit_id [:discussion, note.noteable_type.try(:underscore), noteable_id] end - # Returns an array of discussion ID components - def self.build_discussion_id(note) - [*build_discussion_id_base(note), SecureRandom.hex] + # To turn a list of notes into a list of discussions, they are grouped by discussion ID. + # When notes on a commit are displayed in context of a merge request that contains that commit, + # these notes are to be displayed as if they were part of one discussion, even though they were actually + # individual notes on the commit with different discussion IDs, so that it's clear that these are not + # notes on the merge request itself. + # To get these out-of-context notes to end up in the same discussion, we need to get them to return the same + # `discussion_id` when this grouping happens. To enable this, `Note#discussion_id` calls out + # to the `override_discussion_id` method on the appropriate `Discussion` subclass, as determined by + # the `discussion_class` method on `Note` or a subclass of `Note`. + # If no override is necessary, return `nil`. + # For the case described above, see `OutOfContextDiscussion.override_discussion_id`. + def self.override_discussion_id(note) + nil end def initialize(notes, noteable = nil) @@ -97,20 +105,4 @@ class Discussion def reply_attributes first_note.slice(:type, :noteable_type, :noteable_id, :commit_id, :discussion_id) end - - private - - def update - # Do not select `Note.resolvable`, so that system notes remain in the collection - notes_relation = Note.where(id: notes.map(&:id)) - - yield(notes_relation) - - # Set the notes array to the updated notes - @notes = notes_relation.fresh.to_a - - self.class.memoized_values.each do |var| - instance_variable_set(:"@#{var}", nil) - end - end end diff --git a/app/models/discussion_note.rb b/app/models/discussion_note.rb index 8957161805a..324d019cf79 100644 --- a/app/models/discussion_note.rb +++ b/app/models/discussion_note.rb @@ -5,6 +5,6 @@ class DiscussionNote < Note validates :noteable_type, inclusion: { in: NOTEABLE_TYPES } def discussion_class(*) - SimpleDiscussion + Discussion end end diff --git a/app/models/individual_note_discussion.rb b/app/models/individual_note_discussion.rb index 506b0a98528..42318fa3d6e 100644 --- a/app/models/individual_note_discussion.rb +++ b/app/models/individual_note_discussion.rb @@ -1,7 +1,6 @@ # A discussion to wrap a single `Note` note on the root of an issue, merge request, -# commit, or snippet, that is not displayed as a discussion +# commit, or snippet, that is not displayed as a discussion. class IndividualNoteDiscussion < Discussion - # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` def potentially_resolvable? false end diff --git a/app/models/legacy_diff_discussion.rb b/app/models/legacy_diff_discussion.rb index 39b57f6d743..6515762c92d 100644 --- a/app/models/legacy_diff_discussion.rb +++ b/app/models/legacy_diff_discussion.rb @@ -1,4 +1,6 @@ -# A discussion on merge request or commit diffs consisting of `LegacyDiffNote` notes +# A discussion on merge request or commit diffs consisting of `LegacyDiffNote` notes. +# All new diff discussions are of the type `DiffDiscussion`, but any diff discussions created +# before the introduction of the new implementation still use `LegacyDiffDiscussion`. class LegacyDiffDiscussion < Discussion include DiscussionOnDiff @@ -6,7 +8,6 @@ class LegacyDiffDiscussion < Discussion true end - # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` def potentially_resolvable? false end diff --git a/app/models/legacy_diff_note.rb b/app/models/legacy_diff_note.rb index 8fdebef042b..b9fddb2ea79 100644 --- a/app/models/legacy_diff_note.rb +++ b/app/models/legacy_diff_note.rb @@ -1,4 +1,6 @@ -# A note on merge request or commit diffs, using the legacy implementation +# A note on merge request or commit diffs, using the legacy implementation. +# All new diff notes are of the type `DiffNote`, but any diff notes created +# before the introduction of the new implementation still use `LegacyDiffNote`. class LegacyDiffNote < Note include NoteOnDiff diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index a1efa17180e..77c902fdf09 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -478,30 +478,6 @@ class MergeRequest < ActiveRecord::Base alias_method :discussion_notes, :related_notes - def resolvable_discussions - @resolvable_discussions ||= notes.resolvable.discussions - end - - def discussions_resolvable? - resolvable_discussions.any?(&:resolvable?) - end - - def discussions_resolved? - discussions_resolvable? && resolvable_discussions.none?(&:to_be_resolved?) - end - - def discussions_to_be_resolved? - discussions_resolvable? && !discussions_resolved? - end - - def discussions_to_be_resolved - @discussions_to_be_resolved ||= resolvable_discussions.select(&:to_be_resolved?) - end - - def discussions_can_be_resolved_by?(user) - discussions_to_be_resolved.all? { |discussion| discussion.can_resolve?(user) } - end - def mergeable_discussions_state? return true unless project.only_allow_merge_if_all_discussions_are_resolved? diff --git a/app/models/note.rb b/app/models/note.rb index 3d2decf6930..6cb9e84ce26 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -227,7 +227,8 @@ class Note < ActiveRecord::Base def discussion_class(noteable = nil) # When commit notes are rendered on an MR's Discussion page, they are - # displayed in one discussion instead of individually + # displayed in one discussion instead of individually. + # See also `#discussion_id` and `Discussion.override_discussion_id`. if noteable && noteable != self.noteable OutOfContextDiscussion else @@ -235,6 +236,7 @@ class Note < ActiveRecord::Base end end + # See `Discussion.override_discussion_id` for details. def discussion_id(noteable = nil) discussion_class(noteable).override_discussion_id(self) || super() end diff --git a/app/models/out_of_context_discussion.rb b/app/models/out_of_context_discussion.rb index 7be9aa19707..62b62ea726c 100644 --- a/app/models/out_of_context_discussion.rb +++ b/app/models/out_of_context_discussion.rb @@ -1,13 +1,18 @@ -# A discussion to wrap a number of `Note` notes on the root of a commit when they -# are displayed in context of a merge request as if they were part of a discussion. +# When notes on a commit are displayed in the context of a merge request that contains that commit, +# they are displayed as if they were a discussion. +# This represents one of those discussions, consisting of `Note` notes. class OutOfContextDiscussion < Discussion - # To make sure all out-of-context notes are displayed in one discussion, - # we override the discussion ID to be a newly generated but consistent ID. - def self.override_discussion_id(note) - Digest::SHA1.hexdigest(build_discussion_id_base(note).join("-")) + # Returns an array of discussion ID components + def self.build_discussion_id(note) + base_discussion_id(note) + end + + # To make sure all out-of-context notes end up grouped as one discussion, + # we override the discussion ID to be a newly generated but consistent ID. + def self.override_discussion_id(note) + discussion_id(note) end - # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` def potentially_resolvable? false end diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb index 7d65b2b7993..bfaf0eb2fae 100644 --- a/app/models/sent_notification.rb +++ b/app/models/sent_notification.rb @@ -102,6 +102,8 @@ class SentNotification < ActiveRecord::Base if self.in_reply_to_discussion_id.present? attrs[:in_reply_to_discussion_id] = self.in_reply_to_discussion_id else + # Remove in GitLab 10.0, when we will not support replying to SentNotifications + # that don't have `in_reply_to_discussion_id` anymore. attrs.merge!( type: self.note_type, diff --git a/app/models/simple_discussion.rb b/app/models/simple_discussion.rb deleted file mode 100644 index cd2c142211c..00000000000 --- a/app/models/simple_discussion.rb +++ /dev/null @@ -1,3 +0,0 @@ -# A non-diff discussion on an issue, merge request, commit, or snippet, consisting of `DiscussionNote` notes -class SimpleDiscussion < Discussion -end diff --git a/app/services/notes/build_service.rb b/app/services/notes/build_service.rb index 4619ba552d7..7d5dca5282c 100644 --- a/app/services/notes/build_service.rb +++ b/app/services/notes/build_service.rb @@ -1,5 +1,5 @@ module Notes - class BuildService < BaseService + class BuildService < ::BaseService def execute in_reply_to_discussion_id = params.delete(:in_reply_to_discussion_id) new_discussion = params.delete(:new_discussion) diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index c08cddcbee5..f3954f6f8c4 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -1,5 +1,5 @@ module Notes - class CreateService < BaseService + class CreateService < ::BaseService def execute merge_request_diff_head_sha = params.delete(:merge_request_diff_head_sha) diff --git a/app/views/notify/note_merge_request_email.text.erb b/app/views/notify/note_merge_request_email.text.erb index 381f0366971..413d9e6e9ac 100644 --- a/app/views/notify/note_merge_request_email.text.erb +++ b/app/views/notify/note_merge_request_email.text.erb @@ -1 +1 @@ -<%= render partial: 'note_email'%> +<%= render 'note_email' %> diff --git a/changelogs/unreleased/new-resolvable-discussion.yml b/changelogs/unreleased/new-resolvable-discussion.yml index af1de6a45e7..f4dc4ea3ede 100644 --- a/changelogs/unreleased/new-resolvable-discussion.yml +++ b/changelogs/unreleased/new-resolvable-discussion.yml @@ -1,4 +1,4 @@ --- title: Add option to start a new resolvable discussion in an MR -merge_request: -author: +merge_request: 7527 +author: diff --git a/db/migrate/20170308220217_add_index_to_note_original_discussion_id.rb b/db/migrate/20170308220217_add_index_to_note_original_discussion_id.rb deleted file mode 100644 index 2c823ed84a9..00000000000 --- a/db/migrate/20170308220217_add_index_to_note_original_discussion_id.rb +++ /dev/null @@ -1,18 +0,0 @@ -# See http://doc.gitlab.com/ce/development/migration_style_guide.html -# for more information on how to write migrations for GitLab. - -class AddIndexToNoteOriginalDiscussionId < ActiveRecord::Migration - include Gitlab::Database::MigrationHelpers - - DOWNTIME = false - - disable_ddl_transaction! - - def up - add_concurrent_index :notes, :original_discussion_id - end - - def down - remove_index :notes, :original_discussion_id if index_exists? :notes, :original_discussion_id - end -end diff --git a/db/schema.rb b/db/schema.rb index 1b23bab5af2..af7dc07d5ba 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -736,7 +736,6 @@ ActiveRecord::Schema.define(version: 20170402231018) do add_index "notes", ["note"], name: "index_notes_on_note_trigram", using: :gin, opclasses: {"note"=>"gin_trgm_ops"} add_index "notes", ["noteable_id", "noteable_type"], name: "index_notes_on_noteable_id_and_noteable_type", using: :btree add_index "notes", ["noteable_type"], name: "index_notes_on_noteable_type", using: :btree - add_index "notes", ["original_discussion_id"], name: "index_notes_on_original_discussion_id", using: :btree add_index "notes", ["project_id", "noteable_type"], name: "index_notes_on_project_id_and_noteable_type", using: :btree add_index "notes", ["updated_at"], name: "index_notes_on_updated_at", using: :btree diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index 0f9056a4914..90c35e2c7f8 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -25,17 +25,11 @@ FactoryGirl.define do end end - factory :discussion_note_on_issue, traits: [:on_issue], class: DiscussionNote do - association :project, :repository - end + factory :discussion_note_on_issue, traits: [:on_issue], class: DiscussionNote - factory :discussion_note_on_commit, traits: [:on_commit], class: DiscussionNote do - association :project, :repository - end + factory :discussion_note_on_commit, traits: [:on_commit], class: DiscussionNote - factory :legacy_diff_note_on_commit, traits: [:on_commit, :legacy_diff_note], class: LegacyDiffNote do - association :project, :repository - end + factory :legacy_diff_note_on_commit, traits: [:on_commit, :legacy_diff_note], class: LegacyDiffNote factory :legacy_diff_note_on_merge_request, traits: [:on_merge_request, :legacy_diff_note], class: LegacyDiffNote do association :project, :repository diff --git a/spec/features/merge_requests/diff_notes_avatars_spec.rb b/spec/features/merge_requests/diff_notes_avatars_spec.rb index 5769769a5ba..218d95a88b8 100644 --- a/spec/features/merge_requests/diff_notes_avatars_spec.rb +++ b/spec/features/merge_requests/diff_notes_avatars_spec.rb @@ -163,9 +163,9 @@ feature 'Diff note avatars', feature: true, js: true do end context 'multiple comments' do - let!(:notes) { create_list(:diff_note_on_merge_request, 3, project: project, noteable: merge_request, in_reply_to: note) } - before do + create_list(:diff_note_on_merge_request, 3, project: project, noteable: merge_request, in_reply_to: note) + visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request, view: view) wait_for_ajax diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index c107e4c4457..e6f0a3b5920 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -647,14 +647,14 @@ describe Notify do shared_examples 'a discussion note email' do |model| it_behaves_like 'it should have Gmail Actions links' - it 'is sent as the author' do + it 'is sent to the given recipient as the author' do sender = subject.header[:from].addrs[0] - expect(sender.display_name).to eq(note_author.name) - expect(sender.address).to eq(gitlab_sender) - end - it 'is sent to the given recipient' do - is_expected.to deliver_to recipient.notification_email + aggregate_failures do + expect(sender.display_name).to eq(note_author.name) + expect(sender.address).to eq(gitlab_sender) + expect(subject).to deliver_to(recipient.notification_email) + end end it 'contains the message from the note' do diff --git a/spec/mailers/previews/notify_preview.rb b/spec/mailers/previews/notify_preview.rb new file mode 100644 index 00000000000..d9463efcb4e --- /dev/null +++ b/spec/mailers/previews/notify_preview.rb @@ -0,0 +1,115 @@ +class NotifyPreview < ActionMailer::Preview + def note_merge_request_email_for_individual_note + note_email(:note_merge_request_email) do + note = <<-MD.strip_heredoc + This is an individual note on a merge request :smiley: + + In this notification email, we expect to see: + + - The note contents (that's what you're looking at) + - A link to view this note on Gitlab + - An explanation for why the user is receiving this notification + MD + + create_note(noteable_type: 'merge_request', noteable_id: merge_request.id, note: note) + end + end + + def note_merge_request_email_for_discussion + note_email(:note_merge_request_email) do + note = <<-MD.strip_heredoc + This is a new discussion on a merge request :smiley: + + In this notification email, we expect to see: + + - A line saying who started this discussion + - The note contents (that's what you're looking at) + - A link to view this discussion on Gitlab + - An explanation for why the user is receiving this notification + MD + + create_note(noteable_type: 'merge_request', noteable_id: merge_request.id, type: 'DiscussionNote', note: note) + end + end + + def note_merge_request_email_for_diff_discussion + note_email(:note_merge_request_email) do + note = <<-MD.strip_heredoc + This is a new discussion on a merge request :smiley: + + In this notification email, we expect to see: + + - A line saying who started this discussion and on what file + - The diff + - The note contents (that's what you're looking at) + - A link to view this discussion on Gitlab + - An explanation for why the user is receiving this notification + MD + + position = Gitlab::Diff::Position.new( + old_path: "files/ruby/popen.rb", + new_path: "files/ruby/popen.rb", + old_line: nil, + new_line: 14, + diff_refs: merge_request.diff_refs + ) + + create_note(noteable_type: 'merge_request', noteable_id: merge_request.id, type: 'DiffNote', position: position, note: note) + end + end + + private + + def project + @project ||= Project.find_by_full_path('gitlab-org/gitlab-test') + end + + def issue + @issue ||= project.issues.last + end + + def merge_request + @merge_request ||= project.merge_requests.find_by(source_branch: 'master', target_branch: 'feature') + end + + def commit + @commit ||= project.commit('570e7b2abdd848b95f2f578043fc23bd6f6fd24d') + end + + def user + @user ||= User.last + end + + def note_body + <<-MD.strip_heredoc + Hello :smiley: + + We expect a blank line between: + - The heading ("Adminstrator started...") + - The diff + MD + end + + def create_note(params) + Notes::CreateService.new(project, user, params).execute + end + + def note_email(method) + cleanup do + note = yield + + Notify.public_send(method, user.id, note) + end + end + + def cleanup + email = nil + + ActiveRecord::Base.transaction do + email = yield + raise ActiveRecord::Rollback + end + + email + end +end diff --git a/spec/models/concerns/discussion_on_diff_spec.rb b/spec/models/concerns/discussion_on_diff_spec.rb new file mode 100644 index 00000000000..0002a00770f --- /dev/null +++ b/spec/models/concerns/discussion_on_diff_spec.rb @@ -0,0 +1,24 @@ +require 'spec_helper' + +describe DiffDiscussion, DiscussionOnDiff, model: true do + subject { create(:diff_note_on_merge_request).to_discussion } + + describe "#truncated_diff_lines" do + let(:truncated_lines) { subject.truncated_diff_lines } + + context "when diff is greater than allowed number of truncated diff lines " do + it "returns fewer lines" do + expect(subject.diff_lines.count).to be > described_class::NUMBER_OF_TRUNCATED_DIFF_LINES + + expect(truncated_lines.count).to be <= described_class::NUMBER_OF_TRUNCATED_DIFF_LINES + end + end + + context "when some diff lines are meta" do + it "returns no meta lines" do + expect(subject.diff_lines).to include(be_meta) + expect(truncated_lines).not_to include(be_meta) + end + end + end +end diff --git a/spec/models/concerns/noteable_spec.rb b/spec/models/concerns/noteable_spec.rb index 0a181c008f3..92cc8859a8c 100644 --- a/spec/models/concerns/noteable_spec.rb +++ b/spec/models/concerns/noteable_spec.rb @@ -1,14 +1,14 @@ require 'spec_helper' describe MergeRequest, Noteable, model: true do - let(:merge_request) { create(:merge_request) } - let(:project) { merge_request.project } - let!(:active_diff_note1) { create(:diff_note_on_merge_request, project: project, noteable: merge_request) } - let!(:active_diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, in_reply_to: active_diff_note1) } - let!(:active_diff_note3) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: active_position2) } - let!(:outdated_diff_note1) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: outdated_position) } - let!(:outdated_diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: outdated_position, in_reply_to: outdated_diff_note1) } - let!(:discussion_note1) { create(:discussion_note_on_merge_request, project: project, noteable: merge_request) } + let!(:active_diff_note1) { create(:diff_note_on_merge_request) } + let(:project) { active_diff_note1.project } + subject { active_diff_note1.noteable } + let!(:active_diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: subject, in_reply_to: active_diff_note1) } + let!(:active_diff_note3) { create(:diff_note_on_merge_request, project: project, noteable: subject, position: active_position2) } + let!(:outdated_diff_note1) { create(:diff_note_on_merge_request, project: project, noteable: subject, position: outdated_position) } + let!(:outdated_diff_note2) { create(:diff_note_on_merge_request, project: project, noteable: subject, in_reply_to: outdated_diff_note1) } + let!(:discussion_note1) { create(:discussion_note_on_merge_request, project: project, noteable: subject) } let!(:discussion_note2) { create(:discussion_note_on_merge_request, in_reply_to: discussion_note1) } let!(:commit_diff_note1) { create(:diff_note_on_commit, project: project) } let!(:commit_diff_note2) { create(:diff_note_on_commit, project: project, in_reply_to: commit_diff_note1) } @@ -17,8 +17,8 @@ describe MergeRequest, Noteable, model: true do let!(:commit_discussion_note1) { create(:discussion_note_on_commit, project: project) } let!(:commit_discussion_note2) { create(:discussion_note_on_commit, in_reply_to: commit_discussion_note1) } let!(:commit_discussion_note3) { create(:discussion_note_on_commit, project: project) } - let!(:note1) { create(:note, project: project, noteable: merge_request) } - let!(:note2) { create(:note, project: project, noteable: merge_request) } + let!(:note1) { create(:note, project: project, noteable: subject) } + let!(:note2) { create(:note, project: project, noteable: subject) } let(:active_position2) do Gitlab::Diff::Position.new( @@ -26,7 +26,7 @@ describe MergeRequest, Noteable, model: true do new_path: "files/ruby/popen.rb", old_line: 16, new_line: 22, - diff_refs: merge_request.diff_refs + diff_refs: subject.diff_refs ) end @@ -41,29 +41,29 @@ describe MergeRequest, Noteable, model: true do end describe '#discussions' do - subject { merge_request.discussions } + let(:discussions) { subject.discussions } it 'includes discussions for diff notes, commit diff notes, commit notes, and regular notes' do - expect(subject).to eq([ - DiffDiscussion.new([active_diff_note1, active_diff_note2], merge_request), - DiffDiscussion.new([active_diff_note3], merge_request), - DiffDiscussion.new([outdated_diff_note1, outdated_diff_note2], merge_request), - SimpleDiscussion.new([discussion_note1, discussion_note2], merge_request), - DiffDiscussion.new([commit_diff_note1, commit_diff_note2], merge_request), - OutOfContextDiscussion.new([commit_note1, commit_note2], merge_request), - SimpleDiscussion.new([commit_discussion_note1, commit_discussion_note2], merge_request), - SimpleDiscussion.new([commit_discussion_note3], merge_request), - IndividualNoteDiscussion.new([note1], merge_request), - IndividualNoteDiscussion.new([note2], merge_request) + expect(discussions).to eq([ + DiffDiscussion.new([active_diff_note1, active_diff_note2], subject), + DiffDiscussion.new([active_diff_note3], subject), + DiffDiscussion.new([outdated_diff_note1, outdated_diff_note2], subject), + Discussion.new([discussion_note1, discussion_note2], subject), + DiffDiscussion.new([commit_diff_note1, commit_diff_note2], subject), + OutOfContextDiscussion.new([commit_note1, commit_note2], subject), + Discussion.new([commit_discussion_note1, commit_discussion_note2], subject), + Discussion.new([commit_discussion_note3], subject), + IndividualNoteDiscussion.new([note1], subject), + IndividualNoteDiscussion.new([note2], subject) ]) end end describe '#grouped_diff_discussions' do - subject { merge_request.grouped_diff_discussions } + let(:grouped_diff_discussions) { subject.grouped_diff_discussions } it "includes active discussions" do - discussions = subject.values.flatten + discussions = grouped_diff_discussions.values.flatten expect(discussions.count).to eq(2) expect(discussions.map(&:id)).to eq([active_diff_note1.discussion_id, active_diff_note3.discussion_id]) @@ -74,12 +74,188 @@ describe MergeRequest, Noteable, model: true do end it "doesn't include outdated discussions" do - expect(subject.values.flatten.map(&:id)).not_to include(outdated_diff_note1.discussion_id) + expect(grouped_diff_discussions.values.flatten.map(&:id)).not_to include(outdated_diff_note1.discussion_id) end it "groups the discussions by line code" do - expect(subject[active_diff_note1.line_code].first.id).to eq(active_diff_note1.discussion_id) - expect(subject[active_diff_note3.line_code].first.id).to eq(active_diff_note3.discussion_id) + expect(grouped_diff_discussions[active_diff_note1.line_code].first.id).to eq(active_diff_note1.discussion_id) + expect(grouped_diff_discussions[active_diff_note3.line_code].first.id).to eq(active_diff_note3.discussion_id) + end + end + + context "discussion status" do + let(:first_discussion) { build_stubbed(:discussion_note_on_merge_request, noteable: subject, project: project).to_discussion } + let(:second_discussion) { build_stubbed(:discussion_note_on_merge_request, noteable: subject, project: project).to_discussion } + let(:third_discussion) { build_stubbed(:discussion_note_on_merge_request, noteable: subject, project: project).to_discussion } + + before do + allow(subject).to receive(:resolvable_discussions).and_return([first_discussion, second_discussion, third_discussion]) + end + + describe "#discussions_resolvable?" do + context "when all discussions are unresolvable" do + before do + allow(first_discussion).to receive(:resolvable?).and_return(false) + allow(second_discussion).to receive(:resolvable?).and_return(false) + allow(third_discussion).to receive(:resolvable?).and_return(false) + end + + it "returns false" do + expect(subject.discussions_resolvable?).to be false + end + end + + context "when some discussions are unresolvable and some discussions are resolvable" do + before do + allow(first_discussion).to receive(:resolvable?).and_return(true) + allow(second_discussion).to receive(:resolvable?).and_return(false) + allow(third_discussion).to receive(:resolvable?).and_return(true) + end + + it "returns true" do + expect(subject.discussions_resolvable?).to be true + end + end + + context "when all discussions are resolvable" do + before do + allow(first_discussion).to receive(:resolvable?).and_return(true) + allow(second_discussion).to receive(:resolvable?).and_return(true) + allow(third_discussion).to receive(:resolvable?).and_return(true) + end + + it "returns true" do + expect(subject.discussions_resolvable?).to be true + end + end + end + + describe "#discussions_resolved?" do + context "when discussions are not resolvable" do + before do + allow(subject).to receive(:discussions_resolvable?).and_return(false) + end + + it "returns false" do + expect(subject.discussions_resolved?).to be false + end + end + + context "when discussions are resolvable" do + before do + allow(subject).to receive(:discussions_resolvable?).and_return(true) + + allow(first_discussion).to receive(:resolvable?).and_return(true) + allow(second_discussion).to receive(:resolvable?).and_return(false) + allow(third_discussion).to receive(:resolvable?).and_return(true) + end + + context "when all resolvable discussions are resolved" do + before do + allow(first_discussion).to receive(:resolved?).and_return(true) + allow(third_discussion).to receive(:resolved?).and_return(true) + end + + it "returns true" do + expect(subject.discussions_resolved?).to be true + end + end + + context "when some resolvable discussions are not resolved" do + before do + allow(first_discussion).to receive(:resolved?).and_return(true) + allow(third_discussion).to receive(:resolved?).and_return(false) + end + + it "returns false" do + expect(subject.discussions_resolved?).to be false + end + end + end + end + + describe "#discussions_to_be_resolved?" do + context "when discussions are not resolvable" do + before do + allow(subject).to receive(:discussions_resolvable?).and_return(false) + end + + it "returns false" do + expect(subject.discussions_to_be_resolved?).to be false + end + end + + context "when discussions are resolvable" do + before do + allow(subject).to receive(:discussions_resolvable?).and_return(true) + + allow(first_discussion).to receive(:resolvable?).and_return(true) + allow(second_discussion).to receive(:resolvable?).and_return(false) + allow(third_discussion).to receive(:resolvable?).and_return(true) + end + + context "when all resolvable discussions are resolved" do + before do + allow(first_discussion).to receive(:resolved?).and_return(true) + allow(third_discussion).to receive(:resolved?).and_return(true) + end + + it "returns false" do + expect(subject.discussions_to_be_resolved?).to be false + end + end + + context "when some resolvable discussions are not resolved" do + before do + allow(first_discussion).to receive(:resolved?).and_return(true) + allow(third_discussion).to receive(:resolved?).and_return(false) + end + + it "returns true" do + expect(subject.discussions_to_be_resolved?).to be true + end + end + end + end + + describe "#discussions_to_be_resolved" do + before do + allow(first_discussion).to receive(:to_be_resolved?).and_return(true) + allow(second_discussion).to receive(:to_be_resolved?).and_return(false) + allow(third_discussion).to receive(:to_be_resolved?).and_return(false) + end + + it 'includes only discussions that need to be resolved' do + expect(subject.discussions_to_be_resolved).to eq([first_discussion]) + end + end + + describe '#discussions_can_be_resolved_by?' do + let(:user) { build(:user) } + + context 'all discussions can be resolved by the user' do + before do + allow(first_discussion).to receive(:can_resolve?).with(user).and_return(true) + allow(second_discussion).to receive(:can_resolve?).with(user).and_return(true) + allow(third_discussion).to receive(:can_resolve?).with(user).and_return(true) + end + + it 'allows a user to resolve the discussions' do + expect(subject.discussions_can_be_resolved_by?(user)).to be(true) + end + end + + context 'one discussion cannot be resolved by the user' do + before do + allow(first_discussion).to receive(:can_resolve?).with(user).and_return(true) + allow(second_discussion).to receive(:can_resolve?).with(user).and_return(true) + allow(third_discussion).to receive(:can_resolve?).with(user).and_return(false) + end + + it 'allows a user to resolve the discussions' do + expect(subject.discussions_can_be_resolved_by?(user)).to be(false) + end + end end end end diff --git a/spec/models/concerns/resolvable_discussion_spec.rb b/spec/models/concerns/resolvable_discussion_spec.rb index 2d2182fbae9..18327fe262d 100644 --- a/spec/models/concerns/resolvable_discussion_spec.rb +++ b/spec/models/concerns/resolvable_discussion_spec.rb @@ -5,8 +5,9 @@ describe Discussion, ResolvableDiscussion, models: true do let(:first_note) { create(:discussion_note_on_merge_request) } let(:merge_request) { first_note.noteable } - let(:second_note) { create(:discussion_note_on_merge_request, in_reply_to: first_note) } - let(:third_note) { create(:discussion_note_on_merge_request) } + let(:project) { first_note.project } + let(:second_note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project, in_reply_to: first_note) } + let(:third_note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) } describe "#resolvable?" do context "when potentially resolvable" do diff --git a/spec/models/concerns/resolvable_note_spec.rb b/spec/models/concerns/resolvable_note_spec.rb index a5a26958410..1503ccdff11 100644 --- a/spec/models/concerns/resolvable_note_spec.rb +++ b/spec/models/concerns/resolvable_note_spec.rb @@ -1,15 +1,17 @@ require 'spec_helper' describe Note, ResolvableNote, models: true do - subject { create(:discussion_note_on_merge_request) } + let(:project) { create(:project) } + let(:merge_request) { create(:merge_request, source_project: project) } + subject { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) } context 'resolvability scopes' do - let!(:note1) { create(:note) } - let!(:note2) { create(:diff_note_on_commit) } - let!(:note3) { create(:diff_note_on_merge_request, :resolved) } - let!(:note4) { create(:discussion_note_on_merge_request) } - let!(:note5) { create(:discussion_note_on_issue) } - let!(:note6) { create(:discussion_note_on_merge_request, :system) } + let!(:note1) { create(:note, project: project) } + let!(:note2) { create(:diff_note_on_commit, project: project) } + let!(:note3) { create(:diff_note_on_merge_request, :resolved, noteable: merge_request, project: project) } + let!(:note4) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) } + let!(:note5) { create(:discussion_note_on_issue, project: project) } + let!(:note6) { create(:discussion_note_on_merge_request, :system, noteable: merge_request, project: project) } describe '.potentially_resolvable' do it 'includes diff and discussion notes on merge requests' do @@ -38,9 +40,9 @@ describe Note, ResolvableNote, models: true do describe ".resolve!" do let(:current_user) { create(:user) } - let!(:commit_note) { create(:diff_note_on_commit) } - let!(:resolved_note) { create(:discussion_note_on_merge_request, :resolved) } - let!(:unresolved_note) { create(:discussion_note_on_merge_request) } + let!(:commit_note) { create(:diff_note_on_commit, project: project) } + let!(:resolved_note) { create(:discussion_note_on_merge_request, :resolved, noteable: merge_request, project: project) } + let!(:unresolved_note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) } before do described_class.resolve!(current_user) @@ -59,7 +61,7 @@ describe Note, ResolvableNote, models: true do end describe ".unresolve!" do - let!(:resolved_note) { create(:discussion_note_on_merge_request, :resolved) } + let!(:resolved_note) { create(:discussion_note_on_merge_request, :resolved, noteable: merge_request, project: project) } before do described_class.unresolve! diff --git a/spec/models/diff_discussion_spec.rb b/spec/models/diff_discussion_spec.rb index ba7dd5280bd..48e7c0a822c 100644 --- a/spec/models/diff_discussion_spec.rb +++ b/spec/models/diff_discussion_spec.rb @@ -4,8 +4,10 @@ describe DiffDiscussion, model: true do subject { described_class.new([first_note, second_note, third_note]) } let(:first_note) { create(:diff_note_on_merge_request) } - let(:second_note) { create(:diff_note_on_merge_request, in_reply_to: first_note) } - let(:third_note) { create(:diff_note_on_merge_request, in_reply_to: first_note) } + let(:merge_request) { first_note.noteable } + let(:project) { first_note.project } + let(:second_note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project, in_reply_to: first_note) } + let(:third_note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project, in_reply_to: first_note) } describe '#reply_attributes' do it 'includes position and original_position' do @@ -14,23 +16,4 @@ describe DiffDiscussion, model: true do expect(attributes[:original_position]).to eq(first_note.original_position.to_json) end end - - describe "#truncated_diff_lines" do - let(:truncated_lines) { subject.truncated_diff_lines } - - context "when diff is greater than allowed number of truncated diff lines " do - it "returns fewer lines" do - expect(subject.diff_lines.count).to be > described_class::NUMBER_OF_TRUNCATED_DIFF_LINES - - expect(truncated_lines.count).to be <= described_class::NUMBER_OF_TRUNCATED_DIFF_LINES - end - end - - context "when some diff lines are meta" do - it "returns no meta lines" do - expect(subject.diff_lines).to include(be_meta) - expect(truncated_lines).not_to include(be_meta) - end - end - end end diff --git a/spec/models/discussion_note_spec.rb b/spec/models/discussion_note_spec.rb deleted file mode 100644 index c9dd3d45270..00000000000 --- a/spec/models/discussion_note_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'spec_helper' - -describe DiscussionNote, models: true do -end diff --git a/spec/models/discussion_spec.rb b/spec/models/discussion_spec.rb index 718b208e8f8..0221e23ced8 100644 --- a/spec/models/discussion_spec.rb +++ b/spec/models/discussion_spec.rb @@ -3,15 +3,15 @@ require 'spec_helper' describe Discussion, model: true do subject { described_class.new([first_note, second_note, third_note]) } - let(:first_note) { create(:discussion_note_on_merge_request) } + let(:first_note) { create(:diff_note_on_merge_request) } let(:merge_request) { first_note.noteable } - let(:second_note) { create(:discussion_note_on_merge_request, in_reply_to: first_note) } - let(:third_note) { create(:discussion_note_on_merge_request) } + let(:second_note) { create(:diff_note_on_merge_request, in_reply_to: first_note) } + let(:third_note) { create(:diff_note_on_merge_request) } describe '.build' do it 'returns a discussion of the right type' do discussion = described_class.build([first_note, second_note], merge_request) - expect(discussion).to be_a(SimpleDiscussion) + expect(discussion).to be_a(DiffDiscussion) expect(discussion.notes.count).to be(2) expect(discussion.first_note).to be(first_note) expect(discussion.noteable).to be(merge_request) @@ -22,8 +22,8 @@ describe Discussion, model: true do it 'returns an array of discussions of the right type' do discussions = described_class.build_collection([first_note, second_note, third_note], merge_request) expect(discussions).to eq([ - SimpleDiscussion.new([first_note, second_note], merge_request), - SimpleDiscussion.new([third_note], merge_request) + DiffDiscussion.new([first_note, second_note], merge_request), + DiffDiscussion.new([third_note], merge_request) ]) end end diff --git a/spec/models/individual_note_discussion_spec.rb b/spec/models/individual_note_discussion_spec.rb deleted file mode 100644 index 1f7c2c820e0..00000000000 --- a/spec/models/individual_note_discussion_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'spec_helper' - -describe IndividualNoteDiscussion, models: true do -end diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 5d0862abb92..b615d956686 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1224,182 +1224,6 @@ describe MergeRequest, models: true do end end - context "discussion status" do - let(:first_discussion) { create(:discussion_note_on_merge_request).to_discussion } - let(:second_discussion) { create(:discussion_note_on_merge_request).to_discussion } - let(:third_discussion) { create(:discussion_note_on_merge_request).to_discussion } - - before do - allow(subject).to receive(:resolvable_discussions).and_return([first_discussion, second_discussion, third_discussion]) - end - - describe "#discussions_resolvable?" do - context "when all discussions are unresolvable" do - before do - allow(first_discussion).to receive(:resolvable?).and_return(false) - allow(second_discussion).to receive(:resolvable?).and_return(false) - allow(third_discussion).to receive(:resolvable?).and_return(false) - end - - it "returns false" do - expect(subject.discussions_resolvable?).to be false - end - end - - context "when some discussions are unresolvable and some discussions are resolvable" do - before do - allow(first_discussion).to receive(:resolvable?).and_return(true) - allow(second_discussion).to receive(:resolvable?).and_return(false) - allow(third_discussion).to receive(:resolvable?).and_return(true) - end - - it "returns true" do - expect(subject.discussions_resolvable?).to be true - end - end - - context "when all discussions are resolvable" do - before do - allow(first_discussion).to receive(:resolvable?).and_return(true) - allow(second_discussion).to receive(:resolvable?).and_return(true) - allow(third_discussion).to receive(:resolvable?).and_return(true) - end - - it "returns true" do - expect(subject.discussions_resolvable?).to be true - end - end - end - - describe "#discussions_resolved?" do - context "when discussions are not resolvable" do - before do - allow(subject).to receive(:discussions_resolvable?).and_return(false) - end - - it "returns false" do - expect(subject.discussions_resolved?).to be false - end - end - - context "when discussions are resolvable" do - before do - allow(subject).to receive(:discussions_resolvable?).and_return(true) - - allow(first_discussion).to receive(:resolvable?).and_return(true) - allow(second_discussion).to receive(:resolvable?).and_return(false) - allow(third_discussion).to receive(:resolvable?).and_return(true) - end - - context "when all resolvable discussions are resolved" do - before do - allow(first_discussion).to receive(:resolved?).and_return(true) - allow(third_discussion).to receive(:resolved?).and_return(true) - end - - it "returns true" do - expect(subject.discussions_resolved?).to be true - end - end - - context "when some resolvable discussions are not resolved" do - before do - allow(first_discussion).to receive(:resolved?).and_return(true) - allow(third_discussion).to receive(:resolved?).and_return(false) - end - - it "returns false" do - expect(subject.discussions_resolved?).to be false - end - end - end - end - - describe "#discussions_to_be_resolved?" do - context "when discussions are not resolvable" do - before do - allow(subject).to receive(:discussions_resolvable?).and_return(false) - end - - it "returns false" do - expect(subject.discussions_to_be_resolved?).to be false - end - end - - context "when discussions are resolvable" do - before do - allow(subject).to receive(:discussions_resolvable?).and_return(true) - - allow(first_discussion).to receive(:resolvable?).and_return(true) - allow(second_discussion).to receive(:resolvable?).and_return(false) - allow(third_discussion).to receive(:resolvable?).and_return(true) - end - - context "when all resolvable discussions are resolved" do - before do - allow(first_discussion).to receive(:resolved?).and_return(true) - allow(third_discussion).to receive(:resolved?).and_return(true) - end - - it "returns false" do - expect(subject.discussions_to_be_resolved?).to be false - end - end - - context "when some resolvable discussions are not resolved" do - before do - allow(first_discussion).to receive(:resolved?).and_return(true) - allow(third_discussion).to receive(:resolved?).and_return(false) - end - - it "returns true" do - expect(subject.discussions_to_be_resolved?).to be true - end - end - end - end - - describe "#discussions_to_be_resolved" do - before do - allow(first_discussion).to receive(:to_be_resolved?).and_return(true) - allow(second_discussion).to receive(:to_be_resolved?).and_return(false) - allow(third_discussion).to receive(:to_be_resolved?).and_return(false) - end - - it 'includes only discussions that need to be resolved' do - expect(subject.discussions_to_be_resolved).to eq([first_discussion]) - end - end - - describe '#discussions_can_be_resolved_by?' do - let(:user) { build(:user) } - - context 'all discussions can be resolved by the user' do - before do - allow(first_discussion).to receive(:can_resolve?).with(user).and_return(true) - allow(second_discussion).to receive(:can_resolve?).with(user).and_return(true) - allow(third_discussion).to receive(:can_resolve?).with(user).and_return(true) - end - - it 'allows a user to resolve the discussions' do - expect(subject.discussions_can_be_resolved_by?(user)).to be(true) - end - end - - context 'one discussion cannot be resolved by the user' do - before do - allow(first_discussion).to receive(:can_resolve?).with(user).and_return(true) - allow(second_discussion).to receive(:can_resolve?).with(user).and_return(true) - allow(third_discussion).to receive(:can_resolve?).with(user).and_return(false) - end - - it 'allows a user to resolve the discussions' do - expect(subject.discussions_can_be_resolved_by?(user)).to be(false) - end - end - end - end - describe '#conflicts_can_be_resolved_in_ui?' do def create_merge_request(source_branch) create(:merge_request, source_branch: source_branch, target_branch: 'conflict-start') do |mr| diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 2c7f6e59b19..3c4bf3f4ddb 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -250,7 +250,7 @@ describe Note, models: true do let!(:note2) { create(:discussion_note_on_merge_request, in_reply_to: note) } let(:merge_request) { note.noteable } - it 'returns a discussion with multiple note' do + it 'returns a discussion with multiple notes' do discussion = merge_request.notes.find_discussion(note.discussion_id) expect(discussion).not_to be_nil @@ -379,57 +379,57 @@ describe Note, models: true do describe '#can_be_discussion_note?' do context 'for a note on a merge request' do - let(:note) { build(:note_on_merge_request) } - it 'returns true' do + note = build(:note_on_merge_request) + expect(note.can_be_discussion_note?).to be_truthy end end context 'for a note on an issue' do - let(:note) { build(:note_on_issue) } - it 'returns true' do + note = build(:note_on_issue) + expect(note.can_be_discussion_note?).to be_truthy end end context 'for a note on a commit' do - let(:note) { build(:note_on_commit) } - it 'returns true' do + note = build(:note_on_commit) + expect(note.can_be_discussion_note?).to be_truthy end end context 'for a note on a snippet' do - let(:note) { build(:note_on_project_snippet) } - it 'returns true' do + note = build(:note_on_project_snippet) + expect(note.can_be_discussion_note?).to be_truthy end end context 'for a diff note on merge request' do - let(:note) { build(:diff_note_on_merge_request) } - it 'returns false' do + note = build(:diff_note_on_merge_request) + expect(note.can_be_discussion_note?).to be_falsey end end context 'for a diff note on commit' do - let(:note) { build(:diff_note_on_commit) } - it 'returns false' do + note = build(:diff_note_on_commit) + expect(note.can_be_discussion_note?).to be_falsey end end context 'for a discussion note' do - let(:note) { build(:discussion_note_on_merge_request) } - it 'returns false' do + note = build(:discussion_note_on_merge_request) + expect(note.can_be_discussion_note?).to be_falsey end end diff --git a/spec/models/out_of_context_discussion_spec.rb b/spec/models/out_of_context_discussion_spec.rb deleted file mode 100644 index 1bcd118855e..00000000000 --- a/spec/models/out_of_context_discussion_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'spec_helper' - -describe OutOfContextDiscussion, model: true do -end diff --git a/spec/models/simple_discussion_spec.rb b/spec/models/simple_discussion_spec.rb deleted file mode 100644 index 1a342fbc740..00000000000 --- a/spec/models/simple_discussion_spec.rb +++ /dev/null @@ -1,11 +0,0 @@ -require 'spec_helper' - -describe SimpleDiscussion, model: true do - subject { create(:discussion_note_on_issue).to_discussion } - - describe '#reply_attributes' do - it 'includes discussion_id' do - expect(subject.reply_attributes[:discussion_id]).to eq(subject.id) - end - end -end From 63c7801e459d7a7c3ca5a1222496b8cc188d9258 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 4 Apr 2017 17:41:04 -0500 Subject: [PATCH 23/70] Remove and ignore notes.original_discussion_id column --- app/models/concerns/ignorable_column.rb | 28 +++++++++++++++++++ app/models/note.rb | 3 ++ ...532_remove_notes_original_discussion_id.rb | 23 +++++++++++++++ db/schema.rb | 3 +- 4 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 app/models/concerns/ignorable_column.rb create mode 100644 db/post_migrate/20170404170532_remove_notes_original_discussion_id.rb diff --git a/app/models/concerns/ignorable_column.rb b/app/models/concerns/ignorable_column.rb new file mode 100644 index 00000000000..eb9f3423e48 --- /dev/null +++ b/app/models/concerns/ignorable_column.rb @@ -0,0 +1,28 @@ +# Module that can be included into a model to make it easier to ignore database +# columns. +# +# Example: +# +# class User < ActiveRecord::Base +# include IgnorableColumn +# +# ignore_column :updated_at +# end +# +module IgnorableColumn + extend ActiveSupport::Concern + + module ClassMethods + def columns + super.reject { |column| ignored_columns.include?(column.name) } + end + + def ignored_columns + @ignored_columns ||= Set.new + end + + def ignore_column(name) + ignored_columns << name.to_s + end + end +end diff --git a/app/models/note.rb b/app/models/note.rb index 6cb9e84ce26..49ba4ad3f2e 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -9,6 +9,9 @@ class Note < ActiveRecord::Base include CacheMarkdownField include AfterCommitQueue include ResolvableNote + include IgnorableColumn + + ignore_column :original_discussion_id cache_markdown_field :note, pipeline: :note diff --git a/db/post_migrate/20170404170532_remove_notes_original_discussion_id.rb b/db/post_migrate/20170404170532_remove_notes_original_discussion_id.rb new file mode 100644 index 00000000000..0c3b3bd5eb3 --- /dev/null +++ b/db/post_migrate/20170404170532_remove_notes_original_discussion_id.rb @@ -0,0 +1,23 @@ +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class RemoveNotesOriginalDiscussionId < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + # When using the methods "add_concurrent_index" or "add_column_with_default" + # you must disable the use of transactions as these methods can not run in an + # existing transaction. When using "add_concurrent_index" make sure that this + # method is the _only_ method called in the migration, any other changes + # should go in a separate migration. This ensures that upon failure _only_ the + # index creation fails and can be retried or reverted easily. + # + # To disable transactions uncomment the following line and remove these + # comments: + # disable_ddl_transaction! + + def change + remove_column :notes, :original_discussion_id, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index af7dc07d5ba..ce65ddaccc9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170402231018) do +ActiveRecord::Schema.define(version: 20170404170532) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -724,7 +724,6 @@ ActiveRecord::Schema.define(version: 20170402231018) do t.datetime "resolved_at" t.integer "resolved_by_id" t.string "discussion_id" - t.string "original_discussion_id" t.text "note_html" end From 3ff708f723a8c3c911c5a19e6239ded1cf2b0bce Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 4 Apr 2017 17:49:00 -0500 Subject: [PATCH 24/70] Remove unused code --- spec/mailers/previews/notify_preview.rb | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/spec/mailers/previews/notify_preview.rb b/spec/mailers/previews/notify_preview.rb index d9463efcb4e..7bdd88a468b 100644 --- a/spec/mailers/previews/notify_preview.rb +++ b/spec/mailers/previews/notify_preview.rb @@ -64,32 +64,14 @@ class NotifyPreview < ActionMailer::Preview @project ||= Project.find_by_full_path('gitlab-org/gitlab-test') end - def issue - @issue ||= project.issues.last - end - def merge_request @merge_request ||= project.merge_requests.find_by(source_branch: 'master', target_branch: 'feature') end - def commit - @commit ||= project.commit('570e7b2abdd848b95f2f578043fc23bd6f6fd24d') - end - def user @user ||= User.last end - def note_body - <<-MD.strip_heredoc - Hello :smiley: - - We expect a blank line between: - - The heading ("Adminstrator started...") - - The diff - MD - end - def create_note(params) Notes::CreateService.new(project, user, params).execute end From 077a1571677fdf29cb4ed418b15b816bab311372 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 4 Apr 2017 18:20:08 -0500 Subject: [PATCH 25/70] Add line breaks in long comments --- app/models/discussion.rb | 6 ++++-- app/models/out_of_context_discussion.rb | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/models/discussion.rb b/app/models/discussion.rb index 22130b8a508..8268a140403 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -37,15 +37,17 @@ class Discussion [:discussion, note.noteable_type.try(:underscore), noteable_id] end - # To turn a list of notes into a list of discussions, they are grouped by discussion ID. # When notes on a commit are displayed in context of a merge request that contains that commit, # these notes are to be displayed as if they were part of one discussion, even though they were actually # individual notes on the commit with different discussion IDs, so that it's clear that these are not # notes on the merge request itself. - # To get these out-of-context notes to end up in the same discussion, we need to get them to return the same + # + # To turn a list of notes into a list of discussions, they are grouped by discussion ID, so to + # get these out-of-context notes to end up in the same discussion, we need to get them to return the same # `discussion_id` when this grouping happens. To enable this, `Note#discussion_id` calls out # to the `override_discussion_id` method on the appropriate `Discussion` subclass, as determined by # the `discussion_class` method on `Note` or a subclass of `Note`. + # # If no override is necessary, return `nil`. # For the case described above, see `OutOfContextDiscussion.override_discussion_id`. def self.override_discussion_id(note) diff --git a/app/models/out_of_context_discussion.rb b/app/models/out_of_context_discussion.rb index 62b62ea726c..31c6d5cff8b 100644 --- a/app/models/out_of_context_discussion.rb +++ b/app/models/out_of_context_discussion.rb @@ -1,5 +1,6 @@ -# When notes on a commit are displayed in the context of a merge request that contains that commit, -# they are displayed as if they were a discussion. +# When notes on a commit are displayed in the context of a merge request that +# contains that commit, they are displayed as if they were a discussion. +# # This represents one of those discussions, consisting of `Note` notes. class OutOfContextDiscussion < Discussion # Returns an array of discussion ID components From 2b92f91038ad24a2ff3a6607f826cd8e518d8aa2 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Wed, 5 Apr 2017 14:17:12 +0100 Subject: [PATCH 26/70] Added droplab to yarn.lock and package.json --- package.json | 1 + yarn.lock | 167 ++++++++++++++++++++++++++------------------------- 2 files changed, 87 insertions(+), 81 deletions(-) diff --git a/package.json b/package.json index 3f64d65d57a..c623ca627b5 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js" }, "dependencies": { + "@gitlab-org/droplab": "^0.1.0", "babel-core": "^6.22.1", "babel-loader": "^6.2.10", "babel-plugin-transform-define": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index 4faec0e57d6..96584a6d111 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,12 @@ # yarn lockfile v1 +"@gitlab-org/droplab@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@gitlab-org/droplab/-/droplab-0.1.0.tgz#934889d0f19417198e277415fdd336616b2e2c87" + dependencies: + custom-event-polyfill "^0.3.0" + abbrev@1, abbrev@1.0.x: version "1.0.9" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" @@ -25,10 +31,6 @@ acorn-jsx@^3.0.0: dependencies: acorn "^3.0.4" -acorn@4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a" - acorn@^3.0.4: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" @@ -37,6 +39,10 @@ acorn@^4.0.11, acorn@^4.0.3, acorn@^4.0.4: version "4.0.11" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0" +acorn@^5.0.1: + version "5.0.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d" + after@0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" @@ -188,13 +194,13 @@ async@0.2.x: version "0.2.10" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" -async@1.x, async@^1.4.0, async@^1.4.2, async@^1.5.2: +async@1.x, async@^1.4.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" async@^2.1.2, async@^2.1.4: - version "2.2.0" - resolved "https://registry.yarnpkg.com/async/-/async-2.2.0.tgz#c324eba010a237e4fbd55a12dee86367d5c0ef32" + version "2.3.0" + resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9" dependencies: lodash "^4.14.0" @@ -947,8 +953,8 @@ browserify-rsa@^4.0.0: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.0.tgz#10773910c3c206d5420a46aad8694f820b85968f" + version "4.0.4" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298" dependencies: bn.js "^4.1.1" browserify-rsa "^4.0.0" @@ -1234,8 +1240,8 @@ content-type@~1.0.2: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed" convert-source-map@^1.1.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.4.0.tgz#e3dad195bf61bfe13a7a3c73e9876ec14a0268f3" + version "1.5.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5" cookie-signature@1.0.6: version "1.0.6" @@ -1465,11 +1471,6 @@ domain-browser@^1.1.1: version "1.1.7" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" -"droplab@file:../../../DropLab": - version "0.1.1" - dependencies: - custom-event-polyfill "^0.3.0" - dropzone@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-4.3.0.tgz#48b0b8f2ad092872e4b535b672a7c3f1a1d67c91" @@ -1739,8 +1740,8 @@ eslint-plugin-jasmine@^2.1.0: resolved "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.2.0.tgz#7135879383c39a667c721d302b9f20f0389543de" eslint@^3.10.1: - version "3.18.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.18.0.tgz#647e985c4ae71502d20ac62c109f66d5104c8a4b" + version "3.19.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc" dependencies: babel-code-frame "^6.16.0" chalk "^1.1.3" @@ -1779,10 +1780,10 @@ eslint@^3.10.1: user-home "^2.0.0" espree@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.0.tgz#41656fa5628e042878025ef467e78f125cb86e1d" + version "3.4.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2" dependencies: - acorn "4.0.4" + acorn "^5.0.1" acorn-jsx "^3.0.0" esprima@2.7.x, esprima@^2.7.1: @@ -2468,8 +2469,8 @@ inquirer@^0.12.0: through "^2.3.6" interpret@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c" + version "1.0.2" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.2.tgz#f4f623f0bb7122f15f5717c8e254b8161b5c5b2d" invariant@^2.2.0: version "2.2.2" @@ -2670,66 +2671,64 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" istanbul-api@^1.1.1: - version "1.1.6" - resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.6.tgz#23aa5b5b9b1b3bdbb786f039160e91acbe495433" + version "1.1.7" + resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.7.tgz#f6f37f09f8002b130f891c646b70ee4a8e7345ae" dependencies: async "^2.1.4" fileset "^2.0.2" - istanbul-lib-coverage "^1.0.0" - istanbul-lib-hook "^1.0.4" - istanbul-lib-instrument "^1.6.2" - istanbul-lib-report "^1.0.0-alpha.3" - istanbul-lib-source-maps "^1.1.0" - istanbul-reports "^1.0.0" + istanbul-lib-coverage "^1.0.2" + istanbul-lib-hook "^1.0.5" + istanbul-lib-instrument "^1.7.0" + istanbul-lib-report "^1.0.0" + istanbul-lib-source-maps "^1.1.1" + istanbul-reports "^1.0.2" js-yaml "^3.7.0" mkdirp "^0.5.1" once "^1.4.0" -istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.0-alpha, istanbul-lib-coverage@^1.0.0-alpha.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.1.tgz#f263efb519c051c5f1f3343034fc40e7b43ff212" +istanbul-lib-coverage@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz#87a0c015b6910651cb3b184814dfb339337e25e1" -istanbul-lib-hook@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.4.tgz#1919debbc195807880041971caf9c7e2be2144d6" +istanbul-lib-hook@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.5.tgz#6ca3d16d60c5f4082da39f7c5cd38ea8a772b88e" dependencies: append-transform "^0.4.0" -istanbul-lib-instrument@^1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.6.2.tgz#dac644f358f51efd6113536d7070959a0111f73b" +istanbul-lib-instrument@^1.6.2, istanbul-lib-instrument@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.0.tgz#b8e0dc25709bb44e17336ab47b7bb5c97c23f659" dependencies: babel-generator "^6.18.0" babel-template "^6.16.0" babel-traverse "^6.18.0" babel-types "^6.18.0" babylon "^6.13.0" - istanbul-lib-coverage "^1.0.0" + istanbul-lib-coverage "^1.0.2" semver "^5.3.0" -istanbul-lib-report@^1.0.0-alpha.3: - version "1.0.0-alpha.3" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0-alpha.3.tgz#32d5f6ec7f33ca3a602209e278b2e6ff143498af" +istanbul-lib-report@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0.tgz#d83dac7f26566b521585569367fe84ccfc7aaecb" dependencies: - async "^1.4.2" - istanbul-lib-coverage "^1.0.0-alpha" + istanbul-lib-coverage "^1.0.2" mkdirp "^0.5.1" path-parse "^1.0.5" - rimraf "^2.4.3" supports-color "^3.1.2" -istanbul-lib-source-maps@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.0.tgz#9d429218f35b823560ea300a96ff0c3bbdab785f" +istanbul-lib-source-maps@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.1.tgz#f8c8c2e8f2160d1d91526d97e5bd63b2079af71c" dependencies: - istanbul-lib-coverage "^1.0.0-alpha.0" + istanbul-lib-coverage "^1.0.2" mkdirp "^0.5.1" rimraf "^2.4.4" source-map "^0.5.3" -istanbul-reports@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.1.tgz#9a17176bc4a6cbebdae52b2f15961d52fa623fbc" +istanbul-reports@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.2.tgz#4e8366abe6fa746cc1cd6633f108de12cc6ac6fa" dependencies: handlebars "^4.0.3" @@ -2777,16 +2776,16 @@ jquery@>=1.8.0, jquery@^2.2.1: resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02" js-cookie@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.1.3.tgz#48071625217ac9ecfab8c343a13d42ec09ff0526" + version "2.1.4" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.1.4.tgz#da4ec503866f149d164cf25f579ef31015025d8d" js-tokens@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7" js-yaml@3.x, js-yaml@^3.5.1, js-yaml@^3.7.0: - version "3.8.2" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721" + version "3.8.3" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766" dependencies: argparse "^1.0.7" esprima "^3.1.1" @@ -3158,7 +3157,7 @@ miller-rabin@^4.0.0: version "1.27.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1" -mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7: +mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7: version "2.1.15" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed" dependencies: @@ -3207,8 +3206,8 @@ moment@2.x: resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f" mousetrap@^1.4.6: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.0.tgz#0168fcabb11d07669e87490324c981208121ac4d" + version "1.6.1" + resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.1.tgz#2a085f5c751294c75e7e81f6ec2545b29cbf42d9" ms@0.7.1: version "0.7.1" @@ -3336,8 +3335,10 @@ normalize-package-data@^2.3.2: validate-npm-package-license "^3.0.1" normalize-path@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a" + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + dependencies: + remove-trailing-separator "^1.0.1" npmlog@^4.0.2: version "4.0.2" @@ -3749,8 +3750,8 @@ raw-loader@^0.5.1: resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" rc@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.7.tgz#c5ea564bb07aff9fd3a5b32e906c1d3a65940fea" + version "1.2.1" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95" dependencies: deep-extend "~0.4.0" ini "~1.3.0" @@ -3772,7 +3773,7 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.0, readable-stream@^2.1.4, readable-stream@^2.2.2: +"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6: version "2.2.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816" dependencies: @@ -3868,6 +3869,10 @@ regjsparser@^0.1.4: dependencies: jsesc "~0.5.0" +remove-trailing-separator@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4" + repeat-element@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" @@ -3990,7 +3995,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.6.0, rimraf@^2.6.1: +rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.6.0, rimraf@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" dependencies: @@ -4288,12 +4293,12 @@ stream-browserify@^2.0.1: readable-stream "^2.0.2" stream-http@^2.3.1: - version "2.6.3" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.6.3.tgz#4c3ddbf9635968ea2cfd4e48d43de5def2625ac3" + version "2.7.0" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6" dependencies: builtin-status-codes "^3.0.0" inherits "^2.0.1" - readable-stream "^2.1.0" + readable-stream "^2.2.6" to-arraybuffer "^1.0.0" xtend "^4.0.0" @@ -4489,19 +4494,19 @@ type-check@~0.3.2: prelude-ls "~1.1.2" type-is@~1.6.14: - version "1.6.14" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.14.tgz#e219639c17ded1ca0789092dd54a03826b817cb2" + version "1.6.15" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410" dependencies: media-typer "0.3.0" - mime-types "~2.1.13" + mime-types "~2.1.15" typedarray@^0.0.6, typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" uglify-js@^2.6, uglify-js@^2.8.5: - version "2.8.16" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.16.tgz#d286190b6eefc6fd65eb0ecac6551e0b0e8839a4" + version "2.8.21" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.21.tgz#1733f669ae6f82fc90c7b25ec0f5c783ee375314" dependencies: source-map "~0.5.1" yargs "~3.10.0" @@ -4560,8 +4565,8 @@ user-home@^2.0.0: os-homedir "^1.0.0" useragent@^2.1.12: - version "2.1.12" - resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.12.tgz#aa7da6cdc48bdc37ba86790871a7321d64edbaa2" + version "2.1.13" + resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.13.tgz#bba43e8aa24d5ceb83c2937473e102e21df74c10" dependencies: lru-cache "2.2.x" tmp "0.0.x" @@ -4624,8 +4629,8 @@ vue-resource@^0.9.3: resolved "https://registry.yarnpkg.com/vue-resource/-/vue-resource-0.9.3.tgz#ab46e1c44ea219142dcc28ae4043b3b04c80959d" vue@^2.2.4: - version "2.2.5" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.5.tgz#528eba68447d7eff99f86767b31176aa656c6963" + version "2.2.6" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.6.tgz#451714b394dd6d4eae7b773c40c2034a59621aed" watchpack@^1.3.1: version "1.3.1" @@ -4702,8 +4707,8 @@ webpack-sources@^0.2.3: source-map "~0.5.3" webpack@^2.2.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.2.tgz#7d521e6f0777a3a58985c69425263fdfe977b458" + version "2.3.3" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.3.tgz#eecc083c18fb7bf958ea4f40b57a6640c5a0cc78" dependencies: acorn "^4.0.4" acorn-dynamic-import "^2.0.0" From 5e3fa0255341fea8d0842453ff034c3bf5f00ba2 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Wed, 5 Apr 2017 16:58:01 +0100 Subject: [PATCH 27/70] Added resolvable discussion frontend --- app/assets/javascripts/comment_type_toggle.js | 32 ++++++++ app/assets/javascripts/gl_form.js | 16 ++++ app/assets/javascripts/notes.js | 2 +- app/assets/stylesheets/pages/note_form.scss | 55 +++++++++++++ app/views/projects/notes/_form.html.haml | 21 ++++- .../shared/_comment_type_toggle.html.haml | 0 spec/javascripts/comment_type_toggle_spec.js | 79 +++++++++++++++++++ 7 files changed, 200 insertions(+), 5 deletions(-) create mode 100644 app/assets/javascripts/comment_type_toggle.js create mode 100644 app/views/shared/_comment_type_toggle.html.haml create mode 100644 spec/javascripts/comment_type_toggle_spec.js diff --git a/app/assets/javascripts/comment_type_toggle.js b/app/assets/javascripts/comment_type_toggle.js new file mode 100644 index 00000000000..75b6f60cabb --- /dev/null +++ b/app/assets/javascripts/comment_type_toggle.js @@ -0,0 +1,32 @@ +import DropLab from '@gitlab-org/droplab'; +import InputSetter from '@gitlab-org/droplab/dist/plugins/InputSetter'; + +class CommentTypeToggle { + constructor(trigger, list, input, button, secondaryButton) { + this.trigger = trigger; + this.list = list; + this.input = input; + this.button = button; + this.secondaryButton = secondaryButton; + } + + initDroplab() { + this.droplab = new DropLab(); + this.droplab.init(this.trigger, this.list, [InputSetter], { + InputSetter: [{ + input: this.input, + valueAttribute: 'data-value', + }, + { + input: this.button, + valueAttribute: 'data-button-text', + }, + { + input: this.secondaryButton, + valueAttribute: 'data-secondary-button-text', + }], + }); + } +} + +export default CommentTypeToggle; diff --git a/app/assets/javascripts/gl_form.js b/app/assets/javascripts/gl_form.js index e7c98e16581..06072faa472 100644 --- a/app/assets/javascripts/gl_form.js +++ b/app/assets/javascripts/gl_form.js @@ -3,6 +3,8 @@ /* global DropzoneInput */ /* global autosize */ +import CommentTypeToggle from './comment_type_toggle'; + window.gl = window.gl || {}; function GLForm(form) { @@ -41,6 +43,20 @@ GLForm.prototype.setupForm = function() { this.form.find('.js-note-discard').hide(); this.form.show(); if (this.isAutosizeable) this.setupAutosize(); + + this.initCommentTypeToggle(); +}; + +GLForm.prototype.initCommentTypeToggle = function () { + this.commentTypeToggle = new CommentTypeToggle( + this.form[0].querySelector('.js-comment-type-dropdown .dropdown-toggle'), + this.form[0].querySelector('.js-comment-type-dropdown .dropdown-menu'), + document.getElementById('note_type'), + this.form[0].querySelector('.js-comment-type-dropdown .js-comment-submit-button'), + document.querySelector('.js-note-target-close'), + ); + + this.commentTypeToggle.initDroplab(); }; GLForm.prototype.setupAutosize = function () { diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 63a5d25a1dc..33749d6ed9e 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -452,7 +452,7 @@ require('./task_list'); form.addClass("js-main-target-form"); form.find("#note_line_code").remove(); form.find("#note_position").remove(); - form.find("#note_type").remove(); + form.find("#note_type").val(''); form.find("#in_reply_to_discussion_id").remove(); form.find('.js-comment-resolve-button').closest('comment-and-resolve-btn').remove(); return this.parentTimeline = form.parents('.timeline'); diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 927bf9805ce..8bc988b40cb 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -310,3 +310,58 @@ margin-bottom: 10px; } } + +.comment-type-dropdown { + .dropdown-toggle .fa { + color: $white-light; + padding-right: 2px; + margin-top: 2px; + pointer-events: none; + } + + .dropdown-menu { + top: initial; + bottom: 40px; + width: 297px; + } + + .description { + display: inline-block; + white-space: normal; + margin-left: 8px; + padding-right: 33px; + } + + li { + white-space: nowrap; + border-radius: 0; + cursor: pointer; + padding-top: 6px; + + &:hover, + &:focus { + background-color: $dropdown-hover-color; + color: $white-light; + } + + &.droplab-item-selected i { + visibility: visible; + } + + i { + visibility: hidden; + } + } + + i { + display: inline-block; + vertical-align: top; + padding-top: 2px; + } + + .divider { + margin: 0 8px; + padding: 0; + border-top: $gray-darkest; + } +} diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index 80db16ea578..58960670085 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -28,10 +28,23 @@ .error-alert .note-form-actions.clearfix - = f.submit 'Comment', class: "btn btn-nr btn-create append-right-10 comment-btn js-comment-button" - - - if @note.can_be_discussion_note? - = submit_tag 'Start discussion', name: 'new_discussion', class: "btn btn-nr append-right-10 btn-inverted js-note-new-discussion" + .btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown + = f.submit 'Comment', class: "btn btn-nr btn-create comment-btn js-comment-button js-comment-submit-button" + - if @note.can_be_discussion_note? + = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-comment-button js-note-new-discussion', data: { 'dropdown-trigger' => '#resolvable-comment-menu' } do + = icon('caret-down') + %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } } + %li#comment{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => 'Comment & close merge request' }, class: 'droplab-item-selected' } + = icon('check') + .description + %strong Comment + %p Add a general comment to this merge request. + %li.divider + %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => 'Start discussion & close merge request' } } + = icon('check') + .description + %strong Start discussion + %p Discuss a specific suggestion or question that needs to be resolved. = yield(:note_actions) diff --git a/app/views/shared/_comment_type_toggle.html.haml b/app/views/shared/_comment_type_toggle.html.haml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/spec/javascripts/comment_type_toggle_spec.js b/spec/javascripts/comment_type_toggle_spec.js new file mode 100644 index 00000000000..d68c221f0ea --- /dev/null +++ b/spec/javascripts/comment_type_toggle_spec.js @@ -0,0 +1,79 @@ +import CommentTypeToggle from '~/comment_type_toggle'; +import DropLab from '@gitlab-org/droplab'; +import InputSetter from '@gitlab-org/droplab/dist/plugins/InputSetter'; + +describe('CommentTypeToggle', function () { + describe('class constructor', function () { + beforeEach(function () { + this.trigger = {}; + this.list = {}; + this.input = {}; + this.button = {}; + + this.commentTypeToggle = new CommentTypeToggle( + this.trigger, + this.list, + this.input, + this.button, + ); + }); + + it('should set .trigger', function () { + expect(this.commentTypeToggle.trigger).toBe(this.trigger); + }); + + it('should set .list', function () { + expect(this.commentTypeToggle.list).toBe(this.list); + }); + + it('should set .input', function () { + expect(this.commentTypeToggle.input).toBe(this.input); + }); + + it('should set .button', function () { + expect(this.commentTypeToggle.button).toBe(this.button); + }); + }); + + describe('initDroplab', function () { + beforeEach(function () { + this.commentTypeToggle = { + trigger: {}, + list: {}, + input: {}, + button: {}, + }; + + this.droplab = jasmine.createSpyObj('droplab', ['addHook']); + + spyOn(window, 'DropLab').and.returnValue(this.droplab); + + this.initDroplab = CommentTypeToggle.prototype.initDroplab.call(this.commentTypeToggle); + }); + + it('should instantiate a DropLab instance', function () { + expect(window.DropLab).toHaveBeenCalled(); + }); + + it('should set .droplab', function () { + expect(this.commentTypeToggle.droplab).toBe(this.droplab); + }); + + it('should call DropLab.prototype.addHook', function () { + expect(this.droplab.addHook).toHaveBeenCalledWith( + this.commentTypeToggle.trigger, + this.commentTypeToggle.list, + [InputSetter], + { + InputSetter: [{ + input: this.commentTypeToggle.input, + valueAttribute: 'data-value', + }, { + input: this.commentTypeToggle.button, + valueAttribute: 'data-button-text', + }], + }, + ); + }); + }); +}); From 008559267023f16ff5061ae03fecf8cf80e6b662 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Wed, 5 Apr 2017 18:46:53 +0100 Subject: [PATCH 28/70] Move CommentTypeToggle use from gl_form to notes --- app/assets/javascripts/gl_form.js | 16 ---------------- app/assets/javascripts/notes.js | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/gl_form.js b/app/assets/javascripts/gl_form.js index 06072faa472..e7c98e16581 100644 --- a/app/assets/javascripts/gl_form.js +++ b/app/assets/javascripts/gl_form.js @@ -3,8 +3,6 @@ /* global DropzoneInput */ /* global autosize */ -import CommentTypeToggle from './comment_type_toggle'; - window.gl = window.gl || {}; function GLForm(form) { @@ -43,20 +41,6 @@ GLForm.prototype.setupForm = function() { this.form.find('.js-note-discard').hide(); this.form.show(); if (this.isAutosizeable) this.setupAutosize(); - - this.initCommentTypeToggle(); -}; - -GLForm.prototype.initCommentTypeToggle = function () { - this.commentTypeToggle = new CommentTypeToggle( - this.form[0].querySelector('.js-comment-type-dropdown .dropdown-toggle'), - this.form[0].querySelector('.js-comment-type-dropdown .dropdown-menu'), - document.getElementById('note_type'), - this.form[0].querySelector('.js-comment-type-dropdown .js-comment-submit-button'), - document.querySelector('.js-note-target-close'), - ); - - this.commentTypeToggle.initDroplab(); }; GLForm.prototype.setupAutosize = function () { diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 33749d6ed9e..85817bc2cf9 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -5,6 +5,7 @@ /* global mrRefreshWidgetUrl */ import Cookies from 'js-cookie'; +import CommentTypeToggle from './comment_type_toggle'; require('./autosave'); window.autosize = require('vendor/autosize'); @@ -137,6 +138,18 @@ require('./task_list'); $(document).off("click", '.system-note-commit-list-toggler'); }; + Notes.prototype.initCommentTypeToggle = function (form) { + this.commentTypeToggle = new CommentTypeToggle( + form[0].querySelector('.js-comment-type-dropdown .dropdown-toggle'), + form[0].querySelector('.js-comment-type-dropdown .dropdown-menu'), + document.getElementById('note_type'), + form[0].querySelector('.js-comment-type-dropdown .js-comment-submit-button'), + document.querySelector('.js-note-target-close'), + ); + + this.commentTypeToggle.initDroplab(); + }; + Notes.prototype.keydownNoteText = function(e) { var $textarea, discussionNoteForm, editNote, myLastNote, myLastNoteEditBtn, newText, originalText; if (gl.utils.isMetaKey(e)) { @@ -455,7 +468,9 @@ require('./task_list'); form.find("#note_type").val(''); form.find("#in_reply_to_discussion_id").remove(); form.find('.js-comment-resolve-button').closest('comment-and-resolve-btn').remove(); - return this.parentTimeline = form.parents('.timeline'); + this.parentTimeline = form.parents('.timeline'); + + this.initCommentTypeToggle(form); }; /* From 09330dd17c73aefc1c9b8c7295a4b4a0c805a34b Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 5 Apr 2017 12:56:31 -0500 Subject: [PATCH 29/70] Remove unused code --- app/controllers/projects/notes_controller.rb | 3 +-- app/services/notes/build_service.rb | 4 ---- spec/controllers/projects/notes_controller_spec.rb | 3 +-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 881e6d8d4b5..405ea3c0a4f 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -28,8 +28,7 @@ class Projects::NotesController < Projects::ApplicationController def create create_params = note_params.merge( merge_request_diff_head_sha: params[:merge_request_diff_head_sha], - in_reply_to_discussion_id: params[:in_reply_to_discussion_id], - new_discussion: params[:new_discussion], + in_reply_to_discussion_id: params[:in_reply_to_discussion_id] ) @note = Notes::CreateService.new(project, current_user, create_params).execute diff --git a/app/services/notes/build_service.rb b/app/services/notes/build_service.rb index 7d5dca5282c..ea7cacc956c 100644 --- a/app/services/notes/build_service.rb +++ b/app/services/notes/build_service.rb @@ -2,7 +2,6 @@ module Notes class BuildService < ::BaseService def execute in_reply_to_discussion_id = params.delete(:in_reply_to_discussion_id) - new_discussion = params.delete(:new_discussion) if project && in_reply_to_discussion_id.present? discussion = project.notes.find_discussion(in_reply_to_discussion_id) @@ -14,9 +13,6 @@ module Notes end params.merge!(discussion.reply_attributes) - elsif new_discussion - # TODO: Remove when we use a selectbox instead of a submit button - params[:type] = DiscussionNote.name end note = Note.new(params) diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb index 52a76776239..f140eaef5d5 100644 --- a/spec/controllers/projects/notes_controller_spec.rb +++ b/spec/controllers/projects/notes_controller_spec.rb @@ -153,8 +153,7 @@ describe Projects::NotesController do noteable_id: merge_request.id.to_s, noteable_type: 'MergeRequest', merge_request_diff_head_sha: 'sha', - in_reply_to_discussion_id: nil, - new_discussion: nil + in_reply_to_discussion_id: nil } expect(Notes::CreateService).to receive(:new).with(project, user, service_params).and_return(double(execute: true)) From 9c4a06a8f91be054e84b658d9dde1a5c556d1c7f Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Wed, 5 Apr 2017 20:50:26 +0100 Subject: [PATCH 30/70] Fix close buttob bug when toggling dropdown --- app/assets/javascripts/gl_form.js | 4 ++++ app/views/projects/notes/_form.html.haml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/gl_form.js b/app/assets/javascripts/gl_form.js index e7c98e16581..1930f93f67e 100644 --- a/app/assets/javascripts/gl_form.js +++ b/app/assets/javascripts/gl_form.js @@ -30,6 +30,10 @@ GLForm.prototype.setupForm = function() { this.form.addClass('gfm-form'); // remove notify commit author checkbox for non-commit notes gl.utils.disableButtonIfEmptyField(this.form.find('.js-note-text'), this.form.find('.js-comment-button')); + + const newDiscussionToggle = this.form.find('.js-note-new-discussion'); + if (newDiscussionToggle) gl.utils.disableButtonIfEmptyField(this.form.find('.js-note-text'), newDiscussionToggle); + gl.GfmAutoComplete.setup(this.form.find('.js-gfm-input')); new DropzoneInput(this.form); autosize(this.textarea); diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index 58960670085..929772af3e2 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -31,7 +31,7 @@ .btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown = f.submit 'Comment', class: "btn btn-nr btn-create comment-btn js-comment-button js-comment-submit-button" - if @note.can_be_discussion_note? - = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-comment-button js-note-new-discussion', data: { 'dropdown-trigger' => '#resolvable-comment-menu' } do + = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-note-new-discussion', data: { 'dropdown-trigger' => '#resolvable-comment-menu' } do = icon('caret-down') %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } } %li#comment{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => 'Comment & close merge request' }, class: 'droplab-item-selected' } From 5f9478562000d598a1cdea7e6699f7f701d742ba Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 5 Apr 2017 20:48:26 -0500 Subject: [PATCH 31/70] Make issue-from-discussion description text more consistent --- app/services/issues/build_service.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/services/issues/build_service.rb b/app/services/issues/build_service.rb index 77bced4bd5c..7b5858a8ccb 100644 --- a/app/services/issues/build_service.rb +++ b/app/services/issues/build_service.rb @@ -35,14 +35,17 @@ module Issues end def item_for_discussion(discussion) - first_note = discussion.first_note_to_resolve || discussion.first_note + first_note_to_resolve = discussion.first_note_to_resolve || discussion.first_note other_note_count = discussion.notes.size - 1 - note_url = Gitlab::UrlBuilder.build(first_note) + note_url = Gitlab::UrlBuilder.build(first_note_to_resolve) - discussion_info = "- [ ] #{first_note.author.to_reference} commented on a [discussion](#{note_url}): " + is_very_first_note = first_note_to_resolve == discussion.first_note + action = is_very_first_note ? "started" : "commented on" + + discussion_info = "- [ ] #{first_note_to_resolve.author.to_reference} #{action} a [discussion](#{note_url}): " discussion_info << " (+#{other_note_count} #{'comment'.pluralize(other_note_count)})" if other_note_count > 0 - note_without_block_quotes = Banzai::Filter::BlockquoteFenceFilter.new(first_note.note).call + note_without_block_quotes = Banzai::Filter::BlockquoteFenceFilter.new(first_note_to_resolve.note).call spaces = ' ' * 4 quote = note_without_block_quotes.lines.map { |line| "#{spaces}> #{line}" }.join From 3871941df7f955d60c12cf53522ccc9965381388 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Wed, 5 Apr 2017 18:01:45 -0500 Subject: [PATCH 32/70] Move discussion button to its own file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also customizes the message for the “Comment” option to match the current noteable --- .../notes/_comment_type_button.html.haml | 18 ++++++++++++++++++ app/views/projects/notes/_form.html.haml | 18 +----------------- 2 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 app/views/projects/notes/_comment_type_button.html.haml diff --git a/app/views/projects/notes/_comment_type_button.html.haml b/app/views/projects/notes/_comment_type_button.html.haml new file mode 100644 index 00000000000..46376367b16 --- /dev/null +++ b/app/views/projects/notes/_comment_type_button.html.haml @@ -0,0 +1,18 @@ +.btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown + %button.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button + Comment + - if @note.can_be_discussion_note? + = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-note-new-discussion', data: { 'dropdown-trigger' => '#resolvable-comment-menu' } do + = icon('caret-down') + %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } } + %li#comment{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => 'Comment & close merge request' }, class: 'droplab-item-selected' } + = icon('check') + .description + %strong Comment + %p= "Add a general comment to this #{@note.noteable_type.titleize.downcase}." + %li.divider + %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => 'Start discussion & close merge request' } } + = icon('check') + .description + %strong Start discussion + %p Discuss a specific suggestion or question that needs to be resolved. diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index 929772af3e2..057c6801edf 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -28,23 +28,7 @@ .error-alert .note-form-actions.clearfix - .btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown - = f.submit 'Comment', class: "btn btn-nr btn-create comment-btn js-comment-button js-comment-submit-button" - - if @note.can_be_discussion_note? - = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-note-new-discussion', data: { 'dropdown-trigger' => '#resolvable-comment-menu' } do - = icon('caret-down') - %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } } - %li#comment{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => 'Comment & close merge request' }, class: 'droplab-item-selected' } - = icon('check') - .description - %strong Comment - %p Add a general comment to this merge request. - %li.divider - %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => 'Start discussion & close merge request' } } - = icon('check') - .description - %strong Start discussion - %p Discuss a specific suggestion or question that needs to be resolved. + = render partial: 'projects/notes/comment_type_button', locals: { show_close_button: true } = yield(:note_actions) From 46f3e37ddf8625add29939868f189dc4db5336d6 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Wed, 5 Apr 2017 18:42:07 -0500 Subject: [PATCH 33/70] Customize Start discussion message according to if the noteable can be resolvable --- app/models/discussion_note.rb | 1 + app/models/note.rb | 4 ++++ app/views/projects/notes/_comment_type_button.html.haml | 5 +++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/models/discussion_note.rb b/app/models/discussion_note.rb index 324d019cf79..337fbc8435c 100644 --- a/app/models/discussion_note.rb +++ b/app/models/discussion_note.rb @@ -1,6 +1,7 @@ # A note in a non-diff discussion on an issue, merge request, commit, or snippet class DiscussionNote < Note NOTEABLE_TYPES = %w(MergeRequest Issue Commit Snippet).freeze + RESOLVABLE_TYPES = %w(MergeRequest).freeze validates :noteable_type, inclusion: { in: NOTEABLE_TYPES } diff --git a/app/models/note.rb b/app/models/note.rb index 49ba4ad3f2e..cd4996bdbae 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -228,6 +228,10 @@ class Note < ActiveRecord::Base DiscussionNote::NOTEABLE_TYPES.include?(self.noteable_type) && !part_of_discussion? end + def can_be_resolvable? + DiscussionNote::RESOLVABLE_TYPES.include?(self.noteable_type) + end + def discussion_class(noteable = nil) # When commit notes are rendered on an MR's Discussion page, they are # displayed in one discussion instead of individually. diff --git a/app/views/projects/notes/_comment_type_button.html.haml b/app/views/projects/notes/_comment_type_button.html.haml index 46376367b16..c690aa2a30d 100644 --- a/app/views/projects/notes/_comment_type_button.html.haml +++ b/app/views/projects/notes/_comment_type_button.html.haml @@ -1,3 +1,4 @@ +- noteable_type = @note.noteable_type .btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown %button.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button Comment @@ -9,10 +10,10 @@ = icon('check') .description %strong Comment - %p= "Add a general comment to this #{@note.noteable_type.titleize.downcase}." + %p= "Add a general comment to this #{noteable_type.titleize.downcase}." %li.divider %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => 'Start discussion & close merge request' } } = icon('check') .description %strong Start discussion - %p Discuss a specific suggestion or question that needs to be resolved. + %p= "Discuss a specific suggestion or question#{@note.can_be_resolvable? ? ' that needs to be resolved' : ''}." From 9ee6b0ce8f6a772a5f19def7d840fe96b3d0fca6 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Wed, 5 Apr 2017 20:11:38 -0500 Subject: [PATCH 34/70] Display secondary button only in resolvable noteables --- app/assets/javascripts/comment_type_toggle.js | 27 +++++++++++-------- .../notes/_comment_type_button.html.haml | 20 ++++++++++---- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/app/assets/javascripts/comment_type_toggle.js b/app/assets/javascripts/comment_type_toggle.js index 75b6f60cabb..df337441a40 100644 --- a/app/assets/javascripts/comment_type_toggle.js +++ b/app/assets/javascripts/comment_type_toggle.js @@ -12,19 +12,24 @@ class CommentTypeToggle { initDroplab() { this.droplab = new DropLab(); - this.droplab.init(this.trigger, this.list, [InputSetter], { - InputSetter: [{ - input: this.input, - valueAttribute: 'data-value', - }, - { - input: this.button, - valueAttribute: 'data-button-text', - }, - { + + const inputSetterConfig = [{ + input: this.input, + valueAttribute: 'data-value', + }, + { + input: this.button, + valueAttribute: 'data-button-text', + }]; + if (this.secondaryButton) { + inputSetterConfig.push({ input: this.secondaryButton, valueAttribute: 'data-secondary-button-text', - }], + }); + } + + this.droplab.init(this.trigger, this.list, [InputSetter], { + InputSetter: inputSetterConfig }); } } diff --git a/app/views/projects/notes/_comment_type_button.html.haml b/app/views/projects/notes/_comment_type_button.html.haml index c690aa2a30d..e3bb15e1d15 100644 --- a/app/views/projects/notes/_comment_type_button.html.haml +++ b/app/views/projects/notes/_comment_type_button.html.haml @@ -1,4 +1,5 @@ - noteable_type = @note.noteable_type + .btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown %button.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button Comment @@ -12,8 +13,17 @@ %strong Comment %p= "Add a general comment to this #{noteable_type.titleize.downcase}." %li.divider - %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => 'Start discussion & close merge request' } } - = icon('check') - .description - %strong Start discussion - %p= "Discuss a specific suggestion or question#{@note.can_be_resolvable? ? ' that needs to be resolved' : ''}." + - if @note.can_be_resolvable? + %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => "Start discussion & close #{noteable_type.titleize.downcase}" } } + = icon('check') + .description + %strong Start discussion + %p + Discuss a specific suggestion or question that needs to be resolved. + - else + %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => "Start discussion & close #{noteable_type.titleize.downcase}"} } + = icon('check') + .description + %strong Start discussion + %p + Discuss a specific suggestion or question. From 4d70fc581015bf1146b4182c855978e1ca67dd8c Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Wed, 5 Apr 2017 20:24:08 -0500 Subject: [PATCH 35/70] Do not initialize comment type toggle if form is not available This is for when user has not logged in --- app/assets/javascripts/notes.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 85817bc2cf9..d595b48d301 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -140,10 +140,10 @@ require('./task_list'); Notes.prototype.initCommentTypeToggle = function (form) { this.commentTypeToggle = new CommentTypeToggle( - form[0].querySelector('.js-comment-type-dropdown .dropdown-toggle'), - form[0].querySelector('.js-comment-type-dropdown .dropdown-menu'), + form.querySelector('.js-comment-type-dropdown .dropdown-toggle'), + form.querySelector('.js-comment-type-dropdown .dropdown-menu'), document.getElementById('note_type'), - form[0].querySelector('.js-comment-type-dropdown .js-comment-submit-button'), + form.querySelector('.js-comment-type-dropdown .js-comment-submit-button'), document.querySelector('.js-note-target-close'), ); @@ -470,7 +470,9 @@ require('./task_list'); form.find('.js-comment-resolve-button').closest('comment-and-resolve-btn').remove(); this.parentTimeline = form.parents('.timeline'); - this.initCommentTypeToggle(form); + if (form.length) { + this.initCommentTypeToggle(form.get(0)); + } }; /* From 99dec8e6c25a01d208b02633f07e57e56bf7c242 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Wed, 5 Apr 2017 21:03:42 -0500 Subject: [PATCH 36/70] Add class selector to make secondary button to work --- app/views/projects/merge_requests/_discussion.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index cfb44bd206c..15b5a51c1d0 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -1,9 +1,9 @@ - content_for :note_actions do - if can?(current_user, :update_merge_request, @merge_request) - if @merge_request.open? - = link_to 'Close merge request', merge_request_path(@merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-nr btn-comment btn-close close-mr-link js-note-target-close", title: "Close merge request", data: {original_text: "Close merge request", alternative_text: "Comment & close merge request"} + = link_to 'Close merge request', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: "btn btn-nr btn-comment btn-close close-mr-link js-note-target-close", title: "Close merge request", data: { original_text: "Close merge request", alternative_text: "Comment & close merge request"} - if @merge_request.reopenable? - = link_to 'Reopen merge request', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-nr btn-comment btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request", data: {original_text: "Reopen merge request", alternative_text: "Comment & reopen merge request"} + = link_to 'Reopen merge request', merge_request_path(@merge_request, merge_request: { state_event: :reopen }), method: :put, class: "btn btn-nr btn-comment btn-reopen reopen-mr-link js-note-target-close js-note-target-reopen", title: "Reopen merge request", data: { original_text: "Reopen merge request", alternative_text: "Comment & reopen merge request"} %comment-and-resolve-btn{ "inline-template" => true, ":discussion-id" => "" } %button.btn.btn-nr.btn-default.append-right-10.js-comment-resolve-button{ "v-if" => "showButton", type: "submit", data: { project_path: "#{project_path(@merge_request.project)}" } } {{ buttonText }} From b47b6abfdb04f1f97aa9d94f948a54eb4fd3404f Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Wed, 5 Apr 2017 22:41:39 -0500 Subject: [PATCH 37/70] Fix squared buttons by removing not needed CSS classes Also removes dropdown HTML where is not needed. --- app/assets/javascripts/notes.js | 18 ++++++++++++++++-- .../notes/_comment_type_button.html.haml | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index d595b48d301..d0b7b90b1d1 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -739,7 +739,7 @@ require('./task_list'); Notes.prototype.replyToDiscussionNote = function(e) { var form, replyLink; - form = this.formClone.clone(); + form = this.cleanForm(this.formClone.clone()); replyLink = $(e.target).closest(".js-discussion-reply-button"); // insert the form after the button replyLink @@ -863,7 +863,7 @@ require('./task_list'); } if (addForm) { - newForm = this.formClone.clone(); + newForm = this.cleanForm(this.formClone.clone()); newForm.appendTo(notesContent); // show the form return this.setupDiscussionNoteForm($link, newForm); @@ -1049,6 +1049,20 @@ require('./task_list'); }); }; + Notes.prototype.cleanForm = function($form) { + // Remove JS classes that are not needed here + $form + .find('.js-comment-type-dropdown') + .removeClass('btn-group'); + + // Remove dropdown + $form + .find('.dropdown-menu') + .remove(); + + return $form; + } + return Notes; })(); }).call(window); diff --git a/app/views/projects/notes/_comment_type_button.html.haml b/app/views/projects/notes/_comment_type_button.html.haml index e3bb15e1d15..078b606eda8 100644 --- a/app/views/projects/notes/_comment_type_button.html.haml +++ b/app/views/projects/notes/_comment_type_button.html.haml @@ -1,6 +1,6 @@ - noteable_type = @note.noteable_type -.btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown +.pull-left.btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown %button.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button Comment - if @note.can_be_discussion_note? From d9dedac8589c8ec7f41354d3920ae5f9feb44345 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Wed, 5 Apr 2017 23:40:19 -0500 Subject: [PATCH 38/70] Be more specific with selector --- app/assets/javascripts/notes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index d0b7b90b1d1..83c33cbe885 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -142,7 +142,7 @@ require('./task_list'); this.commentTypeToggle = new CommentTypeToggle( form.querySelector('.js-comment-type-dropdown .dropdown-toggle'), form.querySelector('.js-comment-type-dropdown .dropdown-menu'), - document.getElementById('note_type'), + document.querySelector('.timeline-content-form #note_type'), form.querySelector('.js-comment-type-dropdown .js-comment-submit-button'), document.querySelector('.js-note-target-close'), ); From 5200686bd980751d73738fdecd8232b682a7fcdc Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Thu, 6 Apr 2017 01:31:44 -0500 Subject: [PATCH 39/70] Disable submit button and dropdown when submitt comment form --- app/assets/javascripts/notes.js | 7 +++++++ app/views/projects/notes/_comment_type_button.html.haml | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 83c33cbe885..ee62ca2fbfb 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -112,10 +112,17 @@ require('./task_list'); // when issue status changes, we need to refresh data $(document).on("issuable:change", this.refresh); + $(document).on('submit', '.js-main-target-form', this.disableDropdown) + // when a key is clicked on the notes return $(document).on("keydown", ".js-note-text", this.keydownNoteText); }; + Notes.prototype.disableDropdown = function(e) { + const $form = $(e.target); + $form.find('.js-note-new-discussion').disable(); + }; + Notes.prototype.cleanBinding = function() { $(document).off("ajax:success", ".js-main-target-form"); $(document).off("ajax:success", ".js-discussion-note-form"); diff --git a/app/views/projects/notes/_comment_type_button.html.haml b/app/views/projects/notes/_comment_type_button.html.haml index 078b606eda8..2a851d57fd6 100644 --- a/app/views/projects/notes/_comment_type_button.html.haml +++ b/app/views/projects/notes/_comment_type_button.html.haml @@ -1,8 +1,7 @@ - noteable_type = @note.noteable_type .pull-left.btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown - %button.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button - Comment + %input.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button{ type: 'submit', value: 'Comment' } - if @note.can_be_discussion_note? = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-note-new-discussion', data: { 'dropdown-trigger' => '#resolvable-comment-menu' } do = icon('caret-down') From a9186d07e9b0b678450403b35028dc058299c74d Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 6 Apr 2017 10:28:25 +0100 Subject: [PATCH 40/70] Fixed close button text --- app/assets/javascripts/comment_type_toggle.js | 4 ++++ app/assets/javascripts/notes.js | 6 +++--- app/views/shared/_comment_type_toggle.html.haml | 0 3 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 app/views/shared/_comment_type_toggle.html.haml diff --git a/app/assets/javascripts/comment_type_toggle.js b/app/assets/javascripts/comment_type_toggle.js index df337441a40..2110d19a9ea 100644 --- a/app/assets/javascripts/comment_type_toggle.js +++ b/app/assets/javascripts/comment_type_toggle.js @@ -25,6 +25,10 @@ class CommentTypeToggle { inputSetterConfig.push({ input: this.secondaryButton, valueAttribute: 'data-secondary-button-text', + }, { + input: this.secondaryButton, + valueAttribute: 'data-secondary-button-text', + inputAttribute: 'data-alternative-text', }); } diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index ee62ca2fbfb..e22232af800 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -149,9 +149,9 @@ require('./task_list'); this.commentTypeToggle = new CommentTypeToggle( form.querySelector('.js-comment-type-dropdown .dropdown-toggle'), form.querySelector('.js-comment-type-dropdown .dropdown-menu'), - document.querySelector('.timeline-content-form #note_type'), + document.querySelector('.js-main-target-form #note_type'), form.querySelector('.js-comment-type-dropdown .js-comment-submit-button'), - document.querySelector('.js-note-target-close'), + document.querySelector('.js-main-target-form .js-note-target-close'), ); this.commentTypeToggle.initDroplab(); @@ -949,7 +949,7 @@ require('./task_list'); discardbtn = form.find('.js-note-discard'); if (textarea.val().trim().length > 0) { reopentext = reopenbtn.data('alternative-text'); - closetext = closebtn.data('alternative-text'); + closetext = closebtn.attr('data-alternative-text'); if (reopenbtn.text() !== reopentext) { reopenbtn.text(reopentext); } diff --git a/app/views/shared/_comment_type_toggle.html.haml b/app/views/shared/_comment_type_toggle.html.haml deleted file mode 100644 index e69de29bb2d..00000000000 From 7083d381317c0f219ca18215a70aa102a7cec5de Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 6 Apr 2017 11:23:36 +0100 Subject: [PATCH 41/70] Added feature specs --- spec/features/merge_requests/discussion_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 spec/features/merge_requests/discussion_spec.rb diff --git a/spec/features/merge_requests/discussion_spec.rb b/spec/features/merge_requests/discussion_spec.rb new file mode 100644 index 00000000000..1288584749d --- /dev/null +++ b/spec/features/merge_requests/discussion_spec.rb @@ -0,0 +1,4 @@ +require 'spec_helper' + +describe 'Merge Request Discussions', :feature, :js do +end From 7db45ca3b8390377096dd246c27de3063b70393d Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 6 Apr 2017 11:36:26 +0100 Subject: [PATCH 42/70] Added droplab back to static assets --- app/assets/javascripts/droplab/constants.js | 11 + app/assets/javascripts/droplab/drop_down.js | 137 +++++ app/assets/javascripts/droplab/drop_lab.js | 152 +++++ app/assets/javascripts/droplab/hook.js | 22 + app/assets/javascripts/droplab/hook_button.js | 65 ++ app/assets/javascripts/droplab/hook_input.js | 119 ++++ app/assets/javascripts/droplab/keyboard.js | 113 ++++ .../javascripts/droplab/plugins/ajax.js | 71 +++ .../droplab/plugins/ajax_filter.js | 133 ++++ .../javascripts/droplab/plugins/filter.js | 95 +++ .../droplab/plugins/input_setter.js | 51 ++ app/assets/javascripts/droplab/utils.js | 38 ++ .../filtered_search/dropdown_hint.js | 2 +- .../filtered_search/dropdown_non_user.js | 4 +- .../filtered_search/dropdown_user.js | 2 +- .../filtered_search_dropdown_manager.js | 2 +- package.json | 1 - spec/javascripts/droplab/constants.js | 29 + spec/javascripts/droplab/drop_down.js | 578 ++++++++++++++++++ spec/javascripts/droplab/hook.js | 82 +++ .../droplab/plugins/input_setter.js | 177 ++++++ .../filtered_search/dropdown_user_spec.js | 8 +- yarn.lock | 34 +- 23 files changed, 1894 insertions(+), 32 deletions(-) create mode 100644 app/assets/javascripts/droplab/constants.js create mode 100644 app/assets/javascripts/droplab/drop_down.js create mode 100644 app/assets/javascripts/droplab/drop_lab.js create mode 100644 app/assets/javascripts/droplab/hook.js create mode 100644 app/assets/javascripts/droplab/hook_button.js create mode 100644 app/assets/javascripts/droplab/hook_input.js create mode 100644 app/assets/javascripts/droplab/keyboard.js create mode 100644 app/assets/javascripts/droplab/plugins/ajax.js create mode 100644 app/assets/javascripts/droplab/plugins/ajax_filter.js create mode 100644 app/assets/javascripts/droplab/plugins/filter.js create mode 100644 app/assets/javascripts/droplab/plugins/input_setter.js create mode 100644 app/assets/javascripts/droplab/utils.js create mode 100644 spec/javascripts/droplab/constants.js create mode 100644 spec/javascripts/droplab/drop_down.js create mode 100644 spec/javascripts/droplab/hook.js create mode 100644 spec/javascripts/droplab/plugins/input_setter.js diff --git a/app/assets/javascripts/droplab/constants.js b/app/assets/javascripts/droplab/constants.js new file mode 100644 index 00000000000..a23d914772a --- /dev/null +++ b/app/assets/javascripts/droplab/constants.js @@ -0,0 +1,11 @@ +const DATA_TRIGGER = 'data-dropdown-trigger'; +const DATA_DROPDOWN = 'data-dropdown'; +const SELECTED_CLASS = 'droplab-item-selected'; +const ACTIVE_CLASS = 'droplab-item-active'; + +export { + DATA_TRIGGER, + DATA_DROPDOWN, + SELECTED_CLASS, + ACTIVE_CLASS, +}; diff --git a/app/assets/javascripts/droplab/drop_down.js b/app/assets/javascripts/droplab/drop_down.js new file mode 100644 index 00000000000..f686ad33f6f --- /dev/null +++ b/app/assets/javascripts/droplab/drop_down.js @@ -0,0 +1,137 @@ +/* eslint-disable */ + +import utils from './utils'; +import { SELECTED_CLASS } from './constants'; + +var DropDown = function(list) { + this.currentIndex = 0; + this.hidden = true; + this.list = typeof list === 'string' ? document.querySelector(list) : list; + this.items = []; + + this.eventWrapper = {}; + + this.getItems(); + this.initTemplateString(); + this.addEvents(); + + this.initialState = list.innerHTML; +}; + +Object.assign(DropDown.prototype, { + getItems: function() { + this.items = [].slice.call(this.list.querySelectorAll('li')); + return this.items; + }, + + initTemplateString: function() { + var items = this.items || this.getItems(); + + var templateString = ''; + if (items.length > 0) templateString = items[items.length - 1].outerHTML; + this.templateString = templateString; + + return this.templateString; + }, + + clickEvent: function(e) { + var selected = utils.closest(e.target, 'LI'); + if (!selected) return; + + this.addSelectedClass(selected); + + e.preventDefault(); + this.hide(); + + var listEvent = new CustomEvent('click.dl', { + detail: { + list: this, + selected: selected, + data: e.target.dataset, + }, + }); + this.list.dispatchEvent(listEvent); + }, + + addSelectedClass: function (selected) { + this.removeSelectedClasses(); + selected.classList.add(SELECTED_CLASS); + }, + + removeSelectedClasses: function () { + const items = this.items || this.getItems(); + + items.forEach(item => item.classList.remove(SELECTED_CLASS)); + }, + + addEvents: function() { + this.eventWrapper.clickEvent = this.clickEvent.bind(this) + this.list.addEventListener('click', this.eventWrapper.clickEvent); + }, + + toggle: function() { + this.hidden ? this.show() : this.hide(); + }, + + setData: function(data) { + this.data = data; + this.render(data); + }, + + addData: function(data) { + this.data = (this.data || []).concat(data); + this.render(this.data); + }, + + render: function(data) { + const children = data ? data.map(this.renderChildren.bind(this)) : []; + const renderableList = this.list.querySelector('ul[data-dynamic]') || this.list; + + renderableList.innerHTML = children.join(''); + }, + + renderChildren: function(data) { + var html = utils.t(this.templateString, data); + var template = document.createElement('div'); + + template.innerHTML = html; + this.setImagesSrc(template); + template.firstChild.style.display = data.droplab_hidden ? 'none' : 'block'; + + return template.firstChild.outerHTML; + }, + + setImagesSrc: function(template) { + const images = [].slice.call(template.querySelectorAll('img[data-src]')); + + images.forEach((image) => { + image.src = image.getAttribute('data-src'); + image.removeAttribute('data-src'); + }); + }, + + show: function() { + if (!this.hidden) return; + this.list.style.display = 'block'; + this.currentIndex = 0; + this.hidden = false; + }, + + hide: function() { + if (this.hidden) return; + this.list.style.display = 'none'; + this.currentIndex = 0; + this.hidden = true; + }, + + toggle: function () { + this.hidden ? this.show() : this.hide(); + }, + + destroy: function() { + this.hide(); + this.list.removeEventListener('click', this.eventWrapper.clickEvent); + } +}); + +export default DropDown; diff --git a/app/assets/javascripts/droplab/drop_lab.js b/app/assets/javascripts/droplab/drop_lab.js new file mode 100644 index 00000000000..6eb9f314af7 --- /dev/null +++ b/app/assets/javascripts/droplab/drop_lab.js @@ -0,0 +1,152 @@ +/* eslint-disable */ + +import HookButton from './hook_button'; +import HookInput from './hook_input'; +import utils from './utils'; +import Keyboard from './keyboard'; +import { DATA_TRIGGER } from './constants'; + +var DropLab = function() { + this.ready = false; + this.hooks = []; + this.queuedData = []; + this.config = {}; + + this.eventWrapper = {}; +}; + +Object.assign(DropLab.prototype, { + loadStatic: function(){ + var dropdownTriggers = [].slice.apply(document.querySelectorAll(`[${DATA_TRIGGER}]`)); + this.addHooks(dropdownTriggers); + }, + + addData: function () { + var args = [].slice.apply(arguments); + this.applyArgs(args, '_addData'); + }, + + setData: function() { + var args = [].slice.apply(arguments); + this.applyArgs(args, '_setData'); + }, + + destroy: function() { + this.hooks.forEach(hook => hook.destroy()); + this.hooks = []; + this.removeEvents(); + }, + + applyArgs: function(args, methodName) { + if (this.ready) return this[methodName].apply(this, args); + + this.queuedData = this.queuedData || []; + this.queuedData.push(args); + }, + + _addData: function(trigger, data) { + this._processData(trigger, data, 'addData'); + }, + + _setData: function(trigger, data) { + this._processData(trigger, data, 'setData'); + }, + + _processData: function(trigger, data, methodName) { + this.hooks.forEach((hook) => { + if (Array.isArray(trigger)) hook.list[methodName](trigger); + + if (hook.trigger.id === trigger) hook.list[methodName](data); + }); + }, + + addEvents: function() { + this.eventWrapper.documentClicked = this.documentClicked.bind(this) + document.addEventListener('click', this.eventWrapper.documentClicked); + }, + + documentClicked: function(e) { + let thisTag = e.target; + + if (thisTag.tagName !== 'UL') thisTag = utils.closest(thisTag, 'UL'); + if (utils.isDropDownParts(thisTag, this.hooks) || utils.isDropDownParts(e.target, this.hooks)) return; + + this.hooks.forEach(hook => hook.list.hide()); + }, + + removeEvents: function(){ + document.removeEventListener('click', this.eventWrapper.documentClicked); + }, + + changeHookList: function(trigger, list, plugins, config) { + const availableTrigger = typeof trigger === 'string' ? document.getElementById(trigger) : trigger; + + + this.hooks.forEach((hook, i) => { + hook.list.list.dataset.dropdownActive = false; + + if (hook.trigger !== availableTrigger) return; + + hook.destroy(); + this.hooks.splice(i, 1); + this.addHook(availableTrigger, list, plugins, config); + }); + }, + + addHook: function(hook, list, plugins, config) { + const availableHook = typeof hook === 'string' ? document.querySelector(hook) : hook; + let availableList; + + if (typeof list === 'string') { + availableList = document.querySelector(list); + } else if (list instanceof Element) { + availableList = list; + } else { + availableList = document.querySelector(hook.dataset[utils.toCamelCase(DATA_TRIGGER)]); + } + + availableList.dataset.dropdownActive = true; + + const HookObject = availableHook.tagName === 'INPUT' ? HookInput : HookButton; + this.hooks.push(new HookObject(availableHook, availableList, plugins, config)); + + return this; + }, + + addHooks: function(hooks, plugins, config) { + hooks.forEach(hook => this.addHook(hook, null, plugins, config)); + return this; + }, + + setConfig: function(obj){ + this.config = obj; + }, + + fireReady: function() { + const readyEvent = new CustomEvent('ready.dl', { + detail: { + dropdown: this, + }, + }); + document.dispatchEvent(readyEvent); + + this.ready = true; + }, + + init: function (hook, list, plugins, config) { + hook ? this.addHook(hook, list, plugins, config) : this.loadStatic(); + + this.addEvents(); + + Keyboard(); + + this.fireReady(); + + this.queuedData.forEach(data => this.addData(data)); + this.queuedData = []; + + return this; + }, +}); + +export default DropLab; diff --git a/app/assets/javascripts/droplab/hook.js b/app/assets/javascripts/droplab/hook.js new file mode 100644 index 00000000000..2f840083571 --- /dev/null +++ b/app/assets/javascripts/droplab/hook.js @@ -0,0 +1,22 @@ +/* eslint-disable */ + +import DropDown from './drop_down'; + +var Hook = function(trigger, list, plugins, config){ + this.trigger = trigger; + this.list = new DropDown(list); + this.type = 'Hook'; + this.event = 'click'; + this.plugins = plugins || []; + this.config = config || {}; + this.id = trigger.id; +}; + +Object.assign(Hook.prototype, { + + addEvents: function(){}, + + constructor: Hook, +}); + +export default Hook; diff --git a/app/assets/javascripts/droplab/hook_button.js b/app/assets/javascripts/droplab/hook_button.js new file mode 100644 index 00000000000..be8aead1303 --- /dev/null +++ b/app/assets/javascripts/droplab/hook_button.js @@ -0,0 +1,65 @@ +/* eslint-disable */ + +import Hook from './hook'; + +var HookButton = function(trigger, list, plugins, config) { + Hook.call(this, trigger, list, plugins, config); + + this.type = 'button'; + this.event = 'click'; + + this.eventWrapper = {}; + + this.addEvents(); + this.addPlugins(); +}; + +HookButton.prototype = Object.create(Hook.prototype); + +Object.assign(HookButton.prototype, { + addPlugins: function() { + this.plugins.forEach(plugin => plugin.init(this)); + }, + + clicked: function(e){ + var buttonEvent = new CustomEvent('click.dl', { + detail: { + hook: this, + }, + bubbles: true, + cancelable: true + }); + e.target.dispatchEvent(buttonEvent); + + this.list.toggle(); + }, + + addEvents: function(){ + this.eventWrapper.clicked = this.clicked.bind(this); + this.trigger.addEventListener('click', this.eventWrapper.clicked); + }, + + removeEvents: function(){ + this.trigger.removeEventListener('click', this.eventWrapper.clicked); + }, + + restoreInitialState: function() { + this.list.list.innerHTML = this.list.initialState; + }, + + removePlugins: function() { + this.plugins.forEach(plugin => plugin.destroy()); + }, + + destroy: function() { + this.restoreInitialState(); + + this.removeEvents(); + this.removePlugins(); + }, + + constructor: HookButton, +}); + + +export default HookButton; diff --git a/app/assets/javascripts/droplab/hook_input.js b/app/assets/javascripts/droplab/hook_input.js new file mode 100644 index 00000000000..05082334045 --- /dev/null +++ b/app/assets/javascripts/droplab/hook_input.js @@ -0,0 +1,119 @@ +/* eslint-disable */ + +import Hook from './hook'; + +var HookInput = function(trigger, list, plugins, config) { + Hook.call(this, trigger, list, plugins, config); + + this.type = 'input'; + this.event = 'input'; + + this.eventWrapper = {}; + + this.addEvents(); + this.addPlugins(); +}; + +Object.assign(HookInput.prototype, { + addPlugins: function() { + this.plugins.forEach(plugin => plugin.init(this)); + }, + + addEvents: function(){ + this.eventWrapper.mousedown = this.mousedown.bind(this); + this.eventWrapper.input = this.input.bind(this); + this.eventWrapper.keyup = this.keyup.bind(this); + this.eventWrapper.keydown = this.keydown.bind(this); + + this.trigger.addEventListener('mousedown', this.eventWrapper.mousedown); + this.trigger.addEventListener('input', this.eventWrapper.input); + this.trigger.addEventListener('keyup', this.eventWrapper.keyup); + this.trigger.addEventListener('keydown', this.eventWrapper.keydown); + }, + + removeEvents: function() { + this.hasRemovedEvents = true; + + this.trigger.removeEventListener('mousedown', this.eventWrapper.mousedown); + this.trigger.removeEventListener('input', this.eventWrapper.input); + this.trigger.removeEventListener('keyup', this.eventWrapper.keyup); + this.trigger.removeEventListener('keydown', this.eventWrapper.keydown); + }, + + input: function(e) { + if(this.hasRemovedEvents) return; + + this.list.show(); + + const inputEvent = new CustomEvent('input.dl', { + detail: { + hook: this, + text: e.target.value, + }, + bubbles: true, + cancelable: true + }); + e.target.dispatchEvent(inputEvent); + }, + + mousedown: function(e) { + if (this.hasRemovedEvents) return; + + const mouseEvent = new CustomEvent('mousedown.dl', { + detail: { + hook: this, + text: e.target.value, + }, + bubbles: true, + cancelable: true, + }); + e.target.dispatchEvent(mouseEvent); + }, + + keyup: function(e) { + if (this.hasRemovedEvents) return; + + this.keyEvent(e, 'keyup.dl'); + }, + + keydown: function(e) { + if (this.hasRemovedEvents) return; + + this.keyEvent(e, 'keydown.dl'); + }, + + keyEvent: function(e, eventName) { + this.list.show(); + + const keyEvent = new CustomEvent(eventName, { + detail: { + hook: this, + text: e.target.value, + which: e.which, + key: e.key, + }, + bubbles: true, + cancelable: true, + }); + e.target.dispatchEvent(keyEvent); + }, + + restoreInitialState: function() { + this.list.list.innerHTML = this.list.initialState; + }, + + removePlugins: function() { + this.plugins.forEach(plugin => plugin.destroy()); + }, + + destroy: function() { + this.restoreInitialState(); + + this.removeEvents(); + this.removePlugins(); + + this.list.destroy(); + } +}); + +export default HookInput; diff --git a/app/assets/javascripts/droplab/keyboard.js b/app/assets/javascripts/droplab/keyboard.js new file mode 100644 index 00000000000..36740a430e1 --- /dev/null +++ b/app/assets/javascripts/droplab/keyboard.js @@ -0,0 +1,113 @@ +/* eslint-disable */ + +import { ACTIVE_CLASS } from './constants'; + +const Keyboard = function () { + var currentKey; + var currentFocus; + var isUpArrow = false; + var isDownArrow = false; + var removeHighlight = function removeHighlight(list) { + var itemElements = Array.prototype.slice.call(list.list.querySelectorAll('li:not(.divider)'), 0); + var listItems = []; + for(var i = 0; i < itemElements.length; i++) { + var listItem = itemElements[i]; + listItem.classList.remove(ACTIVE_CLASS); + + if (listItem.style.display !== 'none') { + listItems.push(listItem); + } + } + return listItems; + }; + + var setMenuForArrows = function setMenuForArrows(list) { + var listItems = removeHighlight(list); + if(list.currentIndex>0){ + if(!listItems[list.currentIndex-1]){ + list.currentIndex = list.currentIndex-1; + } + + if (listItems[list.currentIndex-1]) { + var el = listItems[list.currentIndex-1]; + var filterDropdownEl = el.closest('.filter-dropdown'); + el.classList.add(ACTIVE_CLASS); + + if (filterDropdownEl) { + var filterDropdownBottom = filterDropdownEl.offsetHeight; + var elOffsetTop = el.offsetTop - 30; + + if (elOffsetTop > filterDropdownBottom) { + filterDropdownEl.scrollTop = elOffsetTop - filterDropdownBottom; + } + } + } + } + }; + + var mousedown = function mousedown(e) { + var list = e.detail.hook.list; + removeHighlight(list); + list.show(); + list.currentIndex = 0; + isUpArrow = false; + isDownArrow = false; + }; + var selectItem = function selectItem(list) { + var listItems = removeHighlight(list); + var currentItem = listItems[list.currentIndex-1]; + var listEvent = new CustomEvent('click.dl', { + detail: { + list: list, + selected: currentItem, + data: currentItem.dataset, + }, + }); + list.list.dispatchEvent(listEvent); + list.hide(); + } + + var keydown = function keydown(e){ + var typedOn = e.target; + var list = e.detail.hook.list; + var currentIndex = list.currentIndex; + isUpArrow = false; + isDownArrow = false; + + if(e.detail.which){ + currentKey = e.detail.which; + if(currentKey === 13){ + selectItem(e.detail.hook.list); + return; + } + if(currentKey === 38) { + isUpArrow = true; + } + if(currentKey === 40) { + isDownArrow = true; + } + } else if(e.detail.key) { + currentKey = e.detail.key; + if(currentKey === 'Enter'){ + selectItem(e.detail.hook.list); + return; + } + if(currentKey === 'ArrowUp') { + isUpArrow = true; + } + if(currentKey === 'ArrowDown') { + isDownArrow = true; + } + } + if(isUpArrow){ currentIndex--; } + if(isDownArrow){ currentIndex++; } + if(currentIndex < 0){ currentIndex = 0; } + list.currentIndex = currentIndex; + setMenuForArrows(e.detail.hook.list); + }; + + document.addEventListener('mousedown.dl', mousedown); + document.addEventListener('keydown.dl', keydown); +}; + +export default Keyboard; diff --git a/app/assets/javascripts/droplab/plugins/ajax.js b/app/assets/javascripts/droplab/plugins/ajax.js new file mode 100644 index 00000000000..f08b638fc62 --- /dev/null +++ b/app/assets/javascripts/droplab/plugins/ajax.js @@ -0,0 +1,71 @@ +/* eslint-disable */ + +function droplabAjaxException(message) { + this.message = message; +} + +const Ajax = { + _loadUrlData: function _loadUrlData(url) { + var self = this; + return new Promise(function(resolve, reject) { + var xhr = new XMLHttpRequest; + xhr.open('GET', url, true); + xhr.onreadystatechange = function () { + if(xhr.readyState === XMLHttpRequest.DONE) { + if (xhr.status === 200) { + var data = JSON.parse(xhr.responseText); + self.cache[url] = data; + return resolve(data); + } else { + return reject([xhr.responseText, xhr.status]); + } + } + }; + xhr.send(); + }); + }, + _loadData: function _loadData(data, config, self) { + if (config.loadingTemplate) { + var dataLoadingTemplate = self.hook.list.list.querySelector('[data-loading-template]'); + if (dataLoadingTemplate) dataLoadingTemplate.outerHTML = self.listTemplate; + } + + if (!self.destroyed) self.hook.list[config.method].call(self.hook.list, data); + }, + init: function init(hook) { + var self = this; + self.destroyed = false; + self.cache = self.cache || {}; + var config = hook.config.Ajax; + this.hook = hook; + if (!config || !config.endpoint || !config.method) { + return; + } + if (config.method !== 'setData' && config.method !== 'addData') { + return; + } + if (config.loadingTemplate) { + var dynamicList = hook.list.list.querySelector('[data-dynamic]'); + var loadingTemplate = document.createElement('div'); + loadingTemplate.innerHTML = config.loadingTemplate; + loadingTemplate.setAttribute('data-loading-template', ''); + this.listTemplate = dynamicList.outerHTML; + dynamicList.outerHTML = loadingTemplate.outerHTML; + } + if (self.cache[config.endpoint]) { + self._loadData(self.cache[config.endpoint], config, self); + } else { + this._loadUrlData(config.endpoint) + .then(function(d) { + self._loadData(d, config, self); + }, config.onError).catch(function(e) { + throw new droplabAjaxException(e.message || e); + }); + } + }, + destroy: function() { + this.destroyed = true; + } +}; + +export default Ajax; diff --git a/app/assets/javascripts/droplab/plugins/ajax_filter.js b/app/assets/javascripts/droplab/plugins/ajax_filter.js new file mode 100644 index 00000000000..7fe221e101f --- /dev/null +++ b/app/assets/javascripts/droplab/plugins/ajax_filter.js @@ -0,0 +1,133 @@ +/* eslint-disable */ + +const AjaxFilter = { + init: function(hook) { + this.destroyed = false; + this.hook = hook; + this.notLoading(); + + this.eventWrapper = {}; + this.eventWrapper.debounceTrigger = this.debounceTrigger.bind(this); + this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceTrigger); + this.hook.trigger.addEventListener('focus', this.eventWrapper.debounceTrigger); + + this.trigger(true); + }, + + notLoading: function notLoading() { + this.loading = false; + }, + + debounceTrigger: function debounceTrigger(e) { + var NON_CHARACTER_KEYS = [16, 17, 18, 20, 37, 38, 39, 40, 91, 93]; + var invalidKeyPressed = NON_CHARACTER_KEYS.indexOf(e.detail.which || e.detail.keyCode) > -1; + var focusEvent = e.type === 'focus'; + if (invalidKeyPressed || this.loading) { + return; + } + if (this.timeout) { + clearTimeout(this.timeout); + } + this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200); + }, + + trigger: function trigger(getEntireList) { + var config = this.hook.config.AjaxFilter; + var searchValue = this.trigger.value; + if (!config || !config.endpoint || !config.searchKey) { + return; + } + if (config.searchValueFunction) { + searchValue = config.searchValueFunction(); + } + if (config.loadingTemplate && this.hook.list.data === undefined || + this.hook.list.data.length === 0) { + var dynamicList = this.hook.list.list.querySelector('[data-dynamic]'); + var loadingTemplate = document.createElement('div'); + loadingTemplate.innerHTML = config.loadingTemplate; + loadingTemplate.setAttribute('data-loading-template', true); + this.listTemplate = dynamicList.outerHTML; + dynamicList.outerHTML = loadingTemplate.outerHTML; + } + if (getEntireList) { + searchValue = ''; + } + if (config.searchKey === searchValue) { + return this.list.show(); + } + this.loading = true; + var params = config.params || {}; + params[config.searchKey] = searchValue; + var self = this; + self.cache = self.cache || {}; + var url = config.endpoint + this.buildParams(params); + var urlCachedData = self.cache[url]; + if (urlCachedData) { + self._loadData(urlCachedData, config, self); + } else { + this._loadUrlData(url) + .then(function(data) { + self._loadData(data, config, self); + }, config.onError); + } + }, + + _loadUrlData: function _loadUrlData(url) { + var self = this; + return new Promise(function(resolve, reject) { + var xhr = new XMLHttpRequest; + xhr.open('GET', url, true); + xhr.onreadystatechange = function () { + if(xhr.readyState === XMLHttpRequest.DONE) { + if (xhr.status === 200) { + var data = JSON.parse(xhr.responseText); + self.cache[url] = data; + return resolve(data); + } else { + return reject([xhr.responseText, xhr.status]); + } + } + }; + xhr.send(); + }); + }, + + _loadData: function _loadData(data, config, self) { + const list = self.hook.list; + if (config.loadingTemplate && list.data === undefined || + list.data.length === 0) { + const dataLoadingTemplate = list.list.querySelector('[data-loading-template]'); + if (dataLoadingTemplate) { + dataLoadingTemplate.outerHTML = self.listTemplate; + } + } + if (!self.destroyed) { + var hookListChildren = list.list.children; + var onlyDynamicList = hookListChildren.length === 1 && hookListChildren[0].hasAttribute('data-dynamic'); + if (onlyDynamicList && data.length === 0) { + list.hide(); + } + list.setData.call(list, data); + } + self.notLoading(); + list.currentIndex = 0; + }, + + buildParams: function(params) { + if (!params) return ''; + var paramsArray = Object.keys(params).map(function(param) { + return param + '=' + (params[param] || ''); + }); + return '?' + paramsArray.join('&'); + }, + + destroy: function destroy() { + if (this.timeout)clearTimeout(this.timeout); + this.destroyed = true; + + this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceTrigger); + this.hook.trigger.removeEventListener('focus', this.eventWrapper.debounceTrigger); + } +}; + +export default AjaxFilter; diff --git a/app/assets/javascripts/droplab/plugins/filter.js b/app/assets/javascripts/droplab/plugins/filter.js new file mode 100644 index 00000000000..d6a1aadd49c --- /dev/null +++ b/app/assets/javascripts/droplab/plugins/filter.js @@ -0,0 +1,95 @@ +/* eslint-disable */ + +const Filter = { + keydown: function(e){ + if (this.destroyed) return; + + var hiddenCount = 0; + var dataHiddenCount = 0; + + var list = e.detail.hook.list; + var data = list.data; + var value = e.detail.hook.trigger.value.toLowerCase(); + var config = e.detail.hook.config.Filter; + var matches = []; + var filterFunction; + // will only work on dynamically set data + if(!data){ + return; + } + + if (config && config.filterFunction && typeof config.filterFunction === 'function') { + filterFunction = config.filterFunction; + } else { + filterFunction = function(o){ + // cheap string search + o.droplab_hidden = o[config.template].toLowerCase().indexOf(value) === -1; + return o; + }; + } + + dataHiddenCount = data.filter(function(o) { + return !o.droplab_hidden; + }).length; + + matches = data.map(function(o) { + return filterFunction(o, value); + }); + + hiddenCount = matches.filter(function(o) { + return !o.droplab_hidden; + }).length; + + if (dataHiddenCount !== hiddenCount) { + list.setData(matches); + list.currentIndex = 0; + } + }, + + debounceKeydown: function debounceKeydown(e) { + if ([ + 13, // enter + 16, // shift + 17, // ctrl + 18, // alt + 20, // caps lock + 37, // left arrow + 38, // up arrow + 39, // right arrow + 40, // down arrow + 91, // left window + 92, // right window + 93, // select + ].indexOf(e.detail.which || e.detail.keyCode) > -1) return; + + if (this.timeout) clearTimeout(this.timeout); + this.timeout = setTimeout(this.keydown.bind(this, e), 200); + }, + + init: function init(hook) { + var config = hook.config.Filter; + + if (!config || !config.template) return; + + this.hook = hook; + this.destroyed = false; + + this.eventWrapper = {}; + this.eventWrapper.debounceKeydown = this.debounceKeydown.bind(this); + + this.hook.trigger.addEventListener('keydown.dl', this.eventWrapper.debounceKeydown); + this.hook.trigger.addEventListener('mousedown.dl', this.eventWrapper.debounceKeydown); + + this.debounceKeydown({ detail: { hook: this.hook } }); + }, + + destroy: function destroy() { + if (this.timeout) clearTimeout(this.timeout); + this.destroyed = true; + + this.hook.trigger.removeEventListener('keydown.dl', this.eventWrapper.debounceKeydown); + this.hook.trigger.removeEventListener('mousedown.dl', this.eventWrapper.debounceKeydown); + } +}; + +export default Filter; diff --git a/app/assets/javascripts/droplab/plugins/input_setter.js b/app/assets/javascripts/droplab/plugins/input_setter.js new file mode 100644 index 00000000000..b1716c72810 --- /dev/null +++ b/app/assets/javascripts/droplab/plugins/input_setter.js @@ -0,0 +1,51 @@ +/* eslint-disable */ + +const InputSetter = { + init(hook) { + this.hook = hook; + this.destroyed = false; + this.config = hook.config.InputSetter || (this.hook.config.InputSetter = {}); + + this.eventWrapper = {}; + + this.addEvents(); + }, + + addEvents() { + this.eventWrapper.setInputs = this.setInputs.bind(this); + this.hook.list.list.addEventListener('click.dl', this.eventWrapper.setInputs); + }, + + removeEvents() { + this.hook.list.list.removeEventListener('click.dl', this.eventWrapper.setInputs); + }, + + setInputs(e) { + if (this.destroyed) return; + + const selectedItem = e.detail.selected; + + if (!Array.isArray(this.config)) this.config = [this.config]; + + this.config.forEach(config => this.setInput(config, selectedItem)); + }, + + setInput(config, selectedItem) { + const input = config.input || this.hook.trigger; + const newValue = selectedItem.getAttribute(config.valueAttribute); + + if (input.tagName === 'INPUT') { + input.value = newValue; + } else { + input.textContent = newValue; + } + }, + + destroy() { + this.destroyed = true; + + this.removeEvents(); + }, +}; + +export default InputSetter; diff --git a/app/assets/javascripts/droplab/utils.js b/app/assets/javascripts/droplab/utils.js new file mode 100644 index 00000000000..c149a33a1e9 --- /dev/null +++ b/app/assets/javascripts/droplab/utils.js @@ -0,0 +1,38 @@ +/* eslint-disable */ + +import { DATA_TRIGGER, DATA_DROPDOWN } from './constants'; + +const utils = { + toCamelCase(attr) { + return this.camelize(attr.split('-').slice(1).join(' ')); + }, + + t(s, d) { + for (const p in d) { + if (Object.prototype.hasOwnProperty.call(d, p)) { + s = s.replace(new RegExp(`{{${p}}}`, 'g'), d[p]); + } + } + return s; + }, + + camelize(str) { + return str.replace(/(?:^\w|[A-Z]|\b\w)/g, (letter, index) => { + return index === 0 ? letter.toLowerCase() : letter.toUpperCase(); + }).replace(/\s+/g, ''); + }, + + closest(thisTag, stopTag) { + while (thisTag && thisTag.tagName !== stopTag && thisTag.tagName !== 'HTML') { + thisTag = thisTag.parentNode; + } + return thisTag; + }, + + isDropDownParts(target) { + if (!target || target.tagName === 'HTML') return false; + return target.hasAttribute(DATA_TRIGGER) || target.hasAttribute(DATA_DROPDOWN); + }, +}; + +export default utils; diff --git a/app/assets/javascripts/filtered_search/dropdown_hint.js b/app/assets/javascripts/filtered_search/dropdown_hint.js index 527037c08eb..ede5d65ce12 100644 --- a/app/assets/javascripts/filtered_search/dropdown_hint.js +++ b/app/assets/javascripts/filtered_search/dropdown_hint.js @@ -1,4 +1,4 @@ -import Filter from '@gitlab-org/droplab/dist/plugins/Filter'; +import Filter from '~/droplab/plugins/filter'; require('./filtered_search_dropdown'); diff --git a/app/assets/javascripts/filtered_search/dropdown_non_user.js b/app/assets/javascripts/filtered_search/dropdown_non_user.js index 48c2135aca3..35c76dff79a 100644 --- a/app/assets/javascripts/filtered_search/dropdown_non_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_non_user.js @@ -1,5 +1,5 @@ -import Ajax from '@gitlab-org/droplab/dist/plugins/Ajax'; -import Filter from '@gitlab-org/droplab/dist/plugins/Filter'; +import Ajax from '~/droplab/plugins/ajax'; +import Filter from '~/droplab/plugins/filter'; require('./filtered_search_dropdown'); diff --git a/app/assets/javascripts/filtered_search/dropdown_user.js b/app/assets/javascripts/filtered_search/dropdown_user.js index 1661a4c5da2..4f9f25c1f1b 100644 --- a/app/assets/javascripts/filtered_search/dropdown_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_user.js @@ -1,4 +1,4 @@ -import AjaxFilter from '@gitlab-org/droplab/dist/plugins/AjaxFilter'; +import AjaxFilter from '~/droplab/plugins/ajax_filter'; require('./filtered_search_dropdown'); diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js index f5d6a85a4da..ec481b9ef97 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js +++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js @@ -1,4 +1,4 @@ -import DropLab from '@gitlab-org/droplab'; +import DropLab from '~/droplab/drop_lab'; import FilteredSearchContainer from './container'; (() => { diff --git a/package.json b/package.json index c623ca627b5..3f64d65d57a 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js" }, "dependencies": { - "@gitlab-org/droplab": "^0.1.0", "babel-core": "^6.22.1", "babel-loader": "^6.2.10", "babel-plugin-transform-define": "^1.2.0", diff --git a/spec/javascripts/droplab/constants.js b/spec/javascripts/droplab/constants.js new file mode 100644 index 00000000000..35239e4fb8e --- /dev/null +++ b/spec/javascripts/droplab/constants.js @@ -0,0 +1,29 @@ +/* eslint-disable */ + +import * as constants from '~/droplab/constants'; + +describe('constants', function () { + describe('DATA_TRIGGER', function () { + it('should be `data-dropdown-trigger`', function() { + expect(constants.DATA_TRIGGER).toBe('data-dropdown-trigger'); + }); + }); + + describe('DATA_DROPDOWN', function () { + it('should be `data-dropdown`', function() { + expect(constants.DATA_DROPDOWN).toBe('data-dropdown'); + }); + }); + + describe('SELECTED_CLASS', function () { + it('should be `droplab-item-selected`', function() { + expect(constants.SELECTED_CLASS).toBe('droplab-item-selected'); + }); + }); + + describe('ACTIVE_CLASS', function () { + it('should be `droplab-item-active`', function() { + expect(constants.ACTIVE_CLASS).toBe('droplab-item-active'); + }); + }); +}); diff --git a/spec/javascripts/droplab/drop_down.js b/spec/javascripts/droplab/drop_down.js new file mode 100644 index 00000000000..bbf953658c8 --- /dev/null +++ b/spec/javascripts/droplab/drop_down.js @@ -0,0 +1,578 @@ +/* eslint-disable */ + +import DropDown from '~/droplab/drop_down'; +import utils from '~/droplab/utils'; +import { SELECTED_CLASS } from '~/droplab/constants'; + +describe('DropDown', function () { + describe('class constructor', function () { + beforeEach(function () { + spyOn(DropDown.prototype, 'getItems'); + spyOn(DropDown.prototype, 'initTemplateString'); + spyOn(DropDown.prototype, 'addEvents'); + + this.list = { innerHTML: 'innerHTML' }; + this.dropdown = new DropDown(this.list); + }); + + it('sets the .hidden property to true', function () { + expect(this.dropdown.hidden).toBe(true); + }) + + it('sets the .list property', function () { + expect(this.dropdown.list).toBe(this.list); + }); + + it('calls .getItems', function () { + expect(DropDown.prototype.getItems).toHaveBeenCalled(); + }); + + it('calls .initTemplateString', function () { + expect(DropDown.prototype.initTemplateString).toHaveBeenCalled(); + }); + + it('calls .addEvents', function () { + expect(DropDown.prototype.addEvents).toHaveBeenCalled(); + }); + + it('sets the .initialState property to the .list.innerHTML', function () { + expect(this.dropdown.initialState).toBe(this.list.innerHTML); + }); + + describe('if the list argument is a string', function () { + beforeEach(function () { + this.element = {}; + this.selector = '.selector'; + + spyOn(Document.prototype, 'querySelector').and.returnValue(this.element); + + this.dropdown = new DropDown(this.selector); + }); + + it('calls .querySelector with the selector string', function () { + expect(Document.prototype.querySelector).toHaveBeenCalledWith(this.selector); + }); + + it('sets the .list property element', function () { + expect(this.dropdown.list).toBe(this.element); + }); + }); + }); + + describe('getItems', function () { + beforeEach(function () { + this.list = { querySelectorAll: () => {} }; + this.dropdown = { list: this.list }; + this.nodeList = []; + + spyOn(this.list, 'querySelectorAll').and.returnValue(this.nodeList); + + this.getItems = DropDown.prototype.getItems.call(this.dropdown); + }); + + it('calls .querySelectorAll with a list item query', function () { + expect(this.list.querySelectorAll).toHaveBeenCalledWith('li'); + }); + + it('sets the .items property to the returned list items', function () { + expect(this.dropdown.items).toEqual(jasmine.any(Array)); + }); + + it('returns the .items', function () { + expect(this.getItems).toEqual(jasmine.any(Array)); + }); + }); + + describe('initTemplateString', function () { + beforeEach(function () { + this.items = [{ outerHTML: '' }, { outerHTML: '' }]; + this.dropdown = { items: this.items }; + + DropDown.prototype.initTemplateString.call(this.dropdown); + }); + + it('should set .templateString to the last items .outerHTML', function () { + expect(this.dropdown.templateString).toBe(this.items[1].outerHTML); + }); + + it('should not set .templateString to a non-last items .outerHTML', function () { + expect(this.dropdown.templateString).not.toBe(this.items[0].outerHTML); + }); + + describe('if .items is not set', function () { + beforeEach(function () { + this.dropdown = { getItems: () => {} }; + + spyOn(this.dropdown, 'getItems').and.returnValue([]); + + DropDown.prototype.initTemplateString.call(this.dropdown); + }); + + it('should call .getItems', function () { + expect(this.dropdown.getItems).toHaveBeenCalled(); + }); + }); + + describe('if items array is empty', function () { + beforeEach(function () { + this.dropdown = { items: [] }; + + DropDown.prototype.initTemplateString.call(this.dropdown); + }); + + it('should set .templateString to an empty string', function () { + expect(this.dropdown.templateString).toBe(''); + }); + }); + }); + + describe('clickEvent', function () { + beforeEach(function () { + this.list = { dispatchEvent: () => {} }; + this.dropdown = { hide: () => {}, list: this.list, addSelectedClass: () => {} }; + this.event = { preventDefault: () => {}, target: 'target' }; + this.customEvent = {}; + this.closestElement = {}; + + spyOn(this.dropdown, 'hide'); + spyOn(this.dropdown, 'addSelectedClass'); + spyOn(this.list, 'dispatchEvent'); + spyOn(this.event, 'preventDefault'); + spyOn(window, 'CustomEvent').and.returnValue(this.customEvent); + spyOn(utils, 'closest').and.returnValues(this.closestElement, undefined); + + DropDown.prototype.clickEvent.call(this.dropdown, this.event); + }); + + it('should call utils.closest', function () { + expect(utils.closest).toHaveBeenCalledWith(this.event.target, 'LI'); + }); + + it('should call addSelectedClass', function () { + expect(this.dropdown.addSelectedClass).toHaveBeenCalledWith(this.closestElement); + }) + + it('should call .preventDefault', function () { + expect(this.event.preventDefault).toHaveBeenCalled(); + }); + + it('should call .hide', function () { + expect(this.dropdown.hide).toHaveBeenCalled(); + }); + + it('should construct CustomEvent', function () { + expect(window.CustomEvent).toHaveBeenCalledWith('click.dl', jasmine.any(Object)); + }); + + it('should call .dispatchEvent with the customEvent', function () { + expect(this.list.dispatchEvent).toHaveBeenCalledWith(this.customEvent); + }); + + describe('if no selected element exists', function () { + beforeEach(function () { + this.event.preventDefault.calls.reset(); + this.clickEvent = DropDown.prototype.clickEvent.call(this.dropdown, this.event); + }); + + it('should return undefined', function () { + expect(this.clickEvent).toBe(undefined); + }); + + it('should return before .preventDefault is called', function () { + expect(this.event.preventDefault).not.toHaveBeenCalled(); + }); + }); + }); + + describe('addSelectedClass', function () { + beforeEach(function () { + this.items = Array(4).forEach((item, i) => { + this.items[i] = { classList: { add: () => {} } }; + spyOn(this.items[i].classList, 'add'); + }); + this.selected = { classList: { add: () => {} } }; + this.dropdown = { removeSelectedClasses: () => {} }; + + spyOn(this.dropdown, 'removeSelectedClasses'); + spyOn(this.selected.classList, 'add'); + + DropDown.prototype.addSelectedClass.call(this.dropdown, this.selected); + }); + + it('should call .removeSelectedClasses', function () { + expect(this.dropdown.removeSelectedClasses).toHaveBeenCalled(); + }); + + it('should call .classList.add', function () { + expect(this.selected.classList.add).toHaveBeenCalledWith(SELECTED_CLASS); + }); + }); + + describe('removeSelectedClasses', function () { + beforeEach(function () { + this.items = Array(4); + this.items.forEach((item, i) => { + this.items[i] = { classList: { add: () => {} } }; + spyOn(this.items[i].classList, 'add'); + }); + this.dropdown = { items: this.items }; + + DropDown.prototype.removeSelectedClasses.call(this.dropdown); + }); + + it('should call .classList.remove for all items', function () { + this.items.forEach((item, i) => { + expect(this.items[i].classList.add).toHaveBeenCalledWith(SELECTED_CLASS); + }); + }); + + describe('if .items is not set', function () { + beforeEach(function () { + this.dropdown = { getItems: () => {} }; + + spyOn(this.dropdown, 'getItems').and.returnValue([]); + + DropDown.prototype.removeSelectedClasses.call(this.dropdown); + }); + + it('should call .getItems', function () { + expect(this.dropdown.getItems).toHaveBeenCalled(); + }); + }); + }); + + describe('addEvents', function () { + beforeEach(function () { + this.list = { addEventListener: () => {} }; + this.dropdown = { list: this.list, clickEvent: () => {}, eventWrapper: {} }; + + spyOn(this.list, 'addEventListener'); + + DropDown.prototype.addEvents.call(this.dropdown); + }); + + it('should call .addEventListener', function () { + expect(this.list.addEventListener).toHaveBeenCalledWith('click', jasmine.any(Function)); + }); + }); + + describe('toggle', function () { + beforeEach(function () { + this.dropdown = { hidden: true, show: () => {}, hide: () => {} }; + + spyOn(this.dropdown, 'show'); + spyOn(this.dropdown, 'hide'); + + DropDown.prototype.toggle.call(this.dropdown); + }); + + it('should call .show if hidden is true', function () { + expect(this.dropdown.show).toHaveBeenCalled(); + }); + + describe('if hidden is false', function () { + beforeEach(function () { + this.dropdown = { hidden: false, show: () => {}, hide: () => {} }; + + spyOn(this.dropdown, 'show'); + spyOn(this.dropdown, 'hide'); + + DropDown.prototype.toggle.call(this.dropdown); + }); + + it('should call .show if hidden is true', function () { + expect(this.dropdown.hide).toHaveBeenCalled(); + }); + }); + }); + + describe('setData', function () { + beforeEach(function () { + this.dropdown = { render: () => {} }; + this.data = ['data']; + + spyOn(this.dropdown, 'render'); + + DropDown.prototype.setData.call(this.dropdown, this.data); + }); + + it('should set .data', function () { + expect(this.dropdown.data).toBe(this.data); + }); + + it('should call .render with the .data', function () { + expect(this.dropdown.render).toHaveBeenCalledWith(this.data); + }); + }); + + describe('addData', function () { + beforeEach(function () { + this.dropdown = { render: () => {}, data: ['data1'] }; + this.data = ['data2']; + + spyOn(this.dropdown, 'render'); + spyOn(Array.prototype, 'concat').and.callThrough(); + + DropDown.prototype.addData.call(this.dropdown, this.data); + }); + + it('should call .concat with data', function () { + expect(Array.prototype.concat).toHaveBeenCalledWith(this.data); + }); + + it('should set .data with concatination', function () { + expect(this.dropdown.data).toEqual(['data1', 'data2']); + }); + + it('should call .render with the .data', function () { + expect(this.dropdown.render).toHaveBeenCalledWith(['data1', 'data2']); + }); + + describe('if .data is undefined', function () { + beforeEach(function () { + this.dropdown = { render: () => {}, data: undefined }; + this.data = ['data2']; + + spyOn(this.dropdown, 'render'); + + DropDown.prototype.addData.call(this.dropdown, this.data); + }); + + it('should set .data with concatination', function () { + expect(this.dropdown.data).toEqual(['data2']); + }); + }); + }); + + describe('render', function () { + beforeEach(function () { + this.list = { querySelector: () => {} }; + this.dropdown = { renderChildren: () => {}, list: this.list }; + this.renderableList = {}; + this.data = [0, 1]; + + spyOn(this.dropdown, 'renderChildren').and.callFake(data => data); + spyOn(this.list, 'querySelector').and.returnValue(this.renderableList); + spyOn(this.data, 'map').and.callThrough(); + + DropDown.prototype.render.call(this.dropdown, this.data); + }); + + it('should call .map', function () { + expect(this.data.map).toHaveBeenCalledWith(jasmine.any(Function)); + }); + + it('should call .renderChildren for each data item', function() { + expect(this.dropdown.renderChildren.calls.count()).toBe(this.data.length); + }); + + it('sets the renderableList .innerHTML', function () { + expect(this.renderableList.innerHTML).toBe('01'); + }); + + describe('if no data argument is passed' , function () { + beforeEach(function () { + this.data.map.calls.reset(); + this.dropdown.renderChildren.calls.reset(); + + DropDown.prototype.render.call(this.dropdown, undefined); + }); + + it('should not call .map', function () { + expect(this.data.map).not.toHaveBeenCalled(); + }); + + it('should not call .renderChildren', function () { + expect(this.dropdown.renderChildren).not.toHaveBeenCalled(); + }); + }); + + describe('if no dynamic list is present', function () { + beforeEach(function () { + this.list = { querySelector: () => {} }; + this.dropdown = { renderChildren: () => {}, list: this.list }; + this.data = [0, 1]; + + spyOn(this.dropdown, 'renderChildren').and.callFake(data => data); + spyOn(this.list, 'querySelector'); + spyOn(this.data, 'map').and.callThrough(); + + DropDown.prototype.render.call(this.dropdown, this.data); + }); + + it('sets the .list .innerHTML', function () { + expect(this.list.innerHTML).toBe('01'); + }); + }); + }); + + describe('renderChildren', function () { + beforeEach(function () { + this.templateString = 'templateString'; + this.dropdown = { setImagesSrc: () => {}, templateString: this.templateString }; + this.data = { droplab_hidden: true }; + this.html = 'html'; + this.template = { firstChild: { outerHTML: 'outerHTML', style: {} } }; + + spyOn(utils, 't').and.returnValue(this.html); + spyOn(document, 'createElement').and.returnValue(this.template); + spyOn(this.dropdown, 'setImagesSrc'); + + this.renderChildren = DropDown.prototype.renderChildren.call(this.dropdown, this.data); + }); + + it('should call utils.t with .templateString and data', function () { + expect(utils.t).toHaveBeenCalledWith(this.templateString, this.data); + }); + + it('should call document.createElement', function () { + expect(document.createElement).toHaveBeenCalledWith('div'); + }); + + it('should set the templates .innerHTML to the HTML', function () { + expect(this.template.innerHTML).toBe(this.html); + }); + + it('should call .setImagesSrc with the template', function () { + expect(this.dropdown.setImagesSrc).toHaveBeenCalledWith(this.template); + }); + + it('should set the template display to none', function () { + expect(this.template.firstChild.style.display).toBe('none'); + }); + + it('should return the templates .firstChild.outerHTML', function () { + expect(this.renderChildren).toBe(this.template.firstChild.outerHTML); + }); + + describe('if droplab_hidden is false', function () { + beforeEach(function () { + this.data = { droplab_hidden: false }; + this.renderChildren = DropDown.prototype.renderChildren.call(this.dropdown, this.data); + }); + + it('should set the template display to block', function () { + expect(this.template.firstChild.style.display).toBe('block'); + }); + }); + }); + + describe('setImagesSrc', function () { + beforeEach(function () { + this.dropdown = {}; + this.template = { querySelectorAll: () => {} }; + + spyOn(this.template, 'querySelectorAll').and.returnValue([]); + + DropDown.prototype.setImagesSrc.call(this.dropdown, this.template); + }); + + it('should call .querySelectorAll', function () { + expect(this.template.querySelectorAll).toHaveBeenCalledWith('img[data-src]'); + }); + }); + + describe('show', function () { + beforeEach(function () { + this.list = { style: {} }; + this.dropdown = { list: this.list, hidden: true }; + + DropDown.prototype.show.call(this.dropdown); + }); + + it('it should set .list display to block', function () { + expect(this.list.style.display).toBe('block'); + }); + + it('it should set .hidden to false', function () { + expect(this.dropdown.hidden).toBe(false); + }); + + describe('if .hidden is false', function () { + beforeEach(function () { + this.list = { style: {} }; + this.dropdown = { list: this.list, hidden: false }; + + this.show = DropDown.prototype.show.call(this.dropdown); + }); + + it('should return undefined', function () { + expect(this.show).toEqual(undefined); + }); + + it('should not set .list display to block', function () { + expect(this.list.style.display).not.toEqual('block'); + }); + }); + }); + + describe('hide', function () { + beforeEach(function () { + this.list = { style: {} }; + this.dropdown = { list: this.list }; + + DropDown.prototype.hide.call(this.dropdown); + }); + + it('it should set .list display to none', function () { + expect(this.list.style.display).toBe('none'); + }); + + it('it should set .hidden to true', function () { + expect(this.dropdown.hidden).toBe(true); + }); + }); + + describe('toggle', function () { + beforeEach(function () { + this.hidden = true + this.dropdown = { hidden: this.hidden, show: () => {}, hide: () => {} }; + + spyOn(this.dropdown, 'show'); + spyOn(this.dropdown, 'hide'); + + DropDown.prototype.toggle.call(this.dropdown); + }); + + it('should call .show', function () { + expect(this.dropdown.show).toHaveBeenCalled(); + }); + + describe('if .hidden is false', function () { + beforeEach(function () { + this.hidden = false + this.dropdown = { hidden: this.hidden, show: () => {}, hide: () => {} }; + + spyOn(this.dropdown, 'show'); + spyOn(this.dropdown, 'hide'); + + DropDown.prototype.toggle.call(this.dropdown); + }); + + it('should call .hide', function () { + expect(this.dropdown.hide).toHaveBeenCalled(); + }); + }); + }); + + describe('destroy', function () { + beforeEach(function () { + this.list = { removeEventListener: () => {} }; + this.eventWrapper = { clickEvent: 'clickEvent' }; + this.dropdown = { list: this.list, hide: () => {}, eventWrapper: this.eventWrapper }; + + spyOn(this.list, 'removeEventListener'); + spyOn(this.dropdown, 'hide'); + + DropDown.prototype.destroy.call(this.dropdown); + }); + + it('it should call .hide', function () { + expect(this.dropdown.hide).toHaveBeenCalled(); + }); + + it('it should call .removeEventListener', function () { + expect(this.list.removeEventListener).toHaveBeenCalledWith('click', this.eventWrapper.clickEvent); + }); + }); +}); diff --git a/spec/javascripts/droplab/hook.js b/spec/javascripts/droplab/hook.js new file mode 100644 index 00000000000..8ebdcdd1404 --- /dev/null +++ b/spec/javascripts/droplab/hook.js @@ -0,0 +1,82 @@ +/* eslint-disable */ + +import Hook from '~/droplab/hook'; +import * as dropdownSrc from '~/droplab/drop_down'; + +describe('Hook', function () { + describe('class constructor', function () { + beforeEach(function () { + this.trigger = { id: 'id' }; + this.list = {}; + this.plugins = {}; + this.config = {}; + this.dropdown = {}; + + spyOn(dropdownSrc, 'default').and.returnValue(this.dropdown); + + this.hook = new Hook(this.trigger, this.list, this.plugins, this.config); + }); + + it('should set .trigger', function () { + expect(this.hook.trigger).toBe(this.trigger); + }); + + it('should set .list', function () { + expect(this.hook.list).toBe(this.dropdown); + }); + + it('should call DropDown constructor', function () { + expect(dropdownSrc.default).toHaveBeenCalledWith(this.list); + }); + + it('should set .type', function () { + expect(this.hook.type).toBe('Hook'); + }); + + it('should set .event', function () { + expect(this.hook.event).toBe('click'); + }); + + it('should set .plugins', function () { + expect(this.hook.plugins).toBe(this.plugins); + }); + + it('should set .config', function () { + expect(this.hook.config).toBe(this.config); + }); + + it('should set .id', function () { + expect(this.hook.id).toBe(this.trigger.id); + }); + + describe('if config argument is undefined', function () { + beforeEach(function () { + this.config = undefined; + + this.hook = new Hook(this.trigger, this.list, this.plugins, this.config); + }); + + it('should set .config to an empty object', function () { + expect(this.hook.config).toEqual({}); + }); + }); + + describe('if plugins argument is undefined', function () { + beforeEach(function () { + this.plugins = undefined; + + this.hook = new Hook(this.trigger, this.list, this.plugins, this.config); + }); + + it('should set .plugins to an empty array', function () { + expect(this.hook.plugins).toEqual([]); + }); + }); + }); + + describe('addEvents', function () { + it('should exist', function () { + expect(Hook.prototype.hasOwnProperty('addEvents')).toBe(true); + }); + }); +}); diff --git a/spec/javascripts/droplab/plugins/input_setter.js b/spec/javascripts/droplab/plugins/input_setter.js new file mode 100644 index 00000000000..81bb70fa6e5 --- /dev/null +++ b/spec/javascripts/droplab/plugins/input_setter.js @@ -0,0 +1,177 @@ +/* eslint-disable */ + +import InputSetter from '~/droplab/plugins/input_setter'; + +describe('InputSetter', function () { + describe('init', function () { + beforeEach(function () { + this.config = { InputSetter: {} }; + this.hook = { config: this.config }; + this.inputSetter = jasmine.createSpyObj('inputSetter', ['addEvents']); + + InputSetter.init.call(this.inputSetter, this.hook); + }); + + it('should set .hook', function () { + expect(this.inputSetter.hook).toBe(this.hook); + }); + + it('should set .config', function () { + expect(this.inputSetter.config).toBe(this.config.InputSetter); + }); + + it('should set .eventWrapper', function () { + expect(this.inputSetter.eventWrapper).toEqual({}); + }); + + it('should call .addEvents', function () { + expect(this.inputSetter.addEvents).toHaveBeenCalled(); + }); + + describe('if config.InputSetter is not set', function () { + beforeEach(function () { + this.config = { InputSetter: undefined }; + this.hook = { config: this.config }; + + InputSetter.init.call(this.inputSetter, this.hook); + }); + + it('should set .config to an empty object', function () { + expect(this.inputSetter.config).toEqual({}); + }); + + it('should set hook.config to an empty object', function () { + expect(this.hook.config.InputSetter).toEqual({}); + }); + }) + }); + + describe('addEvents', function () { + beforeEach(function () { + this.hook = { list: { list: jasmine.createSpyObj('list', ['addEventListener']) } }; + this.inputSetter = { eventWrapper: {}, hook: this.hook, setInputs: () => {} }; + + InputSetter.addEvents.call(this.inputSetter); + }); + + it('should set .eventWrapper.setInputs', function () { + expect(this.inputSetter.eventWrapper.setInputs).toEqual(jasmine.any(Function)); + }); + + it('should call .addEventListener', function () { + expect(this.hook.list.list.addEventListener) + .toHaveBeenCalledWith('click.dl', this.inputSetter.eventWrapper.setInputs); + }); + }); + + describe('removeEvents', function () { + beforeEach(function () { + this.hook = { list: { list: jasmine.createSpyObj('list', ['removeEventListener']) } }; + this.eventWrapper = jasmine.createSpyObj('eventWrapper', ['setInputs']); + this.inputSetter = { eventWrapper: this.eventWrapper, hook: this.hook }; + + InputSetter.removeEvents.call(this.inputSetter); + }); + + it('should call .removeEventListener', function () { + expect(this.hook.list.list.removeEventListener) + .toHaveBeenCalledWith('click.dl', this.eventWrapper.setInputs); + }); + }); + + describe('setInputs', function () { + beforeEach(function () { + this.event = { detail: { selected: {} } }; + this.config = [0, 1]; + this.inputSetter = { config: this.config, setInput: () => {} }; + + spyOn(this.inputSetter, 'setInput'); + + InputSetter.setInputs.call(this.inputSetter, this.event); + }); + + it('should call .setInput for each config element', function () { + const allArgs = this.inputSetter.setInput.calls.allArgs(); + + expect(allArgs.length).toEqual(2); + + allArgs.forEach((args, i) => { + expect(args[0]).toBe(this.config[i]); + expect(args[1]).toBe(this.event.detail.selected); + }); + }); + + describe('if config isnt an array', function () { + beforeEach(function () { + this.inputSetter = { config: {}, setInput: () => {} }; + + InputSetter.setInputs.call(this.inputSetter, this.event); + }); + + it('should set .config to an array with .config as the first element', function () { + expect(this.inputSetter.config).toEqual([{}]); + }); + }); + }); + + describe('setInput', function () { + beforeEach(function () { + this.selectedItem = { getAttribute: () => {} }; + this.input = { value: 'oldValue', tagName: 'INPUT' }; + this.config = { valueAttribute: {}, input: this.input }; + this.inputSetter = { hook: { trigger: {} } }; + this.newValue = 'newValue'; + + spyOn(this.selectedItem, 'getAttribute').and.returnValue(this.newValue); + + InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem); + }); + + it('should call .getAttribute', function () { + expect(this.selectedItem.getAttribute).toHaveBeenCalledWith(this.config.valueAttribute); + }); + + it('should set the value of the input', function () { + expect(this.input.value).toBe(this.newValue); + }) + + describe('if no config.input is provided', function () { + beforeEach(function () { + this.config = { valueAttribute: {} }; + this.trigger = { value: 'oldValue', tagName: 'INPUT' }; + this.inputSetter = { hook: { trigger: this.trigger } }; + + InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem); + }); + + it('should set the value of the hook.trigger', function () { + expect(this.trigger.value).toBe(this.newValue); + }); + }); + + describe('if the input tag is not INPUT', function () { + beforeEach(function () { + this.input = { textContent: 'oldValue', tagName: 'SPAN' }; + this.config = { valueAttribute: {}, input: this.input }; + + InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem); + }); + + it('should set the textContent of the input', function () { + expect(this.config.input.textContent).toBe(this.newValue); + }); + }); + }); + + describe('destroy', function () { + beforeEach(function () { + this.inputSetter = jasmine.createSpyObj('inputSetter', ['removeEvents']); + + InputSetter.destroy.call(this.inputSetter); + }); + + it('should call .removeEvents', function () { + expect(this.inputSetter.removeEvents).toHaveBeenCalled(); + }); + }); +}); diff --git a/spec/javascripts/filtered_search/dropdown_user_spec.js b/spec/javascripts/filtered_search/dropdown_user_spec.js index c16f77c53a2..2b1fe5e3eef 100644 --- a/spec/javascripts/filtered_search/dropdown_user_spec.js +++ b/spec/javascripts/filtered_search/dropdown_user_spec.js @@ -33,7 +33,7 @@ require('~/filtered_search/dropdown_user'); }); }); - describe('config droplabAjaxFilter\'s endpoint', () => { + describe('config AjaxFilter\'s endpoint', () => { beforeEach(() => { spyOn(gl.DropdownUser.prototype, 'bindEvents').and.callFake(() => {}); spyOn(gl.DropdownUser.prototype, 'getProjectId').and.callFake(() => {}); @@ -45,13 +45,13 @@ require('~/filtered_search/dropdown_user'); }; const dropdown = new gl.DropdownUser(); - expect(dropdown.config.droplabAjaxFilter.endpoint).toBe('/autocomplete/users.json'); + expect(dropdown.config.AjaxFilter.endpoint).toBe('/autocomplete/users.json'); }); it('should return endpoint when relative_url_root is undefined', () => { const dropdown = new gl.DropdownUser(); - expect(dropdown.config.droplabAjaxFilter.endpoint).toBe('/autocomplete/users.json'); + expect(dropdown.config.AjaxFilter.endpoint).toBe('/autocomplete/users.json'); }); it('should return endpoint with relative url when available', () => { @@ -60,7 +60,7 @@ require('~/filtered_search/dropdown_user'); }; const dropdown = new gl.DropdownUser(); - expect(dropdown.config.droplabAjaxFilter.endpoint).toBe('/gitlab_directory/autocomplete/users.json'); + expect(dropdown.config.AjaxFilter.endpoint).toBe('/gitlab_directory/autocomplete/users.json'); }); afterEach(() => { diff --git a/yarn.lock b/yarn.lock index 96584a6d111..ea639fa0523 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,12 +2,6 @@ # yarn lockfile v1 -"@gitlab-org/droplab@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@gitlab-org/droplab/-/droplab-0.1.0.tgz#934889d0f19417198e277415fdd336616b2e2c87" - dependencies: - custom-event-polyfill "^0.3.0" - abbrev@1, abbrev@1.0.x: version "1.0.9" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" @@ -1307,10 +1301,6 @@ crypto-browserify@^3.11.0: public-encrypt "^4.0.0" randombytes "^2.0.0" -custom-event-polyfill@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/custom-event-polyfill/-/custom-event-polyfill-0.3.0.tgz#99807839be62edb446b645832e0d80ead6fa1888" - custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" @@ -3773,7 +3763,7 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6: +"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6: version "2.2.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816" dependencies: @@ -3785,6 +3775,17 @@ read-pkg@^1.0.0: string_decoder "~0.10.x" util-deprecate "~1.0.1" +readable-stream@^2.0.1, readable-stream@^2.0.5, readable-stream@~2.0.0, readable-stream@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + string_decoder "~0.10.x" + util-deprecate "~1.0.1" + readable-stream@~1.0.2: version "1.0.34" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" @@ -3794,17 +3795,6 @@ readable-stream@~1.0.2: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@~2.0.0, readable-stream@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - readdirp@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" From 2a18425e97023b05aa52c29dbce6c5a7aa7400b7 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 6 Apr 2017 13:04:57 +0100 Subject: [PATCH 43/70] phil review changes --- app/assets/javascripts/comment_type_toggle.js | 24 +++++++++---------- app/assets/javascripts/gl_form.js | 5 +--- app/assets/javascripts/main.js | 2 +- app/assets/javascripts/notes.js | 12 ++-------- app/assets/stylesheets/pages/note_form.scss | 2 ++ .../notes/_comment_type_button.html.haml | 4 ++-- 6 files changed, 20 insertions(+), 29 deletions(-) diff --git a/app/assets/javascripts/comment_type_toggle.js b/app/assets/javascripts/comment_type_toggle.js index 2110d19a9ea..4578c3a4ec0 100644 --- a/app/assets/javascripts/comment_type_toggle.js +++ b/app/assets/javascripts/comment_type_toggle.js @@ -2,37 +2,37 @@ import DropLab from '@gitlab-org/droplab'; import InputSetter from '@gitlab-org/droplab/dist/plugins/InputSetter'; class CommentTypeToggle { - constructor(trigger, list, input, button, secondaryButton) { - this.trigger = trigger; - this.list = list; - this.input = input; - this.button = button; - this.secondaryButton = secondaryButton; + constructor(dropdownTrigger, dropdownList, noteTypeInput, submitButton, closeButton) { + this.dropdownTrigger = dropdownTrigger; + this.dropdownList = dropdownList; + this.noteTypeInput = noteTypeInput; + this.submitButton = submitButton; + this.closeButton = closeButton; } initDroplab() { this.droplab = new DropLab(); const inputSetterConfig = [{ - input: this.input, + input: this.noteTypeInput, valueAttribute: 'data-value', }, { - input: this.button, + input: this.submitButton, valueAttribute: 'data-button-text', }]; - if (this.secondaryButton) { + if (this.closeButton) { inputSetterConfig.push({ - input: this.secondaryButton, + input: this.closeButton, valueAttribute: 'data-secondary-button-text', }, { - input: this.secondaryButton, + input: this.closeButton, valueAttribute: 'data-secondary-button-text', inputAttribute: 'data-alternative-text', }); } - this.droplab.init(this.trigger, this.list, [InputSetter], { + this.droplab.init(this.dropdownTrigger, this.dropdownList, [InputSetter], { InputSetter: inputSetterConfig }); } diff --git a/app/assets/javascripts/gl_form.js b/app/assets/javascripts/gl_form.js index 1930f93f67e..ff10f19a4fe 100644 --- a/app/assets/javascripts/gl_form.js +++ b/app/assets/javascripts/gl_form.js @@ -29,10 +29,7 @@ GLForm.prototype.setupForm = function() { this.form.find('.div-dropzone').remove(); this.form.addClass('gfm-form'); // remove notify commit author checkbox for non-commit notes - gl.utils.disableButtonIfEmptyField(this.form.find('.js-note-text'), this.form.find('.js-comment-button')); - - const newDiscussionToggle = this.form.find('.js-note-new-discussion'); - if (newDiscussionToggle) gl.utils.disableButtonIfEmptyField(this.form.find('.js-note-text'), newDiscussionToggle); + gl.utils.disableButtonIfEmptyField(this.form.find('.js-note-text'), this.form.find('.js-comment-button, .js-note-new-discussion')); gl.GfmAutoComplete.setup(this.form.find('.js-gfm-input')); new DropzoneInput(this.form); diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 177cf66b37d..3f92d4ee6cf 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -279,7 +279,7 @@ $(function () { // Disable form buttons while a form is submitting $body.on('ajax:complete, ajax:beforeSend, submit', 'form', function (e) { var buttons; - buttons = $('[type="submit"]', this); + buttons = $('[type="submit"], .js-disable-on-submit', this); switch (e.type) { case 'ajax:beforeSend': case 'submit': diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index e22232af800..e2fec904d71 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -111,18 +111,10 @@ require('./task_list'); $(document).on("visibilitychange", this.visibilityChange); // when issue status changes, we need to refresh data $(document).on("issuable:change", this.refresh); - - $(document).on('submit', '.js-main-target-form', this.disableDropdown) - // when a key is clicked on the notes return $(document).on("keydown", ".js-note-text", this.keydownNoteText); }; - Notes.prototype.disableDropdown = function(e) { - const $form = $(e.target); - $form.find('.js-note-new-discussion').disable(); - }; - Notes.prototype.cleanBinding = function() { $(document).off("ajax:success", ".js-main-target-form"); $(document).off("ajax:success", ".js-discussion-note-form"); @@ -149,9 +141,9 @@ require('./task_list'); this.commentTypeToggle = new CommentTypeToggle( form.querySelector('.js-comment-type-dropdown .dropdown-toggle'), form.querySelector('.js-comment-type-dropdown .dropdown-menu'), - document.querySelector('.js-main-target-form #note_type'), + form.querySelector('#note_type'), form.querySelector('.js-comment-type-dropdown .js-comment-submit-button'), - document.querySelector('.js-main-target-form .js-note-target-close'), + form.querySelector('.js-note-target-close'), ); this.commentTypeToggle.initDroplab(); diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 8bc988b40cb..32907e4004e 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -312,6 +312,8 @@ } .comment-type-dropdown { + background: red; + .dropdown-toggle .fa { color: $white-light; padding-right: 2px; diff --git a/app/views/projects/notes/_comment_type_button.html.haml b/app/views/projects/notes/_comment_type_button.html.haml index 2a851d57fd6..1444a9d1b65 100644 --- a/app/views/projects/notes/_comment_type_button.html.haml +++ b/app/views/projects/notes/_comment_type_button.html.haml @@ -3,10 +3,10 @@ .pull-left.btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown %input.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button{ type: 'submit', value: 'Comment' } - if @note.can_be_discussion_note? - = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-note-new-discussion', data: { 'dropdown-trigger' => '#resolvable-comment-menu' } do + = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-note-new-discussion js-disable-on-submit', data: { 'dropdown-trigger' => '#resolvable-comment-menu' }, 'aria-label' => 'Open comment type dropdown' do = icon('caret-down') %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } } - %li#comment{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => 'Comment & close merge request' }, class: 'droplab-item-selected' } + %li#comment.droplab-item-selected{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => "Comment & close #{noteable_type.titleize.downcase}" } } = icon('check') .description %strong Comment From 66d03aae98cc0429d2ed75eac68025f447868479 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 6 Apr 2017 13:42:18 +0100 Subject: [PATCH 44/70] Fixed error handling --- app/assets/javascripts/droplab/plugins/ajax.js | 8 +------- .../javascripts/droplab/plugins/ajax_filter.js | 2 +- .../filtered_search/dropdown_non_user.js | 7 +++++++ .../javascripts/filtered_search/dropdown_user.js | 7 +++++++ .../filtered_search/dropdown_milestone_spec.rb | 14 +++++++------- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/app/assets/javascripts/droplab/plugins/ajax.js b/app/assets/javascripts/droplab/plugins/ajax.js index f08b638fc62..12afe53ed76 100644 --- a/app/assets/javascripts/droplab/plugins/ajax.js +++ b/app/assets/javascripts/droplab/plugins/ajax.js @@ -1,9 +1,5 @@ /* eslint-disable */ -function droplabAjaxException(message) { - this.message = message; -} - const Ajax = { _loadUrlData: function _loadUrlData(url) { var self = this; @@ -58,9 +54,7 @@ const Ajax = { this._loadUrlData(config.endpoint) .then(function(d) { self._loadData(d, config, self); - }, config.onError).catch(function(e) { - throw new droplabAjaxException(e.message || e); - }); + }, config.onError).catch(config.onError); } }, destroy: function() { diff --git a/app/assets/javascripts/droplab/plugins/ajax_filter.js b/app/assets/javascripts/droplab/plugins/ajax_filter.js index 7fe221e101f..cfd7e2ca189 100644 --- a/app/assets/javascripts/droplab/plugins/ajax_filter.js +++ b/app/assets/javascripts/droplab/plugins/ajax_filter.js @@ -68,7 +68,7 @@ const AjaxFilter = { this._loadUrlData(url) .then(function(data) { self._loadData(data, config, self); - }, config.onError); + }, config.onError).catch(config.onError); } }, diff --git a/app/assets/javascripts/filtered_search/dropdown_non_user.js b/app/assets/javascripts/filtered_search/dropdown_non_user.js index 35c76dff79a..6296965b911 100644 --- a/app/assets/javascripts/filtered_search/dropdown_non_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_non_user.js @@ -1,3 +1,5 @@ +/* global Flash */ + import Ajax from '~/droplab/plugins/ajax'; import Filter from '~/droplab/plugins/filter'; @@ -13,6 +15,11 @@ require('./filtered_search_dropdown'); endpoint, method: 'setData', loadingTemplate: this.loadingTemplate, + onError() { + /* eslint-disable no-new */ + new Flash('An error occured fetching the dropdown data.'); + /* eslint-enable no-new */ + }, }, Filter: { filterFunction: gl.DropdownUtils.filterWithSymbol.bind(null, this.symbol, input), diff --git a/app/assets/javascripts/filtered_search/dropdown_user.js b/app/assets/javascripts/filtered_search/dropdown_user.js index 4f9f25c1f1b..38b5d315bcf 100644 --- a/app/assets/javascripts/filtered_search/dropdown_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_user.js @@ -1,3 +1,5 @@ +/* global Flash */ + import AjaxFilter from '~/droplab/plugins/ajax_filter'; require('./filtered_search_dropdown'); @@ -18,6 +20,11 @@ require('./filtered_search_dropdown'); }, searchValueFunction: this.getSearchInput.bind(this), loadingTemplate: this.loadingTemplate, + onError() { + /* eslint-disable no-new */ + new Flash('An error occured fetching the dropdown data.'); + /* eslint-enable no-new */ + }, }, }; } diff --git a/spec/features/issues/filtered_search/dropdown_milestone_spec.rb b/spec/features/issues/filtered_search/dropdown_milestone_spec.rb index ce96a420699..cf5259b878d 100644 --- a/spec/features/issues/filtered_search/dropdown_milestone_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_milestone_spec.rb @@ -65,7 +65,7 @@ describe 'Dropdown milestone', :feature, :js do it 'should load all the milestones when opened' do filtered_search.set('milestone:') - expect(dropdown_milestone_size).to be > 0 + expect(filter_dropdown).to have_selector('.filter-dropdown .filter-dropdown-item', count: 6) end end @@ -84,37 +84,37 @@ describe 'Dropdown milestone', :feature, :js do it 'filters by name' do filtered_search.send_keys('v1') - expect(dropdown_milestone_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown .filter-dropdown-item', count: 1) end it 'filters by case insensitive name' do filtered_search.send_keys('V1') - expect(dropdown_milestone_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown .filter-dropdown-item', count: 1) end it 'filters by name with symbol' do filtered_search.send_keys('%v1') - expect(dropdown_milestone_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown .filter-dropdown-item', count: 1) end it 'filters by case insensitive name with symbol' do filtered_search.send_keys('%V1') - expect(dropdown_milestone_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown .filter-dropdown-item', count: 1) end it 'filters by special characters' do filtered_search.send_keys('(+') - expect(dropdown_milestone_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown .filter-dropdown-item', count: 1) end it 'filters by special characters with symbol' do filtered_search.send_keys('%(+') - expect(dropdown_milestone_size).to eq(1) + expect(filter_dropdown).to have_selector('.filter-dropdown .filter-dropdown-item', count: 1) end end From 99e4431c682dc79880b28b90b0c39507df22e1d1 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 6 Apr 2017 14:48:10 +0100 Subject: [PATCH 45/70] Update unit tests --- app/assets/javascripts/comment_type_toggle.js | 6 +- app/assets/javascripts/notes.js | 4 +- ...discussion_spec.rb => discussions_spec.rb} | 0 spec/javascripts/comment_type_toggle_spec.js | 107 +++++++++++++----- 4 files changed, 81 insertions(+), 36 deletions(-) rename spec/features/merge_requests/{discussion_spec.rb => discussions_spec.rb} (100%) diff --git a/app/assets/javascripts/comment_type_toggle.js b/app/assets/javascripts/comment_type_toggle.js index 4578c3a4ec0..34878f90050 100644 --- a/app/assets/javascripts/comment_type_toggle.js +++ b/app/assets/javascripts/comment_type_toggle.js @@ -1,5 +1,5 @@ -import DropLab from '@gitlab-org/droplab'; -import InputSetter from '@gitlab-org/droplab/dist/plugins/InputSetter'; +import DropLab from '~/droplab/drop_lab'; +import InputSetter from '~/droplab/plugins/input_setter'; class CommentTypeToggle { constructor(dropdownTrigger, dropdownList, noteTypeInput, submitButton, closeButton) { @@ -33,7 +33,7 @@ class CommentTypeToggle { } this.droplab.init(this.dropdownTrigger, this.dropdownList, [InputSetter], { - InputSetter: inputSetterConfig + InputSetter: inputSetterConfig, }); } } diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index e2fec904d71..66e89b7607a 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -738,7 +738,7 @@ require('./task_list'); Notes.prototype.replyToDiscussionNote = function(e) { var form, replyLink; - form = this.cleanForm(this.formClone.clone()); + form = this.cleanForm(this.formClone.clone()); replyLink = $(e.target).closest(".js-discussion-reply-button"); // insert the form after the button replyLink @@ -1060,7 +1060,7 @@ require('./task_list'); .remove(); return $form; - } + }; return Notes; })(); diff --git a/spec/features/merge_requests/discussion_spec.rb b/spec/features/merge_requests/discussions_spec.rb similarity index 100% rename from spec/features/merge_requests/discussion_spec.rb rename to spec/features/merge_requests/discussions_spec.rb diff --git a/spec/javascripts/comment_type_toggle_spec.js b/spec/javascripts/comment_type_toggle_spec.js index d68c221f0ea..818c1635710 100644 --- a/spec/javascripts/comment_type_toggle_spec.js +++ b/spec/javascripts/comment_type_toggle_spec.js @@ -1,79 +1,124 @@ import CommentTypeToggle from '~/comment_type_toggle'; -import DropLab from '@gitlab-org/droplab'; -import InputSetter from '@gitlab-org/droplab/dist/plugins/InputSetter'; +import * as dropLabSrc from '~/droplab/drop_lab'; +import InputSetter from '~/droplab/plugins/input_setter'; describe('CommentTypeToggle', function () { describe('class constructor', function () { beforeEach(function () { - this.trigger = {}; - this.list = {}; - this.input = {}; - this.button = {}; + this.dropdownTrigger = {}; + this.dropdownList = {}; + this.noteTypeInput = {}; + this.submitButton = {}; + this.closeButton = {}; this.commentTypeToggle = new CommentTypeToggle( - this.trigger, - this.list, - this.input, - this.button, + this.dropdownTrigger, + this.dropdownList, + this.noteTypeInput, + this.submitButton, + this.closeButton, ); }); - it('should set .trigger', function () { - expect(this.commentTypeToggle.trigger).toBe(this.trigger); + it('should set .dropdownTrigger', function () { + expect(this.commentTypeToggle.dropdownTrigger).toBe(this.dropdownTrigger); }); - it('should set .list', function () { - expect(this.commentTypeToggle.list).toBe(this.list); + it('should set .dropdownList', function () { + expect(this.commentTypeToggle.dropdownList).toBe(this.dropdownList); }); - it('should set .input', function () { - expect(this.commentTypeToggle.input).toBe(this.input); + it('should set .noteTypeInput', function () { + expect(this.commentTypeToggle.noteTypeInput).toBe(this.noteTypeInput); }); - it('should set .button', function () { - expect(this.commentTypeToggle.button).toBe(this.button); + it('should set .submitButton', function () { + expect(this.commentTypeToggle.submitButton).toBe(this.submitButton); + }); + + it('should set .closeButton', function () { + expect(this.commentTypeToggle.closeButton).toBe(this.closeButton); }); }); describe('initDroplab', function () { beforeEach(function () { this.commentTypeToggle = { - trigger: {}, - list: {}, - input: {}, - button: {}, + dropdownTrigger: {}, + dropdownList: {}, + noteTypeInput: {}, + submitButton: {}, + closeButton: {}, }; - this.droplab = jasmine.createSpyObj('droplab', ['addHook']); + this.droplab = jasmine.createSpyObj('droplab', ['init']); - spyOn(window, 'DropLab').and.returnValue(this.droplab); + spyOn(dropLabSrc, 'default').and.returnValue(this.droplab); this.initDroplab = CommentTypeToggle.prototype.initDroplab.call(this.commentTypeToggle); }); it('should instantiate a DropLab instance', function () { - expect(window.DropLab).toHaveBeenCalled(); + expect(dropLabSrc.default).toHaveBeenCalled(); }); it('should set .droplab', function () { expect(this.commentTypeToggle.droplab).toBe(this.droplab); }); - it('should call DropLab.prototype.addHook', function () { - expect(this.droplab.addHook).toHaveBeenCalledWith( - this.commentTypeToggle.trigger, - this.commentTypeToggle.list, + it('should call DropLab.prototype.init', function () { + expect(this.droplab.init).toHaveBeenCalledWith( + this.commentTypeToggle.dropdownTrigger, + this.commentTypeToggle.dropdownList, [InputSetter], { InputSetter: [{ - input: this.commentTypeToggle.input, + input: this.commentTypeToggle.noteTypeInput, valueAttribute: 'data-value', }, { - input: this.commentTypeToggle.button, + input: this.commentTypeToggle.submitButton, valueAttribute: 'data-button-text', + }, + { + input: this.commentTypeToggle.closeButton, + valueAttribute: 'data-secondary-button-text', + }, { + input: this.commentTypeToggle.closeButton, + valueAttribute: 'data-secondary-button-text', + inputAttribute: 'data-alternative-text', }], }, ); }); + + describe('if no .closeButton is provided', function () { + beforeEach(function () { + this.commentTypeToggle = { + dropdownTrigger: {}, + dropdownList: {}, + noteTypeInput: {}, + submitButton: {}, + }; + + this.initDroplab = CommentTypeToggle.prototype.initDroplab.call(this.commentTypeToggle); + }); + + it('should not add .closeButton related InputSetter config', function () { + expect(this.droplab.init).toHaveBeenCalledWith( + this.commentTypeToggle.dropdownTrigger, + this.commentTypeToggle.dropdownList, + [InputSetter], + { + InputSetter: [{ + input: this.commentTypeToggle.noteTypeInput, + valueAttribute: 'data-value', + }, { + input: this.commentTypeToggle.submitButton, + valueAttribute: 'data-button-text', + }], + }, + ); + }); + }); }); }); From abefedf53f9a35155cf5c674af56a0fd71b19724 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 6 Apr 2017 15:56:51 +0100 Subject: [PATCH 46/70] Correct dropdown width --- app/assets/stylesheets/pages/note_form.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 32907e4004e..c7582619d97 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -324,7 +324,7 @@ .dropdown-menu { top: initial; bottom: 40px; - width: 297px; + width: 298px; } .description { From 397b9c8e500376fda1966a445a478c918f97e405 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 6 Apr 2017 16:00:18 +0100 Subject: [PATCH 47/70] Add feature specs --- spec/features/discussion_comments_spec.rb | 246 ++++++++++++++++++ .../merge_requests/discussions_spec.rb | 4 - 2 files changed, 246 insertions(+), 4 deletions(-) create mode 100644 spec/features/discussion_comments_spec.rb delete mode 100644 spec/features/merge_requests/discussions_spec.rb diff --git a/spec/features/discussion_comments_spec.rb b/spec/features/discussion_comments_spec.rb new file mode 100644 index 00000000000..b2a117fd067 --- /dev/null +++ b/spec/features/discussion_comments_spec.rb @@ -0,0 +1,246 @@ +require 'spec_helper' + +shared_examples 'discussion comments' do |resource_name| + let(:form_selector) { '.js-main-target-form' } + let(:dropdown_selector) { "#{form_selector} .comment-type-dropdown" } + let(:toggle_selector) { "#{dropdown_selector} .dropdown-toggle" } + let(:menu_selector) { "#{dropdown_selector} .dropdown-menu" } + let(:submit_selector) { "#{form_selector} .js-comment-submit-button" } + let(:close_selector) { "#{form_selector} .btn-comment-and-close" } + + it 'should show a comment type toggle' do + expect(page).to have_selector toggle_selector + end + + describe 'when the toggle is clicked' do + before do + find("#{form_selector} .note-textarea").send_keys('a') + + find(toggle_selector).click + end + + it 'opens a comment type dropdown with "Comment" and "Start discussion"' do + expect(page).to have_selector menu_selector + end + + it 'has a "Comment" item' do + menu = find(menu_selector) + + expect(menu).to have_content 'Comment' + expect(menu).to have_content 'Add a general comment to this issue.' + end + + it 'has a "Start discussion" item' do + menu = find(menu_selector) + + expect(menu).to have_content 'Start discussion' + expect(menu).to have_content 'Discuss a specific suggestion or question.' + end + + it 'has the "Comment" item selected by default' do + find("#{menu_selector} li") + items = all("#{menu_selector} li") + + expect(items.first).to have_content 'Comment' + expect(items.first).to have_selector '.fa-check' + expect(items.first).to have_selector '.droplab-item-selected' + + expect(items.last).to have_content 'Start discussion' + expect(items.last).not_to have_selector '.fa-check' + expect(items.last).not_to have_selector '.droplab-item-selected' + end + + it '"Comment" will post a comment' do + find(submit_selector).click + + find('.timeline .timeline-entry') + new_comment = all('.timeline .timeline-entry').last + + expect(new_comment).to have_content 'a' + expect(new_comment).not_to have_selector '.discussion' + end + + if resource_name =~ /(issue|merge request)/ + it "Comment & close' will post a comment and close the #{resource_name}" do + find(close_selector).click + + find('.timeline .timeline-entry') + entries = all('.timeline .timeline-entry') + close_note = entries.last + new_comment = entries[-2] + + expect(close_note).to have_content 'closed' + expect(new_comment).not_to have_selector '.discussion' + end + end + + it 'closes the menu when clicking the toggle' do + find(toggle_selector).click + + expect(page).not_to have_selector menu_selector + end + + it 'closes the menu when clicking the body' do + find('body').click + + expect(page).not_to have_selector menu_selector + end + + describe 'when selecting "Start discussion"' do + before do + find("#{menu_selector} li") + first("#{menu_selector} li").click + end + + it 'updates the note_type input to "DiscussionNote"' do + expect(find("#{form_selector} #note_type").value).to be 'DiscussionNote' + end + + it 'updates the submit button text' do + expect(find(dropdown_selector)).to have_content "Start discussion" + end + + if resource_name =~ /(issue|merge request)/ + it 'updates the close button text' do + expect(find(close_selector)).to have_content "Start discussion & close #{resource_name}" + end + end + + it 'closes the dropdown' do + expect(page).not_to have_selector menu_selector + end + + it '"Start discussion" will post a discussion' do + find(submit_selector).click + + find('.timeline .timeline-entry') + new_comment = all('.timeline .timeline-entry').last + + expect(new_comment).to have_content 'a' + expect(new_comment).to have_selector '.discussion' + end + + if resource_name =~ /(issue|merge request)/ + it "'Start discussion & close' will post a discussion and close the #{resource_name}" do + find(close_selector).click + + find('.timeline .timeline-entry') + entries = all('.timeline .timeline-entry') + close_note = entries.last + new_discussion = entries[-2] + + expect(close_note).to have_content 'closed' + expect(new_discussion).to have_selector '.discussion' + end + end + + describe 'when opening the menu' do + before do + find(toggle_selector).click + end + + it 'should have "Start discussion" selected' do + find("#{menu_selector} li") + items = all("#{menu_selector} li") + + expect(items.first).to have_content 'Comment' + expect(items.first).not_to have_selector '.fa-check' + expect(items.first).not_to have_selector '.droplab-item-selected' + + expect(items.last).to have_content 'Start discussion' + expect(items.last).to have_selector '.fa-check' + expect(items.last).to have_selector '.droplab-item-selected' + end + + describe 'when selecting "Comment"' do + before do + find("#{menu_selector} li") + all("#{menu_selector} li").last.click + end + + it 'clears the note_type input"' do + expect(find("#{form_selector} #note_type").value).to be '' + end + + it 'updates the submit button text' do + expect(find(dropdown_selector)).to have_content "Comment" + end + + if resource_name =~ /(issue|merge request)/ + it 'updates the close button text' do + expect(find(close_selector)).to have_content "Comment & close #{resource_name}" + end + end + + it 'closes the dropdown' do + expect(page).not_to have_selector menu_selector + end + + it 'should have "Comment" selected when opening the menu' do + find(toggle_selector).click + + find("#{menu_selector} li") + items = all("#{menu_selector} li") + + expect(items.first).to have_content 'Comment' + expect(items.first).to have_selector '.fa-check' + expect(items.first).to have_selector '.droplab-item-selected' + + expect(items.last).to have_content 'Start discussion' + expect(items.last).not_to have_selector '.fa-check' + expect(items.last).not_to have_selector '.droplab-item-selected' + end + end + end + end + end +end + +describe 'Discussion Comments', :feature, :js do + include RepoHelpers + + let(:user) { create(:user) } + let(:project) { create(:project) } + + before do + login_as(user) + end + + describe 'on a merge request' do + let(:merge_request) { create(:merge_request, source_project: project) } + + before do + visit namespace_project_merge_request_path(project.namespace, project, merge_request) + end + + it_behaves_like 'discussion comments', 'merge request' + end + + describe 'on an issue' do + let(:issue) { create(:issue, project: project) } + + before do + visit namespace_project_issue_path(project.namespace, project, issue) + end + + it_behaves_like 'discussion comments', 'issue' + end + + describe 'on an snippet' do + let(:snippet) { create(:personal_snippet, :public, author: user) } + + before do + visit snippet_path(snippet) + end + + it_behaves_like 'discussion comments', 'snippet' + end + + describe 'on a commit' do + before do + visit namespace_project_commit_path(project.namespace, project, sample_commit.id) + end + + it_behaves_like 'discussion comments', 'commit' + end +end diff --git a/spec/features/merge_requests/discussions_spec.rb b/spec/features/merge_requests/discussions_spec.rb deleted file mode 100644 index 1288584749d..00000000000 --- a/spec/features/merge_requests/discussions_spec.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'spec_helper' - -describe 'Merge Request Discussions', :feature, :js do -end From 64c1735c22871d94e0bda8b9f5aece2a29739236 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Thu, 6 Apr 2017 10:35:50 -0500 Subject: [PATCH 48/70] Remove unnecesary style --- app/assets/stylesheets/pages/note_form.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index c7582619d97..09c178c5a14 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -312,8 +312,6 @@ } .comment-type-dropdown { - background: red; - .dropdown-toggle .fa { color: $white-light; padding-right: 2px; From cc656a11992483911cefe035d579096581cfde57 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 6 Apr 2017 10:05:57 -0500 Subject: [PATCH 49/70] Refactor resolvability checks based on type --- app/models/concerns/issuable.rb | 11 -------- app/models/concerns/noteable.rb | 25 +++++++++++++++++ app/models/concerns/resolvable_discussion.rb | 7 ++--- app/models/concerns/resolvable_note.rb | 12 ++++---- app/models/diff_discussion.rb | 6 ++++ app/models/diff_note.rb | 2 ++ app/models/discussion.rb | 6 ++++ app/models/discussion_note.rb | 6 ++-- app/models/individual_note_discussion.rb | 6 ++-- app/models/legacy_diff_discussion.rb | 7 +++-- app/models/legacy_diff_note.rb | 3 ++ app/models/note.rb | 9 +++--- app/models/out_of_context_discussion.rb | 8 ++++-- app/services/issues/build_service.rb | 8 ++++-- .../projects/notes/_comment_button.html.haml | 28 +++++++++++++++++++ .../notes/_comment_type_button.html.haml | 28 ------------------- app/views/projects/notes/_form.html.haml | 2 +- 17 files changed, 107 insertions(+), 67 deletions(-) create mode 100644 app/views/projects/notes/_comment_button.html.haml delete mode 100644 app/views/projects/notes/_comment_type_button.html.haml diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index b4dded7e27e..3d2258d5e3e 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -292,17 +292,6 @@ module Issuable self.class.to_ability_name end - # Convert this Issuable class name to a format usable by notifications. - # - # Examples: - # - # issuable.class # => MergeRequest - # issuable.human_class_name # => "merge request" - - def human_class_name - @human_class_name ||= self.class.name.titleize.downcase - end - # Returns a Hash of attributes to be used for Twitter card metadata def card_attributes { diff --git a/app/models/concerns/noteable.rb b/app/models/concerns/noteable.rb index 631df4757a4..772ff6a6d2f 100644 --- a/app/models/concerns/noteable.rb +++ b/app/models/concerns/noteable.rb @@ -1,4 +1,29 @@ module Noteable + # Names of all implementers of `Noteable` that support resolvable notes. + RESOLVABLE_TYPES = %w(MergeRequest).freeze + + def base_class_name + self.class.base_class.name + end + + # Convert this Noteable class name to a format usable by notifications. + # + # Examples: + # + # noteable.class # => MergeRequest + # noteable.human_class_name # => "merge request" + def human_class_name + @human_class_name ||= base_class_name.titleize.downcase + end + + def supports_resolvable_notes? + RESOLVABLE_TYPES.include?(base_class_name) + end + + def supports_discussions? + DiscussionNote::NOTEABLE_TYPES.include?(base_class_name) + end + def discussion_notes notes end diff --git a/app/models/concerns/resolvable_discussion.rb b/app/models/concerns/resolvable_discussion.rb index 5cb51196a94..dd979e7bb17 100644 --- a/app/models/concerns/resolvable_discussion.rb +++ b/app/models/concerns/resolvable_discussion.rb @@ -20,6 +20,8 @@ module ResolvableDiscussion :last_note ) + delegate :potentially_resolvable?, to: :first_note + delegate :resolved_at, :resolved_by, @@ -27,11 +29,6 @@ module ResolvableDiscussion allow_nil: true end - # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote` - def potentially_resolvable? - for_merge_request? - end - def resolvable? return @resolvable if @resolvable.present? diff --git a/app/models/concerns/resolvable_note.rb b/app/models/concerns/resolvable_note.rb index 2c70678429a..05eb6f86704 100644 --- a/app/models/concerns/resolvable_note.rb +++ b/app/models/concerns/resolvable_note.rb @@ -1,6 +1,7 @@ module ResolvableNote extend ActiveSupport::Concern + # Names of all subclasses of `Note` that can be resolvable. RESOLVABLE_TYPES = %w(DiffNote DiscussionNote).freeze included do @@ -8,10 +9,8 @@ module ResolvableNote validates :resolved_by, presence: true, if: :resolved? - # Keep this scope in sync with the logic in `#potentially_resolvable?` in subclasses of `Discussion` that are resolvable. - # `RESOLVABLE_TYPES` should include names of all subclasses that are resolvable (where the method can return true), and - # the scope should also match the criteria `ResolvableDiscussion#potentially_resolvable?` puts on resolvability. - scope :potentially_resolvable, -> { where(type: RESOLVABLE_TYPES).where(noteable_type: 'MergeRequest') } + # Keep this scope in sync with `#potentially_resolvable?` + scope :potentially_resolvable, -> { where(type: RESOLVABLE_TYPES).where(noteable_type: Noteable::RESOLVABLE_TYPES) } # Keep this scope in sync with `#resolvable?` scope :resolvable, -> { potentially_resolvable.user } @@ -31,7 +30,10 @@ module ResolvableNote end end - delegate :potentially_resolvable?, to: :to_discussion + # Keep this method in sync with the `potentially_resolvable` scope + def potentially_resolvable? + RESOLVABLE_TYPES.include?(self.class.name) && noteable.supports_resolvable_notes? + end # Keep this method in sync with the `resolvable` scope def resolvable? diff --git a/app/models/diff_discussion.rb b/app/models/diff_discussion.rb index 22912b30c6a..d9b7e484e0f 100644 --- a/app/models/diff_discussion.rb +++ b/app/models/diff_discussion.rb @@ -1,7 +1,13 @@ # A discussion on merge request or commit diffs consisting of `DiffNote` notes. +# +# A discussion of this type can be resolvable. class DiffDiscussion < Discussion include DiscussionOnDiff + def self.note_class + DiffNote + end + delegate :position, :original_position, diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index 9185a5a0ad8..1523244f8a8 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -1,4 +1,6 @@ # A note on merge request or commit diffs +# +# A note of this type can be resolvable. class DiffNote < Note include NoteOnDiff diff --git a/app/models/discussion.rb b/app/models/discussion.rb index 8268a140403..2c0e6379e6a 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -1,4 +1,6 @@ # A non-diff discussion on an issue, merge request, commit, or snippet, consisting of `DiscussionNote` notes. +# +# A discussion of this type can be resolvable. class Discussion include ResolvableDiscussion @@ -54,6 +56,10 @@ class Discussion nil end + def self.note_class + DiscussionNote + end + def initialize(notes, noteable = nil) @notes = notes @noteable = noteable diff --git a/app/models/discussion_note.rb b/app/models/discussion_note.rb index 337fbc8435c..e660b024083 100644 --- a/app/models/discussion_note.rb +++ b/app/models/discussion_note.rb @@ -1,7 +1,9 @@ -# A note in a non-diff discussion on an issue, merge request, commit, or snippet +# A note in a non-diff discussion on an issue, merge request, commit, or snippet. +# +# A note of this type can be resolvable. class DiscussionNote < Note + # Names of all implementers of `Noteable` that support discussions. NOTEABLE_TYPES = %w(MergeRequest Issue Commit Snippet).freeze - RESOLVABLE_TYPES = %w(MergeRequest).freeze validates :noteable_type, inclusion: { in: NOTEABLE_TYPES } diff --git a/app/models/individual_note_discussion.rb b/app/models/individual_note_discussion.rb index 42318fa3d6e..c3f21c55240 100644 --- a/app/models/individual_note_discussion.rb +++ b/app/models/individual_note_discussion.rb @@ -1,8 +1,10 @@ # A discussion to wrap a single `Note` note on the root of an issue, merge request, # commit, or snippet, that is not displayed as a discussion. +# +# A discussion of this type is never resolvable. class IndividualNoteDiscussion < Discussion - def potentially_resolvable? - false + def self.note_class + Note end def individual_note? diff --git a/app/models/legacy_diff_discussion.rb b/app/models/legacy_diff_discussion.rb index 6515762c92d..cb2651a03f8 100644 --- a/app/models/legacy_diff_discussion.rb +++ b/app/models/legacy_diff_discussion.rb @@ -1,6 +1,9 @@ # A discussion on merge request or commit diffs consisting of `LegacyDiffNote` notes. +# # All new diff discussions are of the type `DiffDiscussion`, but any diff discussions created # before the introduction of the new implementation still use `LegacyDiffDiscussion`. +# +# A discussion of this type is never resolvable. class LegacyDiffDiscussion < Discussion include DiscussionOnDiff @@ -8,8 +11,8 @@ class LegacyDiffDiscussion < Discussion true end - def potentially_resolvable? - false + def self.note_class + LegacyDiffNote end def collapsed? diff --git a/app/models/legacy_diff_note.rb b/app/models/legacy_diff_note.rb index b9fddb2ea79..9a77557ebcd 100644 --- a/app/models/legacy_diff_note.rb +++ b/app/models/legacy_diff_note.rb @@ -1,6 +1,9 @@ # A note on merge request or commit diffs, using the legacy implementation. +# # All new diff notes are of the type `DiffNote`, but any diff notes created # before the introduction of the new implementation still use `LegacyDiffNote`. +# +# A note of this type is never resolvable. class LegacyDiffNote < Note include NoteOnDiff diff --git a/app/models/note.rb b/app/models/note.rb index cd4996bdbae..401e3d7bcbc 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -1,3 +1,6 @@ +# A note on the root of an issue, merge request, commit, or snippet. +# +# A note of this type is never resolvable. class Note < ActiveRecord::Base extend ActiveModel::Naming include Gitlab::CurrentSettings @@ -225,11 +228,7 @@ class Note < ActiveRecord::Base end def can_be_discussion_note? - DiscussionNote::NOTEABLE_TYPES.include?(self.noteable_type) && !part_of_discussion? - end - - def can_be_resolvable? - DiscussionNote::RESOLVABLE_TYPES.include?(self.noteable_type) + self.noteable.supports_discussions? && !part_of_discussion? end def discussion_class(noteable = nil) diff --git a/app/models/out_of_context_discussion.rb b/app/models/out_of_context_discussion.rb index 31c6d5cff8b..85794630f70 100644 --- a/app/models/out_of_context_discussion.rb +++ b/app/models/out_of_context_discussion.rb @@ -2,6 +2,8 @@ # contains that commit, they are displayed as if they were a discussion. # # This represents one of those discussions, consisting of `Note` notes. +# +# A discussion of this type is never resolvable. class OutOfContextDiscussion < Discussion # Returns an array of discussion ID components def self.build_discussion_id(note) @@ -13,8 +15,8 @@ class OutOfContextDiscussion < Discussion def self.override_discussion_id(note) discussion_id(note) end - - def potentially_resolvable? - false + + def self.note_class + Note end end diff --git a/app/services/issues/build_service.rb b/app/services/issues/build_service.rb index 7b5858a8ccb..3a4f7b159f1 100644 --- a/app/services/issues/build_service.rb +++ b/app/services/issues/build_service.rb @@ -36,12 +36,14 @@ module Issues def item_for_discussion(discussion) first_note_to_resolve = discussion.first_note_to_resolve || discussion.first_note - other_note_count = discussion.notes.size - 1 - note_url = Gitlab::UrlBuilder.build(first_note_to_resolve) is_very_first_note = first_note_to_resolve == discussion.first_note action = is_very_first_note ? "started" : "commented on" - + + note_url = Gitlab::UrlBuilder.build(first_note_to_resolve) + + other_note_count = discussion.notes.size - 1 + discussion_info = "- [ ] #{first_note_to_resolve.author.to_reference} #{action} a [discussion](#{note_url}): " discussion_info << " (+#{other_note_count} #{'comment'.pluralize(other_note_count)})" if other_note_count > 0 diff --git a/app/views/projects/notes/_comment_button.html.haml b/app/views/projects/notes/_comment_button.html.haml new file mode 100644 index 00000000000..008363263b3 --- /dev/null +++ b/app/views/projects/notes/_comment_button.html.haml @@ -0,0 +1,28 @@ +- noteable_name = @note.noteable.human_class_name + +.pull-left.btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown + %input.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button{ type: 'submit', value: 'Comment' } + + - if @note.can_be_discussion_note? + = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-note-new-discussion js-disable-on-submit', data: { 'dropdown-trigger' => '#resolvable-comment-menu' }, 'aria-label' => 'Open comment type dropdown' do + = icon('caret-down') + + %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } } + %li#comment.droplab-item-selected{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => "Comment & close #{noteable_name}" } } + = icon('check') + .description + %strong Comment + %p + Add a general comment to this #{noteable_name}. + + %li.divider + + %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => "Start discussion & close #{noteable_name}" } } + = icon('check') + .description + %strong Start discussion + %p + = succeed '.' do + Discuss a specific suggestion or question + - if @note.noteable.supports_resolvable_notes? + that needs to be resolved diff --git a/app/views/projects/notes/_comment_type_button.html.haml b/app/views/projects/notes/_comment_type_button.html.haml deleted file mode 100644 index 1444a9d1b65..00000000000 --- a/app/views/projects/notes/_comment_type_button.html.haml +++ /dev/null @@ -1,28 +0,0 @@ -- noteable_type = @note.noteable_type - -.pull-left.btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown - %input.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button{ type: 'submit', value: 'Comment' } - - if @note.can_be_discussion_note? - = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-note-new-discussion js-disable-on-submit', data: { 'dropdown-trigger' => '#resolvable-comment-menu' }, 'aria-label' => 'Open comment type dropdown' do - = icon('caret-down') - %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } } - %li#comment.droplab-item-selected{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => "Comment & close #{noteable_type.titleize.downcase}" } } - = icon('check') - .description - %strong Comment - %p= "Add a general comment to this #{noteable_type.titleize.downcase}." - %li.divider - - if @note.can_be_resolvable? - %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => "Start discussion & close #{noteable_type.titleize.downcase}" } } - = icon('check') - .description - %strong Start discussion - %p - Discuss a specific suggestion or question that needs to be resolved. - - else - %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => "Start discussion & close #{noteable_type.titleize.downcase}"} } - = icon('check') - .description - %strong Start discussion - %p - Discuss a specific suggestion or question. diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index 057c6801edf..0d835a9e949 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -28,7 +28,7 @@ .error-alert .note-form-actions.clearfix - = render partial: 'projects/notes/comment_type_button', locals: { show_close_button: true } + = render partial: 'projects/notes/comment_button' = yield(:note_actions) From 1df9ac23c08cf6c0f884b9e72ef4ea58017dc8e1 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 6 Apr 2017 20:13:50 +0100 Subject: [PATCH 50/70] Fix feature specs, still some to be done --- spec/features/discussion_comments_spec.rb | 34 ++++++++++++++--------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/spec/features/discussion_comments_spec.rb b/spec/features/discussion_comments_spec.rb index b2a117fd067..1c3cc086f8c 100644 --- a/spec/features/discussion_comments_spec.rb +++ b/spec/features/discussion_comments_spec.rb @@ -27,33 +27,33 @@ shared_examples 'discussion comments' do |resource_name| menu = find(menu_selector) expect(menu).to have_content 'Comment' - expect(menu).to have_content 'Add a general comment to this issue.' + expect(menu).to have_content "Add a general comment to this #{resource_name}." end it 'has a "Start discussion" item' do menu = find(menu_selector) expect(menu).to have_content 'Start discussion' - expect(menu).to have_content 'Discuss a specific suggestion or question.' + expect(menu).to have_content 'Discuss a specific suggestion or question that needs to be resolved.' end it 'has the "Comment" item selected by default' do - find("#{menu_selector} li") + find("#{menu_selector} li", match: :first) items = all("#{menu_selector} li") expect(items.first).to have_content 'Comment' expect(items.first).to have_selector '.fa-check' - expect(items.first).to have_selector '.droplab-item-selected' + expect(items.first['class']).to match 'droplab-item-selected' expect(items.last).to have_content 'Start discussion' expect(items.last).not_to have_selector '.fa-check' - expect(items.last).not_to have_selector '.droplab-item-selected' + expect(items.last['class']).not_to match 'droplab-item-selected' end it '"Comment" will post a comment' do find(submit_selector).click - find('.timeline .timeline-entry') + find('.timeline .timeline-entry', match: :first) new_comment = all('.timeline .timeline-entry').last expect(new_comment).to have_content 'a' @@ -64,7 +64,7 @@ shared_examples 'discussion comments' do |resource_name| it "Comment & close' will post a comment and close the #{resource_name}" do find(close_selector).click - find('.timeline .timeline-entry') + find('.timeline .timeline-entry', match: :first) entries = all('.timeline .timeline-entry') close_note = entries.last new_comment = entries[-2] @@ -88,7 +88,7 @@ shared_examples 'discussion comments' do |resource_name| describe 'when selecting "Start discussion"' do before do - find("#{menu_selector} li") + find("#{menu_selector} li", match: :first) first("#{menu_selector} li").click end @@ -113,7 +113,7 @@ shared_examples 'discussion comments' do |resource_name| it '"Start discussion" will post a discussion' do find(submit_selector).click - find('.timeline .timeline-entry') + find('.timeline .timeline-entry', match: :first) new_comment = all('.timeline .timeline-entry').last expect(new_comment).to have_content 'a' @@ -124,7 +124,7 @@ shared_examples 'discussion comments' do |resource_name| it "'Start discussion & close' will post a discussion and close the #{resource_name}" do find(close_selector).click - find('.timeline .timeline-entry') + find('.timeline .timeline-entry', match: :first) entries = all('.timeline .timeline-entry') close_note = entries.last new_discussion = entries[-2] @@ -140,7 +140,7 @@ shared_examples 'discussion comments' do |resource_name| end it 'should have "Start discussion" selected' do - find("#{menu_selector} li") + find("#{menu_selector} li", match: :first) items = all("#{menu_selector} li") expect(items.first).to have_content 'Comment' @@ -154,7 +154,7 @@ shared_examples 'discussion comments' do |resource_name| describe 'when selecting "Comment"' do before do - find("#{menu_selector} li") + find("#{menu_selector} li", match: :first) all("#{menu_selector} li").last.click end @@ -179,7 +179,7 @@ shared_examples 'discussion comments' do |resource_name| it 'should have "Comment" selected when opening the menu' do find(toggle_selector).click - find("#{menu_selector} li") + find("#{menu_selector} li", match: :first) items = all("#{menu_selector} li") expect(items.first).to have_content 'Comment' @@ -194,6 +194,12 @@ shared_examples 'discussion comments' do |resource_name| end end end + + if resource_name =~ /(issue|merge request)/ + describe "on a closed #{resource_name}" do + + end + end end describe 'Discussion Comments', :feature, :js do @@ -203,6 +209,8 @@ describe 'Discussion Comments', :feature, :js do let(:project) { create(:project) } before do + project.team << [user, :developer] + login_as(user) end From a33aacd5e0e612a3c8b8cce34ed1a4dfd86ed8b8 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 6 Apr 2017 21:15:19 +0100 Subject: [PATCH 51/70] Further fixes for feature spec --- spec/features/discussion_comments_spec.rb | 55 ++++++++++++----------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/spec/features/discussion_comments_spec.rb b/spec/features/discussion_comments_spec.rb index 1c3cc086f8c..73787fb8d51 100644 --- a/spec/features/discussion_comments_spec.rb +++ b/spec/features/discussion_comments_spec.rb @@ -12,6 +12,34 @@ shared_examples 'discussion comments' do |resource_name| expect(page).to have_selector toggle_selector end + it '"Comment" will post a comment' do + find("#{form_selector} .note-textarea").send_keys('a') + + find(submit_selector).click + + find('.timeline .timeline-entry', match: :first) + new_comment = all('.timeline .timeline-entry').last + + expect(new_comment).to have_content 'a' + expect(new_comment).not_to have_selector '.discussion' + end + + if resource_name =~ /(issue|merge request)/ + it "'Comment & close #{resource_name}' will post a comment and close the #{resource_name}" do + find("#{form_selector} .note-textarea").send_keys('a') + + find(close_selector).click + + find('.timeline .timeline-entry', match: :first) + entries = all('.timeline .timeline-entry') + close_note = entries.last + new_comment = entries[-2] + + expect(close_note).to have_content 'closed' + expect(new_comment).not_to have_selector '.discussion' + end + end + describe 'when the toggle is clicked' do before do find("#{form_selector} .note-textarea").send_keys('a') @@ -50,30 +78,6 @@ shared_examples 'discussion comments' do |resource_name| expect(items.last['class']).not_to match 'droplab-item-selected' end - it '"Comment" will post a comment' do - find(submit_selector).click - - find('.timeline .timeline-entry', match: :first) - new_comment = all('.timeline .timeline-entry').last - - expect(new_comment).to have_content 'a' - expect(new_comment).not_to have_selector '.discussion' - end - - if resource_name =~ /(issue|merge request)/ - it "Comment & close' will post a comment and close the #{resource_name}" do - find(close_selector).click - - find('.timeline .timeline-entry', match: :first) - entries = all('.timeline .timeline-entry') - close_note = entries.last - new_comment = entries[-2] - - expect(close_note).to have_content 'closed' - expect(new_comment).not_to have_selector '.discussion' - end - end - it 'closes the menu when clicking the toggle' do find(toggle_selector).click @@ -121,7 +125,7 @@ shared_examples 'discussion comments' do |resource_name| end if resource_name =~ /(issue|merge request)/ - it "'Start discussion & close' will post a discussion and close the #{resource_name}" do + it "'Start discussion & close #{resource_name}' will post a discussion and close the #{resource_name}" do find(close_selector).click find('.timeline .timeline-entry', match: :first) @@ -204,6 +208,7 @@ end describe 'Discussion Comments', :feature, :js do include RepoHelpers + include WaitForAjax let(:user) { create(:user) } let(:project) { create(:project) } From 126c651280218a008f493558ec8ec51aee412fd6 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 6 Apr 2017 15:16:50 -0500 Subject: [PATCH 52/70] Update schema.rb version --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index c9dca702465..f1783ab1b05 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170404170532) do +ActiveRecord::Schema.define(version: 20170405080720) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" enable_extension "pg_trgm" From de3e0834daddd7ba4904b14a37f95df7b993877c Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 6 Apr 2017 23:01:19 +0100 Subject: [PATCH 53/70] Further fixes for feature spec --- spec/features/discussion_comments_spec.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spec/features/discussion_comments_spec.rb b/spec/features/discussion_comments_spec.rb index 73787fb8d51..3ffe88e4c59 100644 --- a/spec/features/discussion_comments_spec.rb +++ b/spec/features/discussion_comments_spec.rb @@ -24,7 +24,7 @@ shared_examples 'discussion comments' do |resource_name| expect(new_comment).not_to have_selector '.discussion' end - if resource_name =~ /(issue|merge request)/ + if resource_name == 'issue' it "'Comment & close #{resource_name}' will post a comment and close the #{resource_name}" do find("#{form_selector} .note-textarea").send_keys('a') @@ -92,12 +92,15 @@ shared_examples 'discussion comments' do |resource_name| describe 'when selecting "Start discussion"' do before do + screenshot_and_open_image find("#{menu_selector} li", match: :first) + p first("#{menu_selector} li")['class'] + p first("#{menu_selector} li").text first("#{menu_selector} li").click end it 'updates the note_type input to "DiscussionNote"' do - expect(find("#{form_selector} #note_type").value).to be 'DiscussionNote' + expect(find("#{form_selector} #note_type", visible: false).value).to be 'DiscussionNote' end it 'updates the submit button text' do @@ -124,7 +127,7 @@ shared_examples 'discussion comments' do |resource_name| expect(new_comment).to have_selector '.discussion' end - if resource_name =~ /(issue|merge request)/ + if resource_name == 'issue' it "'Start discussion & close #{resource_name}' will post a discussion and close the #{resource_name}" do find(close_selector).click @@ -208,7 +211,6 @@ end describe 'Discussion Comments', :feature, :js do include RepoHelpers - include WaitForAjax let(:user) { create(:user) } let(:project) { create(:project) } From 993c2071ab95ffc96fcabb77042f64ca3c3d60d5 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Thu, 6 Apr 2017 23:03:11 +0100 Subject: [PATCH 54/70] Update inputsetter --- .../droplab/plugins/input_setter.js | 11 +-- .../droplab/plugins/input_setter.js | 79 +++++++++++++++++-- 2 files changed, 80 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/droplab/plugins/input_setter.js b/app/assets/javascripts/droplab/plugins/input_setter.js index b1716c72810..c292cfa7b8f 100644 --- a/app/assets/javascripts/droplab/plugins/input_setter.js +++ b/app/assets/javascripts/droplab/plugins/input_setter.js @@ -33,12 +33,13 @@ const InputSetter = { setInput(config, selectedItem) { const input = config.input || this.hook.trigger; const newValue = selectedItem.getAttribute(config.valueAttribute); + const inputAttribute = config.inputAttribute; - if (input.tagName === 'INPUT') { - input.value = newValue; - } else { - input.textContent = newValue; - } + if (!newValue) return; + + if (input.hasAttribute(inputAttribute)) return input.setAttribute(inputAttribute, newValue); + if (input.tagName === 'INPUT') return input.value = newValue; + return input.textContent = newValue; }, destroy() { diff --git a/spec/javascripts/droplab/plugins/input_setter.js b/spec/javascripts/droplab/plugins/input_setter.js index 81bb70fa6e5..c9b7b2b23dc 100644 --- a/spec/javascripts/droplab/plugins/input_setter.js +++ b/spec/javascripts/droplab/plugins/input_setter.js @@ -117,12 +117,13 @@ describe('InputSetter', function () { describe('setInput', function () { beforeEach(function () { this.selectedItem = { getAttribute: () => {} }; - this.input = { value: 'oldValue', tagName: 'INPUT' }; + this.input = { value: 'oldValue', tagName: 'INPUT', hasAttribute: () => {} }; this.config = { valueAttribute: {}, input: this.input }; this.inputSetter = { hook: { trigger: {} } }; this.newValue = 'newValue'; spyOn(this.selectedItem, 'getAttribute').and.returnValue(this.newValue); + spyOn(this.input, 'hasAttribute').and.returnValue(false); InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem); }); @@ -131,14 +132,34 @@ describe('InputSetter', function () { expect(this.selectedItem.getAttribute).toHaveBeenCalledWith(this.config.valueAttribute); }); + it('should call .hasAttribute', function () { + expect(this.input.hasAttribute).toHaveBeenCalledWith(undefined); + }); + it('should set the value of the input', function () { expect(this.input.value).toBe(this.newValue); - }) + }); + + describe('if there is no newValue', function () { + beforeEach(function () { + this.newValue = ''; + this.inputSetter = { hook: { trigger: {} } }; + this.config = { valueAttribute: {}, input: this.input }; + this.input = { value: 'oldValue', tagName: 'INPUT' }; + this.selectedItem = { getAttribute: () => {} }; + + InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem); + }); + + it('should not set the value of the input', function () { + expect(this.input.value).toBe('oldValue'); + }) + }); describe('if no config.input is provided', function () { beforeEach(function () { this.config = { valueAttribute: {} }; - this.trigger = { value: 'oldValue', tagName: 'INPUT' }; + this.trigger = { value: 'oldValue', tagName: 'INPUT', hasAttribute: () => {} }; this.inputSetter = { hook: { trigger: this.trigger } }; InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem); @@ -151,14 +172,62 @@ describe('InputSetter', function () { describe('if the input tag is not INPUT', function () { beforeEach(function () { - this.input = { textContent: 'oldValue', tagName: 'SPAN' }; + this.input = { textContent: 'oldValue', tagName: 'SPAN', hasAttribute: () => {} }; this.config = { valueAttribute: {}, input: this.input }; InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem); }); it('should set the textContent of the input', function () { - expect(this.config.input.textContent).toBe(this.newValue); + expect(this.input.textContent).toBe(this.newValue); + }); + + describe('if there is no new value', function () { + beforeEach(function () { + this.selectedItem = { getAttribute: () => {} }; + this.input = { textContent: 'oldValue', tagName: 'INPUT', hasAttribute: () => {} }; + this.config = { valueAttribute: {}, input: this.input }; + this.inputSetter = { hook: { trigger: {} } }; + this.newValue = 'newValue'; + + spyOn(this.selectedItem, 'getAttribute').and.returnValue(this.newValue); + + InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem); + }); + + it('should not set the value of the input', function () { + expect(this.input.textContent).toBe('oldValue'); + }); + }); + }); + + describe('if there is an inputAttribute', function () { + beforeEach(function () { + this.selectedItem = { getAttribute: () => {} }; + this.input = { id: 'oldValue', hasAttribute: () => {}, setAttribute: () => {} }; + this.inputSetter = { hook: { trigger: {} } }; + this.newValue = 'newValue'; + this.inputAttribute = 'id'; + this.config = { + valueAttribute: {}, + input: this.input, + inputAttribute: this.inputAttribute, + }; + + spyOn(this.selectedItem, 'getAttribute').and.returnValue(this.newValue); + spyOn(this.input, 'hasAttribute').and.returnValue(true); + spyOn(this.input, 'setAttribute'); + + InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem); + }); + + it('should call setAttribute', function () { + expect(this.input.setAttribute).toHaveBeenCalledWith(this.inputAttribute, this.newValue); + }); + + it('should not set the value or textContent of the input', function () { + expect(this.input.value).not.toBe('newValue'); + expect(this.input.textContent).not.toBe('newValue'); }); }); }); From 153531fff3c8f32482035bfa87fee2161171e698 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 7 Apr 2017 00:56:46 +0100 Subject: [PATCH 55/70] Finish up feature spec --- app/assets/javascripts/droplab/drop_down.js | 4 +- .../droplab/plugins/input_setter.js | 2 - spec/features/discussion_comments_spec.rb | 86 +++++++++++++------ .../droplab/plugins/input_setter.js | 36 +------- 4 files changed, 63 insertions(+), 65 deletions(-) diff --git a/app/assets/javascripts/droplab/drop_down.js b/app/assets/javascripts/droplab/drop_down.js index f686ad33f6f..f522859c457 100644 --- a/app/assets/javascripts/droplab/drop_down.js +++ b/app/assets/javascripts/droplab/drop_down.js @@ -35,7 +35,9 @@ Object.assign(DropDown.prototype, { }, clickEvent: function(e) { - var selected = utils.closest(e.target, 'LI'); + if (e.target.tagName === 'UL') return; + + var selected = utils.closest(e.target, 'LI', ''); if (!selected) return; this.addSelectedClass(selected); diff --git a/app/assets/javascripts/droplab/plugins/input_setter.js b/app/assets/javascripts/droplab/plugins/input_setter.js index c292cfa7b8f..d01fbc5830d 100644 --- a/app/assets/javascripts/droplab/plugins/input_setter.js +++ b/app/assets/javascripts/droplab/plugins/input_setter.js @@ -35,8 +35,6 @@ const InputSetter = { const newValue = selectedItem.getAttribute(config.valueAttribute); const inputAttribute = config.inputAttribute; - if (!newValue) return; - if (input.hasAttribute(inputAttribute)) return input.setAttribute(inputAttribute, newValue); if (input.tagName === 'INPUT') return input.value = newValue; return input.textContent = newValue; diff --git a/spec/features/discussion_comments_spec.rb b/spec/features/discussion_comments_spec.rb index 3ffe88e4c59..9e99fe064e8 100644 --- a/spec/features/discussion_comments_spec.rb +++ b/spec/features/discussion_comments_spec.rb @@ -7,31 +7,33 @@ shared_examples 'discussion comments' do |resource_name| let(:menu_selector) { "#{dropdown_selector} .dropdown-menu" } let(:submit_selector) { "#{form_selector} .js-comment-submit-button" } let(:close_selector) { "#{form_selector} .btn-comment-and-close" } + let(:comments_selector) { '.timeline > .note.timeline-entry' } it 'should show a comment type toggle' do expect(page).to have_selector toggle_selector end - it '"Comment" will post a comment' do + it 'clicking "Comment" will post a comment' do find("#{form_selector} .note-textarea").send_keys('a') find(submit_selector).click - find('.timeline .timeline-entry', match: :first) - new_comment = all('.timeline .timeline-entry').last + find(comments_selector, match: :first) + new_comment = all(comments_selector).last expect(new_comment).to have_content 'a' expect(new_comment).not_to have_selector '.discussion' end if resource_name == 'issue' - it "'Comment & close #{resource_name}' will post a comment and close the #{resource_name}" do + it "clicking 'Comment & close #{resource_name}' will post a comment and close the #{resource_name}" do find("#{form_selector} .note-textarea").send_keys('a') find(close_selector).click - find('.timeline .timeline-entry', match: :first) - entries = all('.timeline .timeline-entry') + find(comments_selector, match: :first) + find("#{comments_selector}.system-note") + entries = all(comments_selector) close_note = entries.last new_comment = entries[-2] @@ -62,7 +64,7 @@ shared_examples 'discussion comments' do |resource_name| menu = find(menu_selector) expect(menu).to have_content 'Start discussion' - expect(menu).to have_content 'Discuss a specific suggestion or question that needs to be resolved.' + expect(menu).to have_content "Discuss a specific suggestion or question#{' that needs to be resolved' if resource_name == 'merge request'}." end it 'has the "Comment" item selected by default' do @@ -90,17 +92,20 @@ shared_examples 'discussion comments' do |resource_name| expect(page).not_to have_selector menu_selector end + it 'clicking the ul padding should not change the text' do + find(menu_selector).click + + expect(find(submit_selector)).to have_content 'Comment' + end + describe 'when selecting "Start discussion"' do before do - screenshot_and_open_image find("#{menu_selector} li", match: :first) - p first("#{menu_selector} li")['class'] - p first("#{menu_selector} li").text - first("#{menu_selector} li").click + all("#{menu_selector} li").last.click end it 'updates the note_type input to "DiscussionNote"' do - expect(find("#{form_selector} #note_type", visible: false).value).to be 'DiscussionNote' + expect(find("#{form_selector} #note_type", visible: false).value).to eq('DiscussionNote') end it 'updates the submit button text' do @@ -111,28 +116,35 @@ shared_examples 'discussion comments' do |resource_name| it 'updates the close button text' do expect(find(close_selector)).to have_content "Start discussion & close #{resource_name}" end + + it 'typing does not change the close button text' do + find("#{form_selector} .note-textarea").send_keys('b') + + expect(find(close_selector)).to have_content "Start discussion & close #{resource_name}" + end end it 'closes the dropdown' do expect(page).not_to have_selector menu_selector end - it '"Start discussion" will post a discussion' do + it 'clicking "Start discussion" will post a discussion' do find(submit_selector).click - find('.timeline .timeline-entry', match: :first) - new_comment = all('.timeline .timeline-entry').last + find(comments_selector, match: :first) + new_comment = all(comments_selector).last expect(new_comment).to have_content 'a' expect(new_comment).to have_selector '.discussion' end if resource_name == 'issue' - it "'Start discussion & close #{resource_name}' will post a discussion and close the #{resource_name}" do + it "clicking 'Start discussion & close #{resource_name}' will post a discussion and close the #{resource_name}" do find(close_selector).click - find('.timeline .timeline-entry', match: :first) - entries = all('.timeline .timeline-entry') + find(comments_selector, match: :first) + find("#{comments_selector}.system-note") + entries = all(comments_selector) close_note = entries.last new_discussion = entries[-2] @@ -152,21 +164,20 @@ shared_examples 'discussion comments' do |resource_name| expect(items.first).to have_content 'Comment' expect(items.first).not_to have_selector '.fa-check' - expect(items.first).not_to have_selector '.droplab-item-selected' + expect(items.first['class']).not_to match 'droplab-item-selected' expect(items.last).to have_content 'Start discussion' expect(items.last).to have_selector '.fa-check' - expect(items.last).to have_selector '.droplab-item-selected' + expect(items.last['class']).to match 'droplab-item-selected' end describe 'when selecting "Comment"' do before do - find("#{menu_selector} li", match: :first) - all("#{menu_selector} li").last.click + find("#{menu_selector} li", match: :first).click end it 'clears the note_type input"' do - expect(find("#{form_selector} #note_type").value).to be '' + expect(find("#{form_selector} #note_type", visible: false).value).to eq('') end it 'updates the submit button text' do @@ -177,6 +188,12 @@ shared_examples 'discussion comments' do |resource_name| it 'updates the close button text' do expect(find(close_selector)).to have_content "Comment & close #{resource_name}" end + + it 'typing does not change the close button text' do + find("#{form_selector} .note-textarea").send_keys('b') + + expect(find(close_selector)).to have_content "Comment & close #{resource_name}" + end end it 'closes the dropdown' do @@ -191,11 +208,11 @@ shared_examples 'discussion comments' do |resource_name| expect(items.first).to have_content 'Comment' expect(items.first).to have_selector '.fa-check' - expect(items.first).to have_selector '.droplab-item-selected' + expect(items.first['class']).to match 'droplab-item-selected' expect(items.last).to have_content 'Start discussion' expect(items.last).not_to have_selector '.fa-check' - expect(items.last).not_to have_selector '.droplab-item-selected' + expect(items.last['class']).not_to match 'droplab-item-selected' end end end @@ -204,7 +221,22 @@ shared_examples 'discussion comments' do |resource_name| if resource_name =~ /(issue|merge request)/ describe "on a closed #{resource_name}" do + before do + find("#{form_selector} .close-mr-link").click + end + it 'should show a "Comment & reopen #{resource_name}" button' do + expect(find(close_selector)).to have_content "Comment & reopen #{resource_name}" + end + + it 'should show a "Start discussion & reopen #{resource_name}" button when "Start discussion" is selected' do + find(toggle_selector).click + + find("#{menu_selector} li", match: :first) + all("#{menu_selector} li").last.click + + expect(find(close_selector)).to have_content "Start discussion & reopen #{resource_name}" + end end end end @@ -242,10 +274,10 @@ describe 'Discussion Comments', :feature, :js do end describe 'on an snippet' do - let(:snippet) { create(:personal_snippet, :public, author: user) } + let(:snippet) { create(:project_snippet, :private, project: project, author: user) } before do - visit snippet_path(snippet) + visit namespace_project_snippet_path(project.namespace, project, snippet) end it_behaves_like 'discussion comments', 'snippet' diff --git a/spec/javascripts/droplab/plugins/input_setter.js b/spec/javascripts/droplab/plugins/input_setter.js index c9b7b2b23dc..412d1054385 100644 --- a/spec/javascripts/droplab/plugins/input_setter.js +++ b/spec/javascripts/droplab/plugins/input_setter.js @@ -2,7 +2,7 @@ import InputSetter from '~/droplab/plugins/input_setter'; -describe('InputSetter', function () { +fdescribe('InputSetter', function () { describe('init', function () { beforeEach(function () { this.config = { InputSetter: {} }; @@ -140,22 +140,6 @@ describe('InputSetter', function () { expect(this.input.value).toBe(this.newValue); }); - describe('if there is no newValue', function () { - beforeEach(function () { - this.newValue = ''; - this.inputSetter = { hook: { trigger: {} } }; - this.config = { valueAttribute: {}, input: this.input }; - this.input = { value: 'oldValue', tagName: 'INPUT' }; - this.selectedItem = { getAttribute: () => {} }; - - InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem); - }); - - it('should not set the value of the input', function () { - expect(this.input.value).toBe('oldValue'); - }) - }); - describe('if no config.input is provided', function () { beforeEach(function () { this.config = { valueAttribute: {} }; @@ -181,24 +165,6 @@ describe('InputSetter', function () { it('should set the textContent of the input', function () { expect(this.input.textContent).toBe(this.newValue); }); - - describe('if there is no new value', function () { - beforeEach(function () { - this.selectedItem = { getAttribute: () => {} }; - this.input = { textContent: 'oldValue', tagName: 'INPUT', hasAttribute: () => {} }; - this.config = { valueAttribute: {}, input: this.input }; - this.inputSetter = { hook: { trigger: {} } }; - this.newValue = 'newValue'; - - spyOn(this.selectedItem, 'getAttribute').and.returnValue(this.newValue); - - InputSetter.setInput.call(this.inputSetter, this.config, this.selectedItem); - }); - - it('should not set the value of the input', function () { - expect(this.input.textContent).toBe('oldValue'); - }); - }); }); describe('if there is an inputAttribute', function () { From f2f44579a3ae944104d76681e75a85e6d0ceb756 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 7 Apr 2017 01:34:19 +0100 Subject: [PATCH 56/70] Renamed spec files --- spec/javascripts/droplab/{constants.js => constants_spec.js} | 0 spec/javascripts/droplab/{drop_down.js => drop_down_spec.js} | 0 spec/javascripts/droplab/{hook.js => hook_spec.js} | 0 .../droplab/plugins/{input_setter.js => input_setter_spec.js} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename spec/javascripts/droplab/{constants.js => constants_spec.js} (100%) rename spec/javascripts/droplab/{drop_down.js => drop_down_spec.js} (100%) rename spec/javascripts/droplab/{hook.js => hook_spec.js} (100%) rename spec/javascripts/droplab/plugins/{input_setter.js => input_setter_spec.js} (100%) diff --git a/spec/javascripts/droplab/constants.js b/spec/javascripts/droplab/constants_spec.js similarity index 100% rename from spec/javascripts/droplab/constants.js rename to spec/javascripts/droplab/constants_spec.js diff --git a/spec/javascripts/droplab/drop_down.js b/spec/javascripts/droplab/drop_down_spec.js similarity index 100% rename from spec/javascripts/droplab/drop_down.js rename to spec/javascripts/droplab/drop_down_spec.js diff --git a/spec/javascripts/droplab/hook.js b/spec/javascripts/droplab/hook_spec.js similarity index 100% rename from spec/javascripts/droplab/hook.js rename to spec/javascripts/droplab/hook_spec.js diff --git a/spec/javascripts/droplab/plugins/input_setter.js b/spec/javascripts/droplab/plugins/input_setter_spec.js similarity index 100% rename from spec/javascripts/droplab/plugins/input_setter.js rename to spec/javascripts/droplab/plugins/input_setter_spec.js From 907b754173ed4185574c38ded0a173360d073085 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 7 Apr 2017 02:50:10 +0100 Subject: [PATCH 57/70] Fixed bugs and added tests --- app/assets/javascripts/droplab/drop_down.js | 2 +- app/assets/javascripts/notes.js | 2 +- .../projects/notes/_comment_button.html.haml | 5 +++-- spec/features/discussion_comments_spec.rb | 20 ++++++++++--------- spec/javascripts/droplab/drop_down_spec.js | 17 +++++++++++++++- .../droplab/plugins/input_setter_spec.js | 2 +- 6 files changed, 33 insertions(+), 15 deletions(-) diff --git a/app/assets/javascripts/droplab/drop_down.js b/app/assets/javascripts/droplab/drop_down.js index f522859c457..9588921ebcd 100644 --- a/app/assets/javascripts/droplab/drop_down.js +++ b/app/assets/javascripts/droplab/drop_down.js @@ -37,7 +37,7 @@ Object.assign(DropDown.prototype, { clickEvent: function(e) { if (e.target.tagName === 'UL') return; - var selected = utils.closest(e.target, 'LI', ''); + var selected = utils.closest(e.target, 'LI'); if (!selected) return; this.addSelectedClass(selected); diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 66e89b7607a..9dd516d93fd 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -143,7 +143,7 @@ require('./task_list'); form.querySelector('.js-comment-type-dropdown .dropdown-menu'), form.querySelector('#note_type'), form.querySelector('.js-comment-type-dropdown .js-comment-submit-button'), - form.querySelector('.js-note-target-close'), + form.querySelector('.js-note-target-close:not(.hidden)') || form.querySelector('.js-note-target-reopen'), ); this.commentTypeToggle.initDroplab(); diff --git a/app/views/projects/notes/_comment_button.html.haml b/app/views/projects/notes/_comment_button.html.haml index 008363263b3..2e65a3bf294 100644 --- a/app/views/projects/notes/_comment_button.html.haml +++ b/app/views/projects/notes/_comment_button.html.haml @@ -1,4 +1,5 @@ - noteable_name = @note.noteable.human_class_name +- noteable_state_action = noteable_name =~ /(merge request|issue)/ && @note.noteable['state'] == 'closed' ? 'reopen' : 'close' .pull-left.btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown %input.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button{ type: 'submit', value: 'Comment' } @@ -8,7 +9,7 @@ = icon('caret-down') %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } } - %li#comment.droplab-item-selected{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => "Comment & close #{noteable_name}" } } + %li#comment.droplab-item-selected{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => "Comment & #{noteable_state_action} #{noteable_name}" } } = icon('check') .description %strong Comment @@ -17,7 +18,7 @@ %li.divider - %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => "Start discussion & close #{noteable_name}" } } + %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => "Start discussion & #{noteable_state_action} #{noteable_name}" } } = icon('check') .description %strong Start discussion diff --git a/spec/features/discussion_comments_spec.rb b/spec/features/discussion_comments_spec.rb index 9e99fe064e8..ae778118c5c 100644 --- a/spec/features/discussion_comments_spec.rb +++ b/spec/features/discussion_comments_spec.rb @@ -93,9 +93,9 @@ shared_examples 'discussion comments' do |resource_name| end it 'clicking the ul padding should not change the text' do - find(menu_selector).click + find(menu_selector).trigger 'click' - expect(find(submit_selector)).to have_content 'Comment' + expect(find(dropdown_selector)).to have_content 'Comment' end describe 'when selecting "Start discussion"' do @@ -109,7 +109,7 @@ shared_examples 'discussion comments' do |resource_name| end it 'updates the submit button text' do - expect(find(dropdown_selector)).to have_content "Start discussion" + expect(find(dropdown_selector)).to have_content 'Start discussion' end if resource_name =~ /(issue|merge request)/ @@ -181,7 +181,7 @@ shared_examples 'discussion comments' do |resource_name| end it 'updates the submit button text' do - expect(find(dropdown_selector)).to have_content "Comment" + expect(find(dropdown_selector)).to have_content 'Comment' end if resource_name =~ /(issue|merge request)/ @@ -222,20 +222,22 @@ shared_examples 'discussion comments' do |resource_name| if resource_name =~ /(issue|merge request)/ describe "on a closed #{resource_name}" do before do - find("#{form_selector} .close-mr-link").click + find("#{form_selector} .js-note-target-close").click + + find("#{form_selector} .note-textarea").send_keys('a') end - it 'should show a "Comment & reopen #{resource_name}" button' do - expect(find(close_selector)).to have_content "Comment & reopen #{resource_name}" + it "should show a 'Comment & reopen #{resource_name}' button" do + expect(find("#{form_selector} .js-note-target-reopen")).to have_content "Comment & reopen #{resource_name}" end - it 'should show a "Start discussion & reopen #{resource_name}" button when "Start discussion" is selected' do + it "should show a 'Start discussion & reopen #{resource_name}' button when 'Start discussion' is selected" do find(toggle_selector).click find("#{menu_selector} li", match: :first) all("#{menu_selector} li").last.click - expect(find(close_selector)).to have_content "Start discussion & reopen #{resource_name}" + expect(find("#{form_selector} .js-note-target-reopen")).to have_content "Start discussion & reopen #{resource_name}" end end end diff --git a/spec/javascripts/droplab/drop_down_spec.js b/spec/javascripts/droplab/drop_down_spec.js index bbf953658c8..802e2435672 100644 --- a/spec/javascripts/droplab/drop_down_spec.js +++ b/spec/javascripts/droplab/drop_down_spec.js @@ -130,7 +130,7 @@ describe('DropDown', function () { beforeEach(function () { this.list = { dispatchEvent: () => {} }; this.dropdown = { hide: () => {}, list: this.list, addSelectedClass: () => {} }; - this.event = { preventDefault: () => {}, target: 'target' }; + this.event = { preventDefault: () => {}, target: {} }; this.customEvent = {}; this.closestElement = {}; @@ -168,6 +168,21 @@ describe('DropDown', function () { expect(this.list.dispatchEvent).toHaveBeenCalledWith(this.customEvent); }); + describe('if the target is a UL element', function () { + beforeEach(function () { + this.event = { preventDefault: () => {}, target: { tagName: 'UL' } }; + + spyOn(this.event, 'preventDefault'); + utils.closest.calls.reset(); + + DropDown.prototype.clickEvent.call(this.dropdown, this.event); + }); + + it('should return immediately', function () { + expect(utils.closest).not.toHaveBeenCalled(); + }); + }); + describe('if no selected element exists', function () { beforeEach(function () { this.event.preventDefault.calls.reset(); diff --git a/spec/javascripts/droplab/plugins/input_setter_spec.js b/spec/javascripts/droplab/plugins/input_setter_spec.js index 412d1054385..bd625f4ae80 100644 --- a/spec/javascripts/droplab/plugins/input_setter_spec.js +++ b/spec/javascripts/droplab/plugins/input_setter_spec.js @@ -2,7 +2,7 @@ import InputSetter from '~/droplab/plugins/input_setter'; -fdescribe('InputSetter', function () { +describe('InputSetter', function () { describe('init', function () { beforeEach(function () { this.config = { InputSetter: {} }; From 18e2388de19f47093cb3192f4b8dbabdd9c3bfad Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 7 Apr 2017 14:09:15 +0100 Subject: [PATCH 58/70] Fixed issue button state bug --- app/assets/javascripts/comment_type_toggle.js | 67 +++++++----- app/assets/javascripts/notes.js | 31 ++++-- app/assets/stylesheets/pages/note_form.scss | 1 - .../projects/notes/_comment_button.html.haml | 5 +- spec/javascripts/comment_type_toggle_spec.js | 101 +++++++++++------- 5 files changed, 123 insertions(+), 82 deletions(-) diff --git a/app/assets/javascripts/comment_type_toggle.js b/app/assets/javascripts/comment_type_toggle.js index 34878f90050..ba3b43b201d 100644 --- a/app/assets/javascripts/comment_type_toggle.js +++ b/app/assets/javascripts/comment_type_toggle.js @@ -2,39 +2,54 @@ import DropLab from '~/droplab/drop_lab'; import InputSetter from '~/droplab/plugins/input_setter'; class CommentTypeToggle { - constructor(dropdownTrigger, dropdownList, noteTypeInput, submitButton, closeButton) { - this.dropdownTrigger = dropdownTrigger; - this.dropdownList = dropdownList; - this.noteTypeInput = noteTypeInput; - this.submitButton = submitButton; - this.closeButton = closeButton; + constructor(opts = {}) { + this.dropdownTrigger = opts.dropdownTrigger; + this.dropdownList = opts.dropdownList; + this.noteTypeInput = opts.noteTypeInput; + this.submitButton = opts.submitButton; + this.closeButton = opts.closeButton; + this.reopenButton = opts.reopenButton; } initDroplab() { this.droplab = new DropLab(); - const inputSetterConfig = [{ - input: this.noteTypeInput, - valueAttribute: 'data-value', - }, - { - input: this.submitButton, - valueAttribute: 'data-button-text', - }]; - if (this.closeButton) { - inputSetterConfig.push({ - input: this.closeButton, - valueAttribute: 'data-secondary-button-text', - }, { - input: this.closeButton, - valueAttribute: 'data-secondary-button-text', - inputAttribute: 'data-alternative-text', - }); - } + const config = this.setConfig(); - this.droplab.init(this.dropdownTrigger, this.dropdownList, [InputSetter], { - InputSetter: inputSetterConfig, + this.droplab.init(this.dropdownTrigger, this.dropdownList, [InputSetter], config); + } + + setConfig() { + const config = { + InputSetter: [{ + input: this.noteTypeInput, + valueAttribute: 'data-value', + }, + { + input: this.submitButton, + valueAttribute: 'data-submit-text', + }], + }; + + if (!this.closeButton || !this.reopenButton) return config; + + config.InputSetter.push({ + input: this.closeButton, + valueAttribute: 'data-close-text', + }, { + input: this.closeButton, + valueAttribute: 'data-close-text', + inputAttribute: 'data-alternative-text', + }, { + input: this.reopenButton, + valueAttribute: 'data-reopen-text', + }, { + input: this.reopenButton, + valueAttribute: 'data-reopen-text', + inputAttribute: 'data-alternative-text', }); + + return config; } } diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 9dd516d93fd..2a8f4acc72a 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -137,16 +137,24 @@ require('./task_list'); $(document).off("click", '.system-note-commit-list-toggler'); }; - Notes.prototype.initCommentTypeToggle = function (form) { - this.commentTypeToggle = new CommentTypeToggle( - form.querySelector('.js-comment-type-dropdown .dropdown-toggle'), - form.querySelector('.js-comment-type-dropdown .dropdown-menu'), - form.querySelector('#note_type'), - form.querySelector('.js-comment-type-dropdown .js-comment-submit-button'), - form.querySelector('.js-note-target-close:not(.hidden)') || form.querySelector('.js-note-target-reopen'), - ); + Notes.initCommentTypeToggle = function (form) { + const dropdownTrigger = form.querySelector('.js-comment-type-dropdown .dropdown-toggle'); + const dropdownList = form.querySelector('.js-comment-type-dropdown .dropdown-menu'); + const noteTypeInput = form.querySelector('#note_type'); + const submitButton = form.querySelector('.js-comment-type-dropdown .js-comment-submit-button'); + const closeButton = form.querySelector('.js-note-target-close'); + const reopenButton = form.querySelector('.js-note-target-reopen'); - this.commentTypeToggle.initDroplab(); + const commentTypeToggle = new CommentTypeToggle({ + dropdownTrigger, + dropdownList, + noteTypeInput, + submitButton, + closeButton, + reopenButton, + }); + + commentTypeToggle.initDroplab(); }; Notes.prototype.keydownNoteText = function(e) { @@ -470,7 +478,7 @@ require('./task_list'); this.parentTimeline = form.parents('.timeline'); if (form.length) { - this.initCommentTypeToggle(form.get(0)); + Notes.initCommentTypeToggle(form.get(0)); } }; @@ -939,8 +947,9 @@ require('./task_list'); reopenbtn = form.find('.js-note-target-reopen'); closebtn = form.find('.js-note-target-close'); discardbtn = form.find('.js-note-discard'); + if (textarea.val().trim().length > 0) { - reopentext = reopenbtn.data('alternative-text'); + reopentext = reopenbtn.attr('data-alternative-text'); closetext = closebtn.attr('data-alternative-text'); if (reopenbtn.text() !== reopentext) { reopenbtn.text(reopentext); diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 09c178c5a14..c71a4e717f8 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -334,7 +334,6 @@ li { white-space: nowrap; - border-radius: 0; cursor: pointer; padding-top: 6px; diff --git a/app/views/projects/notes/_comment_button.html.haml b/app/views/projects/notes/_comment_button.html.haml index 2e65a3bf294..8627713fd68 100644 --- a/app/views/projects/notes/_comment_button.html.haml +++ b/app/views/projects/notes/_comment_button.html.haml @@ -1,5 +1,4 @@ - noteable_name = @note.noteable.human_class_name -- noteable_state_action = noteable_name =~ /(merge request|issue)/ && @note.noteable['state'] == 'closed' ? 'reopen' : 'close' .pull-left.btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown %input.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button{ type: 'submit', value: 'Comment' } @@ -9,7 +8,7 @@ = icon('caret-down') %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } } - %li#comment.droplab-item-selected{ data: { value: '', 'button-text' => 'Comment', 'secondary-button-text' => "Comment & #{noteable_state_action} #{noteable_name}" } } + %li#comment.droplab-item-selected{ data: { value: '', 'submit-text' => 'Comment', 'close-text' => "Comment & close #{noteable_name}", 'reopen-text' => "Comment & reopen #{noteable_name}" } } = icon('check') .description %strong Comment @@ -18,7 +17,7 @@ %li.divider - %li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => "Start discussion & #{noteable_state_action} #{noteable_name}" } } + %li#discussion{ data: { value: 'DiscussionNote', 'submit-text' => 'Start discussion', 'close-text' => "Start discussion & close #{noteable_name}", 'reopen-text' => "Start discussion & reopen #{noteable_name}" } } = icon('check') .description %strong Start discussion diff --git a/spec/javascripts/comment_type_toggle_spec.js b/spec/javascripts/comment_type_toggle_spec.js index 818c1635710..9a341ebd811 100644 --- a/spec/javascripts/comment_type_toggle_spec.js +++ b/spec/javascripts/comment_type_toggle_spec.js @@ -11,13 +11,13 @@ describe('CommentTypeToggle', function () { this.submitButton = {}; this.closeButton = {}; - this.commentTypeToggle = new CommentTypeToggle( - this.dropdownTrigger, - this.dropdownList, - this.noteTypeInput, - this.submitButton, - this.closeButton, - ); + this.commentTypeToggle = new CommentTypeToggle({ + dropdownTrigger: this.dropdownTrigger, + dropdownList: this.dropdownList, + noteTypeInput: this.noteTypeInput, + submitButton: this.submitButton, + closeButton: this.closeButton, + }); }); it('should set .dropdownTrigger', function () { @@ -39,6 +39,10 @@ describe('CommentTypeToggle', function () { it('should set .closeButton', function () { expect(this.commentTypeToggle.closeButton).toBe(this.closeButton); }); + + it('should set .reopenButton', function () { + expect(this.commentTypeToggle.reopenButton).toBe(this.reopenButton); + }); }); describe('initDroplab', function () { @@ -49,13 +53,16 @@ describe('CommentTypeToggle', function () { noteTypeInput: {}, submitButton: {}, closeButton: {}, + setConfig: () => {}, }; + this.config = {}; this.droplab = jasmine.createSpyObj('droplab', ['init']); spyOn(dropLabSrc, 'default').and.returnValue(this.droplab); + spyOn(this.commentTypeToggle, 'setConfig').and.returnValue(this.config); - this.initDroplab = CommentTypeToggle.prototype.initDroplab.call(this.commentTypeToggle); + CommentTypeToggle.prototype.initDroplab.call(this.commentTypeToggle); }); it('should instantiate a DropLab instance', function () { @@ -66,31 +73,21 @@ describe('CommentTypeToggle', function () { expect(this.commentTypeToggle.droplab).toBe(this.droplab); }); + it('should call .setConfig', function () { + expect(this.commentTypeToggle.setConfig).toHaveBeenCalled(); + }); + it('should call DropLab.prototype.init', function () { expect(this.droplab.init).toHaveBeenCalledWith( this.commentTypeToggle.dropdownTrigger, this.commentTypeToggle.dropdownList, [InputSetter], - { - InputSetter: [{ - input: this.commentTypeToggle.noteTypeInput, - valueAttribute: 'data-value', - }, { - input: this.commentTypeToggle.submitButton, - valueAttribute: 'data-button-text', - }, - { - input: this.commentTypeToggle.closeButton, - valueAttribute: 'data-secondary-button-text', - }, { - input: this.commentTypeToggle.closeButton, - valueAttribute: 'data-secondary-button-text', - inputAttribute: 'data-alternative-text', - }], - }, + this.config, ); }); + }); + describe('setConfig', function () { describe('if no .closeButton is provided', function () { beforeEach(function () { this.commentTypeToggle = { @@ -98,26 +95,48 @@ describe('CommentTypeToggle', function () { dropdownList: {}, noteTypeInput: {}, submitButton: {}, + reopenButton: {}, }; - this.initDroplab = CommentTypeToggle.prototype.initDroplab.call(this.commentTypeToggle); + this.setConfig = CommentTypeToggle.prototype.setConfig.call(this.commentTypeToggle); }); - it('should not add .closeButton related InputSetter config', function () { - expect(this.droplab.init).toHaveBeenCalledWith( - this.commentTypeToggle.dropdownTrigger, - this.commentTypeToggle.dropdownList, - [InputSetter], - { - InputSetter: [{ - input: this.commentTypeToggle.noteTypeInput, - valueAttribute: 'data-value', - }, { - input: this.commentTypeToggle.submitButton, - valueAttribute: 'data-button-text', - }], - }, - ); + it('should not add .closeButton or .reopenButton related InputSetter config', function () { + expect(this.setConfig).toEqual({ + InputSetter: [{ + input: this.commentTypeToggle.noteTypeInput, + valueAttribute: 'data-value', + }, { + input: this.commentTypeToggle.submitButton, + valueAttribute: 'data-submit-text', + }], + }); + }); + }); + + describe('if no .reopenButton is provided', function () { + beforeEach(function () { + this.commentTypeToggle = { + dropdownTrigger: {}, + dropdownList: {}, + noteTypeInput: {}, + submitButton: {}, + closeButton: {}, + }; + + this.setConfig = CommentTypeToggle.prototype.setConfig.call(this.commentTypeToggle); + }); + + it('should not add .closeButton or .reopenButton related InputSetter config', function () { + expect(this.setConfig).toEqual({ + InputSetter: [{ + input: this.commentTypeToggle.noteTypeInput, + valueAttribute: 'data-value', + }, { + input: this.commentTypeToggle.submitButton, + valueAttribute: 'data-submit-text', + }], + }); }); }); }); From 99918be7312b11dd650924e39b2bf8b65a4004d8 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 7 Apr 2017 15:31:14 +0100 Subject: [PATCH 59/70] Added variable button fix --- app/assets/javascripts/comment_type_toggle.js | 36 ++++++++++--------- app/assets/javascripts/notes.js | 2 +- spec/javascripts/comment_type_toggle_spec.js | 18 ++++++++-- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/comment_type_toggle.js b/app/assets/javascripts/comment_type_toggle.js index ba3b43b201d..de9dc5979a3 100644 --- a/app/assets/javascripts/comment_type_toggle.js +++ b/app/assets/javascripts/comment_type_toggle.js @@ -31,23 +31,27 @@ class CommentTypeToggle { }], }; - if (!this.closeButton || !this.reopenButton) return config; + if (this.closeButton) { + config.InputSetter.push({ + input: this.closeButton, + valueAttribute: 'data-close-text', + }, { + input: this.closeButton, + valueAttribute: 'data-close-text', + inputAttribute: 'data-alternative-text', + }); + } - config.InputSetter.push({ - input: this.closeButton, - valueAttribute: 'data-close-text', - }, { - input: this.closeButton, - valueAttribute: 'data-close-text', - inputAttribute: 'data-alternative-text', - }, { - input: this.reopenButton, - valueAttribute: 'data-reopen-text', - }, { - input: this.reopenButton, - valueAttribute: 'data-reopen-text', - inputAttribute: 'data-alternative-text', - }); + if (this.reopenButton) { + config.InputSetter.push({ + input: this.reopenButton, + valueAttribute: 'data-reopen-text', + }, { + input: this.reopenButton, + valueAttribute: 'data-reopen-text', + inputAttribute: 'data-alternative-text', + }); + } return config; } diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 2a8f4acc72a..795c1986c89 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -143,7 +143,7 @@ require('./task_list'); const noteTypeInput = form.querySelector('#note_type'); const submitButton = form.querySelector('.js-comment-type-dropdown .js-comment-submit-button'); const closeButton = form.querySelector('.js-note-target-close'); - const reopenButton = form.querySelector('.js-note-target-reopen'); + const reopenButton = form.querySelector('.reopen-mr-link') || form.querySelector('.js-note-target-reopen'); const commentTypeToggle = new CommentTypeToggle({ dropdownTrigger, diff --git a/spec/javascripts/comment_type_toggle_spec.js b/spec/javascripts/comment_type_toggle_spec.js index 9a341ebd811..dfd0810d52e 100644 --- a/spec/javascripts/comment_type_toggle_spec.js +++ b/spec/javascripts/comment_type_toggle_spec.js @@ -101,7 +101,7 @@ describe('CommentTypeToggle', function () { this.setConfig = CommentTypeToggle.prototype.setConfig.call(this.commentTypeToggle); }); - it('should not add .closeButton or .reopenButton related InputSetter config', function () { + it('should not add .closeButton related InputSetter config', function () { expect(this.setConfig).toEqual({ InputSetter: [{ input: this.commentTypeToggle.noteTypeInput, @@ -109,6 +109,13 @@ describe('CommentTypeToggle', function () { }, { input: this.commentTypeToggle.submitButton, valueAttribute: 'data-submit-text', + }, { + input: this.commentTypeToggle.reopenButton, + valueAttribute: 'data-reopen-text', + }, { + input: this.commentTypeToggle.reopenButton, + valueAttribute: 'data-reopen-text', + inputAttribute: 'data-alternative-text', }], }); }); @@ -127,7 +134,7 @@ describe('CommentTypeToggle', function () { this.setConfig = CommentTypeToggle.prototype.setConfig.call(this.commentTypeToggle); }); - it('should not add .closeButton or .reopenButton related InputSetter config', function () { + it('should not add .reopenButton related InputSetter config', function () { expect(this.setConfig).toEqual({ InputSetter: [{ input: this.commentTypeToggle.noteTypeInput, @@ -135,6 +142,13 @@ describe('CommentTypeToggle', function () { }, { input: this.commentTypeToggle.submitButton, valueAttribute: 'data-submit-text', + }, { + input: this.commentTypeToggle.closeButton, + valueAttribute: 'data-close-text', + }, { + input: this.commentTypeToggle.closeButton, + valueAttribute: 'data-close-text', + inputAttribute: 'data-alternative-text', }], }); }); From 05339515631d93f0fb8d9526693017af91cbf5d5 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 7 Apr 2017 16:24:32 +0100 Subject: [PATCH 60/70] Add link to list items --- app/assets/stylesheets/pages/note_form.scss | 15 ++++++++-- .../projects/notes/_comment_button.html.haml | 28 ++++++++++--------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index c71a4e717f8..6d6e037d3e6 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -333,10 +333,21 @@ } li { - white-space: nowrap; - cursor: pointer; padding-top: 6px; + & > a { + margin: 0; + padding: 0; + color: inherit; + border-radius: 0; + + &:hover, + &:focus { + background-color: inherit; + color: inherit; + } + } + &:hover, &:focus { background-color: $dropdown-hover-color; diff --git a/app/views/projects/notes/_comment_button.html.haml b/app/views/projects/notes/_comment_button.html.haml index 8627713fd68..db18322c8eb 100644 --- a/app/views/projects/notes/_comment_button.html.haml +++ b/app/views/projects/notes/_comment_button.html.haml @@ -9,20 +9,22 @@ %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } } %li#comment.droplab-item-selected{ data: { value: '', 'submit-text' => 'Comment', 'close-text' => "Comment & close #{noteable_name}", 'reopen-text' => "Comment & reopen #{noteable_name}" } } - = icon('check') - .description - %strong Comment - %p - Add a general comment to this #{noteable_name}. + %a{ href: '#' } + = icon('check') + .description + %strong Comment + %p + Add a general comment to this #{noteable_name}. %li.divider %li#discussion{ data: { value: 'DiscussionNote', 'submit-text' => 'Start discussion', 'close-text' => "Start discussion & close #{noteable_name}", 'reopen-text' => "Start discussion & reopen #{noteable_name}" } } - = icon('check') - .description - %strong Start discussion - %p - = succeed '.' do - Discuss a specific suggestion or question - - if @note.noteable.supports_resolvable_notes? - that needs to be resolved + %a{ href: '#' } + = icon('check') + .description + %strong Start discussion + %p + = succeed '.' do + Discuss a specific suggestion or question + - if @note.noteable.supports_resolvable_notes? + that needs to be resolved From bea1aba9caff0b19bc08004cfb80cb9e5f1b6b89 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 7 Apr 2017 10:31:49 -0500 Subject: [PATCH 61/70] Update schema.rb --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 457957536b0..a8ca4d4757d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170405080720) do +ActiveRecord::Schema.define(version: 20170406115029) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" enable_extension "pg_trgm" From 2a771d570a3ce523b2e9c9ce435476fa093d161f Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 7 Apr 2017 10:33:48 -0500 Subject: [PATCH 62/70] Fix view spec --- spec/views/projects/notes/_form.html.haml_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/views/projects/notes/_form.html.haml_spec.rb b/spec/views/projects/notes/_form.html.haml_spec.rb index b61f016967f..a364f9bce92 100644 --- a/spec/views/projects/notes/_form.html.haml_spec.rb +++ b/spec/views/projects/notes/_form.html.haml_spec.rb @@ -4,7 +4,7 @@ describe 'projects/notes/_form' do include Devise::Test::ControllerHelpers let(:user) { create(:user) } - let(:project) { create(:empty_project) } + let(:project) { create(:project, :repository) } before do project.team << [user, :master] @@ -20,7 +20,7 @@ describe 'projects/notes/_form' do context "with a note on #{noteable}" do let(:note) { build(:"note_on_#{noteable}", project: project) } - it 'says that only markdown is supported, not slash commands' do + it 'says that markdown and slash commands are supported' do expect(rendered).to have_content('Markdown and slash commands are supported') end end From d80f903673ed246e2d0687728cbde31463d5b2ad Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 7 Apr 2017 11:12:43 -0500 Subject: [PATCH 63/70] Fix creating discussion when diff view is set to parallel --- app/assets/javascripts/notes.js | 44 ++++++++++++---------------- app/assets/javascripts/render_gfm.js | 1 + 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 795c1986c89..2620e31ca80 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -338,7 +338,7 @@ require('./task_list'); */ Notes.prototype.renderDiscussionNote = function(note, $form) { - var discussionContainer, form, note_html, row, lineType, diffAvatarContainer; + var discussionContainer, form, row, lineType, diffAvatarContainer; if (!this.isNewNote(note)) { return; } @@ -347,45 +347,37 @@ require('./task_list'); row = form.closest("tr"); lineType = this.isParallelView() ? form.find('#line_type').val() : 'old'; diffAvatarContainer = row.prevAll('.line_holder').first().find('.js-avatar-container.' + lineType + '_line'); - note_html = $(note.html); - note_html.renderGFM(); // is this the first note of discussion? discussionContainer = $(".notes[data-discussion-id='" + note.discussion_id + "']"); if (!discussionContainer.length) { discussionContainer = form.closest('.discussion').find('.notes'); } if (discussionContainer.length === 0) { - if (!this.isParallelView() || row.hasClass('js-temp-notes-holder')) { - // insert the note and the reply button after the temp row - row.after(note.diff_discussion_html); + if (note.diff_discussion_html) { + var $discussion = $(note.diff_discussion_html).renderGFM(); - // remove the note (will be added again below) - row.next().find(".note").remove(); - } else { - // Merge new discussion HTML in - var $discussion = $(note.diff_discussion_html); - var $notes = $discussion.find('.notes[data-discussion-id="' + note.discussion_id + '"]'); - var contentContainerClass = '.' + $notes.closest('.notes_content') - .attr('class') - .split(' ') - .join('.'); + if (!this.isParallelView() || row.hasClass('js-temp-notes-holder')) { + // insert the note and the reply button after the temp row + row.after($discussion); + } else { + // Merge new discussion HTML in + var $notes = $discussion.find('.notes[data-discussion-id="' + note.discussion_id + '"]'); + var contentContainerClass = '.' + $notes.closest('.notes_content') + .attr('class') + .split(' ') + .join('.'); - // remove the note (will be added again below) - $notes.find('.note').remove(); - - row.find(contentContainerClass + ' .content').append($notes.closest('.content').children()); + row.find(contentContainerClass + ' .content').append($notes.closest('.content').children()); + } } - // Before that, the container didn't exist - discussionContainer = $(".notes[data-discussion-id='" + note.discussion_id + "']"); - // Add note to 'Changes' page discussions - discussionContainer.append(note_html); + // Init discussion on 'Discussion' page if it is merge request page if ($('body').attr('data-page').indexOf('projects:merge_request') === 0 || !note.diff_discussion_html) { - $('ul.main-notes-list').append(note.discussion_html).renderGFM(); + $('ul.main-notes-list').append($(note.discussion_html).renderGFM()); } } else { // append new note to all matching discussions - discussionContainer.append(note_html); + discussionContainer.append($(note.html).renderGFM()); } if (typeof gl.diffNotesCompileComponents !== 'undefined' && note.discussion_resolvable) { diff --git a/app/assets/javascripts/render_gfm.js b/app/assets/javascripts/render_gfm.js index ea91aaa10a6..2c3a9cacd38 100644 --- a/app/assets/javascripts/render_gfm.js +++ b/app/assets/javascripts/render_gfm.js @@ -8,6 +8,7 @@ $.fn.renderGFM = function() { this.find('.js-syntax-highlight').syntaxHighlight(); this.find('.js-render-math').renderMath(); + return this; }; $(document).on('ready load', function() { From 8c161d7bbefeff38b4927dff94e89dda6453c6a7 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 7 Apr 2017 11:29:29 -0500 Subject: [PATCH 64/70] Fix bug where commit comment would not show up in the right discussion on the MR page --- app/models/discussion.rb | 18 +++++++++--------- app/models/note.rb | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/models/discussion.rb b/app/models/discussion.rb index 2c0e6379e6a..0b6b920ed66 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -4,7 +4,7 @@ class Discussion include ResolvableDiscussion - attr_reader :notes, :noteable + attr_reader :notes, :context_noteable delegate :created_at, :project, @@ -16,12 +16,12 @@ class Discussion to: :first_note - def self.build(notes, noteable = nil) - notes.first.discussion_class(noteable).new(notes, noteable) + def self.build(notes, context_noteable = nil) + notes.first.discussion_class(context_noteable).new(notes, context_noteable) end - def self.build_collection(notes, noteable = nil) - notes.group_by { |n| n.discussion_id(noteable) }.values.map { |notes| build(notes, noteable) } + def self.build_collection(notes, context_noteable = nil) + notes.group_by { |n| n.discussion_id(context_noteable) }.values.map { |notes| build(notes, context_noteable) } end # Returns an alphanumeric discussion ID based on `build_discussion_id` @@ -60,14 +60,14 @@ class Discussion DiscussionNote end - def initialize(notes, noteable = nil) + def initialize(notes, context_noteable = nil) @notes = notes - @noteable = noteable + @context_noteable = context_noteable end def ==(other) other.class == self.class && - other.noteable == self.noteable && + other.context_noteable == self.context_noteable && other.id == self.id && other.notes == self.notes end @@ -81,7 +81,7 @@ class Discussion end def id - first_note.discussion_id(noteable) + first_note.discussion_id(context_noteable) end alias_method :to_param, :id diff --git a/app/models/note.rb b/app/models/note.rb index 401e3d7bcbc..1ea7b946061 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -102,8 +102,8 @@ class Note < ActiveRecord::Base ActiveModel::Name.new(self, nil, 'note') end - def discussions(noteable = nil) - Discussion.build_collection(fresh, noteable) + def discussions(context_noteable = nil) + Discussion.build_collection(fresh, context_noteable) end def find_discussion(discussion_id) From 8325d3fd1e5bb8ef9d9b9f77e64e2580196ce87b Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 7 Apr 2017 18:18:02 +0100 Subject: [PATCH 65/70] Fix firefox overflow css bug --- app/assets/stylesheets/pages/note_form.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 6d6e037d3e6..05b9018d21e 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -340,6 +340,7 @@ padding: 0; color: inherit; border-radius: 0; + text-overflow: inherit; &:hover, &:focus { From 06e7de40a54d4217b5df71d578e9a3382786f642 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 7 Apr 2017 19:37:12 +0100 Subject: [PATCH 66/70] Review changes --- app/assets/javascripts/comment_type_toggle.js | 4 +-- app/assets/javascripts/notes.js | 2 +- app/assets/stylesheets/pages/note_form.scss | 35 ++++++++++++++++--- .../projects/notes/_comment_button.html.haml | 2 +- 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/comment_type_toggle.js b/app/assets/javascripts/comment_type_toggle.js index de9dc5979a3..df0ba86198c 100644 --- a/app/assets/javascripts/comment_type_toggle.js +++ b/app/assets/javascripts/comment_type_toggle.js @@ -1,5 +1,5 @@ -import DropLab from '~/droplab/drop_lab'; -import InputSetter from '~/droplab/plugins/input_setter'; +import DropLab from './droplab/drop_lab'; +import InputSetter from './droplab/plugins/input_setter'; class CommentTypeToggle { constructor(opts = {}) { diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 2620e31ca80..eeb97fa2ee0 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -791,7 +791,7 @@ require('./task_list'); if (typeof gl.diffNotesCompileComponents !== 'undefined') { var $commentBtn = form.find('comment-and-resolve-btn'); - $commentBtn.attr(':discussion-id', "'" + discussionID + "'"); + $commentBtn.attr(':discussion-id', `'${discussionID}'`); gl.diffNotesCompileComponents(); } diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 05b9018d21e..b637994adf8 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -312,11 +312,19 @@ } .comment-type-dropdown { - .dropdown-toggle .fa { - color: $white-light; - padding-right: 2px; - margin-top: 2px; - pointer-events: none; + .comment-btn { + width: auto; + } + + .dropdown-toggle { + float: right; + + .toggle-icon { + color: $white-light; + padding-right: 2px; + margin-top: 2px; + pointer-events: none; + } } .dropdown-menu { @@ -375,4 +383,21 @@ padding: 0; border-top: $gray-darkest; } + + @media (max-width: $screen-xs-max) { + display: flex; + width: 100%; + + .comment-btn { + flex-grow: 1; + flex-shrink: 0; + width: auto; + } + + .dropdown-toggle { + flex-grow: 0; + flex-shrink: 1; + width: auto; + } + } } diff --git a/app/views/projects/notes/_comment_button.html.haml b/app/views/projects/notes/_comment_button.html.haml index db18322c8eb..6bb55f04b6e 100644 --- a/app/views/projects/notes/_comment_button.html.haml +++ b/app/views/projects/notes/_comment_button.html.haml @@ -5,7 +5,7 @@ - if @note.can_be_discussion_note? = button_tag type: 'button', class: 'btn btn-nr dropdown-toggle comment-btn js-note-new-discussion js-disable-on-submit', data: { 'dropdown-trigger' => '#resolvable-comment-menu' }, 'aria-label' => 'Open comment type dropdown' do - = icon('caret-down') + = icon('caret-down', class: 'toggle-icon') %ul#resolvable-comment-menu.dropdown-menu{ data: { dropdown: true } } %li#comment.droplab-item-selected{ data: { value: '', 'submit-text' => 'Comment', 'close-text' => "Comment & close #{noteable_name}", 'reopen-text' => "Comment & reopen #{noteable_name}" } } From 501d403202d8b4f603dd1864790f56e85633b8ef Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 7 Apr 2017 20:57:13 +0100 Subject: [PATCH 67/70] Rever yarn.lock changes --- yarn.lock | 2351 +++++++---------------------------------------------- 1 file changed, 276 insertions(+), 2075 deletions(-) diff --git a/yarn.lock b/yarn.lock index 783dba2ff73..266bcc63385 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,12 +2,6 @@ # yarn lockfile v1 -"@gitlab-org/droplab@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@gitlab-org/droplab/-/droplab-0.1.0.tgz#934889d0f19417198e277415fdd336616b2e2c87" - dependencies: - custom-event-polyfill "^0.3.0" - abbrev@1, abbrev@1.0.x: version "1.0.9" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" @@ -20,8 +14,8 @@ accepts@1.3.3, accepts@~1.3.3: negotiator "0.6.1" acorn-dynamic-import@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4" + version "2.0.1" + resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz#23f671eb6e650dab277fef477c321b1178a8cca2" dependencies: acorn "^4.0.3" @@ -31,18 +25,18 @@ acorn-jsx@^3.0.0: dependencies: acorn "^3.0.4" +acorn@4.0.4, acorn@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a" + acorn@^3.0.4: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" -acorn@^4.0.11, acorn@^4.0.3, acorn@^4.0.4: +acorn@^4.0.11, acorn@^4.0.3: version "4.0.11" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0" -acorn@^5.0.1: - version "5.0.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d" - after@0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" @@ -51,9 +45,9 @@ ajv-keywords@^1.0.0, ajv-keywords@^1.1.1: version "1.5.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c" -ajv@^4.7.0, ajv@^4.9.1: - version "4.11.5" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd" +ajv@^4.7.0: + version "4.11.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.2.tgz#f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6" dependencies: co "^4.6.0" json-stable-stringify "^1.0.1" @@ -100,8 +94,8 @@ append-transform@^0.4.0: default-require-extensions "^1.0.0" aproba@^1.0.3: - version "1.1.1" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab" + version "1.1.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.0.tgz#4d8f047a318604e18e3c06a0e52230d3d19f147b" are-we-there-yet@~1.1.2: version "1.1.2" @@ -172,14 +166,14 @@ asn1@~0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - assert-plus@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" +assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + assert@^1.1.1: version "1.4.1" resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" @@ -190,17 +184,17 @@ async-each@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" -async@0.2.x: +async@0.2.x, async@~0.2.6: version "0.2.10" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" -async@1.x, async@^1.4.0, async@^1.5.2: +async@1.x, async@^1.4.0, async@^1.4.2, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" async@^2.1.2, async@^2.1.4: - version "2.3.0" - resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9" + version "2.1.4" + resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4" dependencies: lodash "^4.14.0" @@ -228,15 +222,15 @@ babel-code-frame@^6.16.0, babel-code-frame@^6.22.0: esutils "^2.0.2" js-tokens "^3.0.0" -babel-core@^6.22.1, babel-core@^6.24.0: - version "6.24.0" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.0.tgz#8f36a0a77f5c155aed6f920b844d23ba56742a02" +babel-core@^6.22.1, babel-core@^6.23.0: + version "6.23.1" + resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.23.1.tgz#c143cb621bb2f621710c220c5d579d15b8a442df" dependencies: babel-code-frame "^6.22.0" - babel-generator "^6.24.0" + babel-generator "^6.23.0" babel-helpers "^6.23.0" babel-messages "^6.23.0" - babel-register "^6.24.0" + babel-register "^6.23.0" babel-runtime "^6.22.0" babel-template "^6.23.0" babel-traverse "^6.23.1" @@ -252,9 +246,9 @@ babel-core@^6.22.1, babel-core@^6.24.0: slash "^1.0.0" source-map "^0.5.0" -babel-generator@^6.18.0, babel-generator@^6.24.0: - version "6.24.0" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56" +babel-generator@^6.18.0, babel-generator@^6.23.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.23.0.tgz#6b8edab956ef3116f79d8c84c5a3c05f32a74bc5" dependencies: babel-messages "^6.23.0" babel-runtime "^6.22.0" @@ -384,11 +378,11 @@ babel-helpers@^6.23.0: babel-template "^6.23.0" babel-loader@^6.2.10: - version "6.4.1" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca" + version "6.2.10" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.2.10.tgz#adefc2b242320cd5d15e65b31cea0e8b1b02d4b0" dependencies: find-cache-dir "^0.1.1" - loader-utils "^0.2.16" + loader-utils "^0.2.11" mkdirp "^0.5.1" object-assign "^4.0.1" @@ -405,12 +399,12 @@ babel-plugin-check-es2015-constants@^6.22.0: babel-runtime "^6.22.0" babel-plugin-istanbul@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.1.tgz#c12de0fc6fe42adfb16be56f1ad11e4a9782eca9" + version "4.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.0.0.tgz#36bde8fbef4837e5ff0366531a2beabd7b1ffa10" dependencies: find-up "^2.1.0" - istanbul-lib-instrument "^1.6.2" - test-exclude "^4.0.3" + istanbul-lib-instrument "^1.4.2" + test-exclude "^4.0.0" babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" @@ -751,11 +745,11 @@ babel-preset-stage-3@^6.22.0: babel-plugin-transform-exponentiation-operator "^6.22.0" babel-plugin-transform-object-rest-spread "^6.22.0" -babel-register@^6.24.0: - version "6.24.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.0.tgz#5e89f8463ba9970356d02eb07dabe3308b080cfd" +babel-register@^6.23.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.23.0.tgz#c9aa3d4cca94b51da34826c4a0f9e08145d74ff3" dependencies: - babel-core "^6.24.0" + babel-core "^6.23.0" babel-runtime "^6.22.0" core-js "^2.4.0" home-or-tmp "^2.0.0" @@ -764,8 +758,8 @@ babel-register@^6.24.0: source-map-support "^0.4.2" babel-runtime@^6.18.0, babel-runtime@^6.22.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b" + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611" dependencies: core-js "^2.4.0" regenerator-runtime "^0.10.0" @@ -804,8 +798,8 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23 to-fast-properties "^1.0.1" babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0: - version "6.16.1" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3" + version "6.15.0" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e" backo2@1.0.2: version "1.0.2" @@ -862,25 +856,25 @@ block-stream@*: inherits "~2.0.0" bluebird@^3.3.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" + version "3.4.7" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.6" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215" -body-parser@^1.16.1: - version "1.17.1" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.17.1.tgz#75b3bc98ddd6e7e0d8ffe750dfaca5c66993fa47" +body-parser@^1.12.4: + version "1.16.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.16.0.tgz#924a5e472c6229fb9d69b85a20d5f2532dec788b" dependencies: bytes "2.4.0" content-type "~1.0.2" - debug "2.6.1" + debug "2.6.0" depd "~1.1.0" - http-errors "~1.6.1" + http-errors "~1.5.1" iconv-lite "0.4.15" on-finished "~2.3.0" - qs "6.4.0" + qs "6.2.1" raw-body "~2.2.0" type-is "~1.6.14" @@ -891,12 +885,12 @@ boom@2.x.x: hoek "2.x.x" bootstrap-sass@^3.3.6: - version "3.3.7" - resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz#6596c7ab40f6637393323ab0bc80d064fc630498" + version "3.3.6" + resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.6.tgz#363b0d300e868d3e70134c1a742bb17288444fd1" brace-expansion@^1.0.0: - version "1.1.7" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59" + version "1.1.6" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9" dependencies: balanced-match "^0.4.1" concat-map "0.0.1" @@ -916,8 +910,8 @@ braces@^1.8.2: repeat-element "^1.1.2" brorand@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" + version "1.0.7" + resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.0.7.tgz#6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc" browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.0.6" @@ -953,8 +947,8 @@ browserify-rsa@^4.0.0: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298" + version "4.0.0" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.0.tgz#10773910c3c206d5420a46aad8694f820b85968f" dependencies: bn.js "^4.1.1" browserify-rsa "^4.0.0" @@ -970,7 +964,7 @@ browserify-zlib@^0.1.4: dependencies: pako "~0.2.0" -buffer-shims@~1.0.0: +buffer-shims@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" @@ -1028,10 +1022,6 @@ caseless@~0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7" -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - center-align@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" @@ -1155,10 +1145,10 @@ component-inherit@0.0.3: resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" compressible@~2.0.8: - version "2.0.10" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd" + version "2.0.9" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.9.tgz#6daab4e2b599c2770dd9e21e7a891b1c5a755425" dependencies: - mime-db ">= 1.27.0 < 2" + mime-db ">= 1.24.0 < 2" compression-webpack-plugin@^0.3.2: version "0.3.2" @@ -1192,7 +1182,7 @@ concat-stream@1.5.0: readable-stream "~2.0.0" typedarray "~0.0.5" -concat-stream@^1.5.2: +concat-stream@^1.4.6: version "1.6.0" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" dependencies: @@ -1204,12 +1194,12 @@ connect-history-api-fallback@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169" -connect@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.0.tgz#f09a4f7dcd17324b663b725c815bdb1c4158a46e" +connect@^3.3.5: + version "3.5.0" + resolved "https://registry.yarnpkg.com/connect/-/connect-3.5.0.tgz#b357525a0b4c1f50599cd983e1d9efeea9677198" dependencies: - debug "2.6.1" - finalhandler "1.0.0" + debug "~2.2.0" + finalhandler "0.5.0" parseurl "~1.3.1" utils-merge "1.0.0" @@ -1240,8 +1230,8 @@ content-type@~1.0.2: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed" convert-source-map@^1.1.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5" + version "1.3.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.3.0.tgz#e9f3e9c6e2728efc2676696a70eb382f73106a67" cookie-signature@1.0.6: version "1.0.6" @@ -1307,23 +1297,19 @@ crypto-browserify@^3.11.0: public-encrypt "^4.0.0" randombytes "^2.0.0" -custom-event-polyfill@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/custom-event-polyfill/-/custom-event-polyfill-0.3.0.tgz#99807839be62edb446b645832e0d80ead6fa1888" - custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" d3@^3.5.11: - version "3.5.17" - resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8" + version "3.5.11" + resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.11.tgz#d130750eed0554db70e8432102f920a12407b69c" -d@1: - version "1.0.0" - resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" +d@^0.1.1, d@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309" dependencies: - es5-ext "^0.10.9" + es5-ext "~0.10.2" dashdash@^1.12.0: version "1.14.1" @@ -1351,15 +1337,9 @@ debug@2.3.3: dependencies: ms "0.7.2" -debug@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351" - dependencies: - ms "0.7.2" - -debug@2.6.3, debug@^2.1.1, debug@^2.2.0: - version "2.6.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d" +debug@2.6.0, debug@^2.1.1, debug@^2.2.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b" dependencies: ms "0.7.2" @@ -1407,7 +1387,7 @@ delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" -depd@1.1.0, depd@~1.1.0: +depd@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3" @@ -1440,23 +1420,16 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -doctrine@1.5.0: +doctrine@1.5.0, doctrine@^1.2.2: version "1.5.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" dependencies: esutils "^2.0.2" isarray "^1.0.0" -doctrine@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63" - dependencies: - esutils "^2.0.2" - isarray "^1.0.0" - document-register-element@^1.3.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.4.1.tgz#22b41e96fb86cccab2fa30f7d2a8d62ac7be8c57" + version "1.3.0" + resolved "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.3.0.tgz#fb3babb523c74662be47be19c6bc33e71990d940" dom-serialize@^2.2.0: version "2.2.1" @@ -1472,8 +1445,8 @@ domain-browser@^1.1.1: resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" dropzone@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-4.3.0.tgz#48b0b8f2ad092872e4b535b672a7c3f1a1d67c91" + version "4.2.0" + resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-4.2.0.tgz#fbe7acbb9918e0706489072ef663effeef8a79f3" duplexer@^0.1.1: version "0.1.1" @@ -1494,16 +1467,13 @@ ejs@^2.5.5: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88" elliptic@^6.0.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df" + version "6.3.3" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.3.tgz#5482d9646d54bcb89fd7d994fc9e2e9568876e3f" dependencies: bn.js "^4.4.0" brorand "^1.0.1" hash.js "^1.0.0" - hmac-drbg "^1.0.0" inherits "^2.0.1" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.0" emoji-unicode-version@^0.2.1: version "0.2.1" @@ -1517,9 +1487,9 @@ encodeurl@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20" -engine.io-client@1.8.3: - version "1.8.3" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.3.tgz#1798ed93451246453d4c6f635d7a201fe940d5ab" +engine.io-client@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.2.tgz#c38767547f2a7d184f5752f6f0ad501006703766" dependencies: component-emitter "1.2.1" component-inherit "0.0.3" @@ -1530,7 +1500,7 @@ engine.io-client@1.8.3: parsejson "0.0.3" parseqs "0.0.5" parseuri "0.0.5" - ws "1.1.2" + ws "1.1.1" xmlhttprequest-ssl "1.5.3" yeast "0.1.2" @@ -1545,16 +1515,16 @@ engine.io-parser@1.3.2: has-binary "0.1.7" wtf-8 "1.0.0" -engine.io@1.8.3: - version "1.8.3" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.3.tgz#8de7f97895d20d39b85f88eeee777b2bd42b13d4" +engine.io@1.8.2: + version "1.8.2" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.2.tgz#6b59be730b348c0125b0a4589de1c355abcf7a7e" dependencies: accepts "1.3.3" base64id "1.0.0" cookie "0.3.1" debug "2.3.3" engine.io-parser "1.3.2" - ws "1.1.2" + ws "1.1.1" enhanced-resolve@^3.0.0: version "3.1.0" @@ -1584,36 +1554,36 @@ errno@^0.1.3: prr "~0.0.0" error-ex@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" + version "1.3.0" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.0.tgz#e67b43f3e82c96ea3a584ffee0b9fc3325d802d9" dependencies: is-arrayish "^0.2.1" -es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.15" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.15.tgz#c330a5934c1ee21284a7c081a86e5fd937c91ea6" +es5-ext@^0.10.7, es5-ext@^0.10.8, es5-ext@~0.10.11, es5-ext@~0.10.2, es5-ext@~0.10.7: + version "0.10.12" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.12.tgz#aa84641d4db76b62abba5e45fd805ecbab140047" dependencies: es6-iterator "2" es6-symbol "~3.1" -es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512" +es6-iterator@2: + version "2.0.0" + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.0.tgz#bd968567d61635e33c0b80727613c9cb4b096bac" dependencies: - d "1" - es5-ext "^0.10.14" - es6-symbol "^3.1" + d "^0.1.1" + es5-ext "^0.10.7" + es6-symbol "3" es6-map@^0.1.3: - version "0.1.5" - resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0" + version "0.1.4" + resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.4.tgz#a34b147be224773a4d7da8072794cefa3632b897" dependencies: - d "1" - es5-ext "~0.10.14" - es6-iterator "~2.0.1" - es6-set "~0.1.5" - es6-symbol "~3.1.1" - event-emitter "~0.3.5" + d "~0.1.1" + es5-ext "~0.10.11" + es6-iterator "2" + es6-set "~0.1.3" + es6-symbol "~3.1.0" + event-emitter "~0.3.4" es6-promise@~3.0.2: version "3.0.2" @@ -1623,31 +1593,31 @@ es6-promise@~4.0.3: version "4.0.5" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42" -es6-set@~0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1" +es6-set@~0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.4.tgz#9516b6761c2964b92ff479456233a247dc707ce8" dependencies: - d "1" - es5-ext "~0.10.14" - es6-iterator "~2.0.1" - es6-symbol "3.1.1" - event-emitter "~0.3.5" + d "~0.1.1" + es5-ext "~0.10.11" + es6-iterator "2" + es6-symbol "3" + event-emitter "~0.3.4" -es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" +es6-symbol@3, es6-symbol@~3.1, es6-symbol@~3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa" dependencies: - d "1" - es5-ext "~0.10.14" + d "~0.1.1" + es5-ext "~0.10.11" es6-weak-map@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f" + version "2.0.1" + resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.1.tgz#0d2bbd8827eb5fb4ba8f97fbfea50d43db21ea81" dependencies: - d "1" - es5-ext "^0.10.14" - es6-iterator "^2.0.1" - es6-symbol "^3.1.1" + d "^0.1.1" + es5-ext "^0.10.8" + es6-iterator "2" + es6-symbol "3" escape-html@~1.0.3: version "1.0.3" @@ -1740,17 +1710,16 @@ eslint-plugin-jasmine@^2.1.0: resolved "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.2.0.tgz#7135879383c39a667c721d302b9f20f0389543de" eslint@^3.10.1: - version "3.19.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc" + version "3.15.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.15.0.tgz#bdcc6a6c5ffe08160e7b93c066695362a91e30f2" dependencies: babel-code-frame "^6.16.0" chalk "^1.1.3" - concat-stream "^1.5.2" + concat-stream "^1.4.6" debug "^2.1.1" - doctrine "^2.0.0" + doctrine "^1.2.2" escope "^3.6.0" espree "^3.4.0" - esquery "^1.0.0" estraverse "^4.2.0" esutils "^2.0.2" file-entry-cache "^2.0.0" @@ -1780,10 +1749,10 @@ eslint@^3.10.1: user-home "^2.0.0" espree@^3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2" + version "3.4.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.0.tgz#41656fa5628e042878025ef467e78f125cb86e1d" dependencies: - acorn "^5.0.1" + acorn "4.0.4" acorn-jsx "^3.0.0" esprima@2.7.x, esprima@^2.7.1: @@ -1794,12 +1763,6 @@ esprima@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" -esquery@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa" - dependencies: - estraverse "^4.0.0" - esrecurse@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220" @@ -1811,7 +1774,7 @@ estraverse@^1.9.1: version "1.9.3" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44" -estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -1823,20 +1786,20 @@ esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" -etag@~1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.0.tgz#6f631aef336d6c46362b51764044ce216be3c051" +etag@~1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.7.0.tgz#03d30b5f67dd6e632d2945d30d6652731a34d5d8" eve-raphael@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz#17c754b792beef3fa6684d79cf5a47c63c4cda30" -event-emitter@~0.3.5: - version "0.3.5" - resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" +event-emitter@~0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.4.tgz#8d63ddfb4cfe1fae3b32ca265c4c720222080bb5" dependencies: - d "1" - es5-ext "~0.10.14" + d "~0.1.1" + es5-ext "~0.10.7" eventemitter3@1.x.x: version "1.2.0" @@ -1846,7 +1809,7 @@ events@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" -eventsource@0.1.6: +eventsource@~0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232" dependencies: @@ -1890,8 +1853,8 @@ expand-range@^1.8.1: fill-range "^2.1.0" express@^4.13.3, express@^4.14.1: - version "4.15.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.15.2.tgz#af107fc148504457f2dca9a6f2571d7129b97b35" + version "4.14.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.14.1.tgz#646c237f766f148c2120aff073817b9e4d7e0d33" dependencies: accepts "~1.3.3" array-flatten "1.1.1" @@ -1899,25 +1862,23 @@ express@^4.13.3, express@^4.14.1: content-type "~1.0.2" cookie "0.3.1" cookie-signature "1.0.6" - debug "2.6.1" + debug "~2.2.0" depd "~1.1.0" encodeurl "~1.0.1" escape-html "~1.0.3" - etag "~1.8.0" - finalhandler "~1.0.0" - fresh "0.5.0" + etag "~1.7.0" + finalhandler "0.5.1" + fresh "0.3.0" merge-descriptors "1.0.1" methods "~1.1.2" on-finished "~2.3.0" parseurl "~1.3.1" path-to-regexp "0.1.7" proxy-addr "~1.1.3" - qs "6.4.0" + qs "6.2.0" range-parser "~1.2.0" - send "0.15.1" - serve-static "1.12.1" - setprototypeof "1.0.3" - statuses "~1.3.1" + send "0.14.2" + serve-static "~1.11.2" type-is "~1.6.14" utils-merge "1.0.0" vary "~1.1.0" @@ -1999,8 +1960,8 @@ fileset@^2.0.2: minimatch "^3.0.3" filesize@^3.5.4: - version "3.5.6" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a" + version "3.5.4" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.4.tgz#742fc7fb6aef4ee3878682600c22f840731e1fda" fill-range@^2.1.0: version "2.2.3" @@ -2012,27 +1973,23 @@ fill-range@^2.1.0: repeat-element "^1.1.2" repeat-string "^1.5.2" -finalhandler@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.0.tgz#b5691c2c0912092f18ac23e9416bde5cd7dc6755" +finalhandler@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.0.tgz#e9508abece9b6dba871a6942a1d7911b91911ac7" dependencies: - debug "2.6.1" - encodeurl "~1.0.1" + debug "~2.2.0" escape-html "~1.0.3" on-finished "~2.3.0" - parseurl "~1.3.1" - statuses "~1.3.1" + statuses "~1.3.0" unpipe "~1.0.0" -finalhandler@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.1.tgz#bcd15d1689c0e5ed729b6f7f541a6df984117db8" +finalhandler@0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.1.tgz#2c400d8d4530935bc232549c5fa385ec07de6fcd" dependencies: - debug "2.6.3" - encodeurl "~1.0.1" + debug "~2.2.0" escape-html "~1.0.3" on-finished "~2.3.0" - parseurl "~1.3.1" statuses "~1.3.1" unpipe "~1.0.0" @@ -2070,15 +2027,15 @@ flat-cache@^1.2.1: graceful-fs "^4.1.2" write "^0.2.1" -for-in@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" +for-in@^0.1.5: + version "0.1.6" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.6.tgz#c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8" for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" + version "0.1.4" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.4.tgz#0149b41a39088c7515f51ebe1c1386d45f935072" dependencies: - for-in "^1.0.1" + for-in "^0.1.5" forever-agent@~0.6.1: version "0.6.1" @@ -2096,9 +2053,9 @@ forwarded@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363" -fresh@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e" +fresh@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f" fs-extra@~1.0.0: version "1.0.0" @@ -2113,13 +2070,13 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff" + version "1.0.17" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.17.tgz#8537f3f12272678765b4fd6528c0f1f66f8f4558" dependencies: nan "^2.3.0" node-pre-gyp "^0.6.29" -fstream-ignore@^1.0.5: +fstream-ignore@~1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" dependencies: @@ -2127,9 +2084,9 @@ fstream-ignore@^1.0.5: inherits "2" minimatch "^3.0.0" -fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" +fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.10.tgz#604e8a92fe26ffd9f6fae30399d4984e1ab22822" dependencies: graceful-fs "^4.1.2" inherits "~2.0.0" @@ -2141,8 +2098,8 @@ function-bind@^1.0.2: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771" gauge@~2.7.1: - version "2.7.3" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.3.tgz#1c23855f962f17b3ad3d0dc7443f304542edfe09" + version "2.7.2" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.2.tgz#15cecc31b02d05345a5d6b0e171cdb3ad2307774" dependencies: aproba "^1.0.3" console-control-strings "^1.0.0" @@ -2151,6 +2108,7 @@ gauge@~2.7.1: signal-exit "^3.0.0" string-width "^1.0.1" strip-ansi "^3.0.1" + supports-color "^0.2.0" wide-align "^1.1.0" generate-function@^2.0.0: @@ -2208,8 +2166,8 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1: path-is-absolute "^1.0.0" globals@^9.0.0, globals@^9.14.0: - version "9.17.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286" + version "9.14.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034" globby@^5.0.0: version "5.0.0" @@ -2250,10 +2208,6 @@ handlebars@^4.0.1, handlebars@^4.0.3: optionalDependencies: uglify-js "^2.6" -har-schema@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" - har-validator@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d" @@ -2263,13 +2217,6 @@ har-validator@~2.0.6: is-my-json-valid "^2.12.4" pinkie-promise "^2.0.0" -har-validator@~4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" - dependencies: - ajv "^4.9.1" - har-schema "^1.0.5" - has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" @@ -2300,7 +2247,7 @@ has@^1.0.1: dependencies: function-bind "^1.0.2" -hash.js@^1.0.0, hash.js@^1.0.3: +hash.js@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573" dependencies: @@ -2322,14 +2269,6 @@ hawk@~3.1.3: hoek "2.x.x" sntp "1.x.x" -hmac-drbg@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.0.tgz#3db471f45aae4a994a0688322171f51b8b91bee5" - dependencies: - hash.js "^1.0.3" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.1" - hoek@2.x.x: version "2.16.3" resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" @@ -2342,8 +2281,8 @@ home-or-tmp@^2.0.0: os-tmpdir "^1.0.1" hosted-git-info@^2.1.4: - version "2.4.1" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.1.tgz#4b0445e41c004a8bd1337773a4ff790ca40318c8" + version "2.2.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.2.0.tgz#7a0d097863d886c0fabbdcd37bf1758d8becf8a5" hpack.js@^2.1.6: version "2.1.6" @@ -2362,7 +2301,7 @@ http-deceiver@^1.2.4: version "1.2.7" resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" -http-errors@~1.5.0: +http-errors@~1.5.0, http-errors@~1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750" dependencies: @@ -2370,18 +2309,9 @@ http-errors@~1.5.0: setprototypeof "1.0.2" statuses ">= 1.3.1 < 2" -http-errors@~1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.1.tgz#5f8b8ed98aca545656bf572997387f904a722257" - dependencies: - depd "1.1.0" - inherits "2.0.3" - setprototypeof "1.0.3" - statuses ">= 1.3.1 < 2" - -http-proxy-middleware@~0.17.4: - version "0.17.4" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833" +http-proxy-middleware@~0.17.1: + version "0.17.3" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz#940382147149b856084f5534752d5b5a8168cd1d" dependencies: http-proxy "^1.16.2" is-glob "^3.1.0" @@ -2416,8 +2346,8 @@ ieee754@^1.1.4: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" ignore@^3.2.0: - version "3.2.7" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.7.tgz#4810ca5f1d8eca5595213a34b94f2eb4ed926bbd" + version "3.2.2" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.2.tgz#1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410" immediate@~3.0.5: version "3.0.6" @@ -2469,8 +2399,8 @@ inquirer@^0.12.0: through "^2.3.6" interpret@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.2.tgz#f4f623f0bb7122f15f5717c8e254b8161b5c5b2d" + version "1.0.1" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c" invariant@^2.2.0: version "2.2.2" @@ -2482,9 +2412,9 @@ invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" -ipaddr.js@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec" +ipaddr.js@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.2.0.tgz#8aba49c9192799585bdd643e0ccb50e8ae777ba4" is-absolute@^0.2.3: version "0.2.6" @@ -2504,8 +2434,8 @@ is-binary-path@^1.0.0: binary-extensions "^1.0.0" is-buffer@^1.0.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc" + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b" is-builtin-module@^1.0.0: version "1.0.0" @@ -2564,8 +2494,8 @@ is-glob@^3.1.0: is-extglob "^2.1.0" is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4: - version "2.16.0" - resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693" + version "2.15.0" + resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz#936edda3ca3c211fd98f3b2d3e08da43f7b2915b" dependencies: generate-function "^2.0.0" generate-object-property "^1.1.0" @@ -2656,9 +2586,9 @@ isbinaryfile@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621" -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" +isexe@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0" isobject@^2.0.0: version "2.1.0" @@ -2671,64 +2601,66 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" istanbul-api@^1.1.1: - version "1.1.7" - resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.7.tgz#f6f37f09f8002b130f891c646b70ee4a8e7345ae" + version "1.1.1" + resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.1.tgz#d36e2f1560d1a43ce304c4ff7338182de61c8f73" dependencies: async "^2.1.4" fileset "^2.0.2" - istanbul-lib-coverage "^1.0.2" - istanbul-lib-hook "^1.0.5" - istanbul-lib-instrument "^1.7.0" - istanbul-lib-report "^1.0.0" - istanbul-lib-source-maps "^1.1.1" - istanbul-reports "^1.0.2" + istanbul-lib-coverage "^1.0.0" + istanbul-lib-hook "^1.0.0" + istanbul-lib-instrument "^1.3.0" + istanbul-lib-report "^1.0.0-alpha.3" + istanbul-lib-source-maps "^1.1.0" + istanbul-reports "^1.0.0" js-yaml "^3.7.0" mkdirp "^0.5.1" once "^1.4.0" -istanbul-lib-coverage@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz#87a0c015b6910651cb3b184814dfb339337e25e1" +istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.0-alpha, istanbul-lib-coverage@^1.0.0-alpha.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.1.tgz#f263efb519c051c5f1f3343034fc40e7b43ff212" -istanbul-lib-hook@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.5.tgz#6ca3d16d60c5f4082da39f7c5cd38ea8a772b88e" +istanbul-lib-hook@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.0.tgz#fc5367ee27f59268e8f060b0c7aaf051d9c425c5" dependencies: append-transform "^0.4.0" -istanbul-lib-instrument@^1.6.2, istanbul-lib-instrument@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.0.tgz#b8e0dc25709bb44e17336ab47b7bb5c97c23f659" +istanbul-lib-instrument@^1.3.0, istanbul-lib-instrument@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.4.2.tgz#0e2fdfac93c1dabf2e31578637dc78a19089f43e" dependencies: babel-generator "^6.18.0" babel-template "^6.16.0" babel-traverse "^6.18.0" babel-types "^6.18.0" babylon "^6.13.0" - istanbul-lib-coverage "^1.0.2" + istanbul-lib-coverage "^1.0.0" semver "^5.3.0" -istanbul-lib-report@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0.tgz#d83dac7f26566b521585569367fe84ccfc7aaecb" +istanbul-lib-report@^1.0.0-alpha.3: + version "1.0.0-alpha.3" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0-alpha.3.tgz#32d5f6ec7f33ca3a602209e278b2e6ff143498af" dependencies: - istanbul-lib-coverage "^1.0.2" + async "^1.4.2" + istanbul-lib-coverage "^1.0.0-alpha" mkdirp "^0.5.1" path-parse "^1.0.5" + rimraf "^2.4.3" supports-color "^3.1.2" -istanbul-lib-source-maps@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.1.tgz#f8c8c2e8f2160d1d91526d97e5bd63b2079af71c" +istanbul-lib-source-maps@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.0.tgz#9d429218f35b823560ea300a96ff0c3bbdab785f" dependencies: - istanbul-lib-coverage "^1.0.2" + istanbul-lib-coverage "^1.0.0-alpha.0" mkdirp "^0.5.1" rimraf "^2.4.4" source-map "^0.5.3" -istanbul-reports@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.2.tgz#4e8366abe6fa746cc1cd6633f108de12cc6ac6fa" +istanbul-reports@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.1.tgz#9a17176bc4a6cbebdae52b2f15961d52fa623fbc" dependencies: handlebars "^4.0.3" @@ -2766,33 +2698,33 @@ jodid25519@^1.0.0: jsbn "~0.1.0" jquery-ujs@^1.2.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.2.tgz#6a8ef1020e6b6dda385b90a4bddc128c21c56397" + version "1.2.1" + resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.1.tgz#6ee75b1ef4e9ac95e7124f8d71f7d351f5548e92" dependencies: jquery ">=1.8.0" jquery@>=1.8.0, jquery@^2.2.1: - version "2.2.4" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02" + version "2.2.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.1.tgz#3c3e16854ad3d2ac44ac65021b17426d22ad803f" js-cookie@^2.1.3: - version "2.1.4" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.1.4.tgz#da4ec503866f149d164cf25f579ef31015025d8d" + version "2.1.3" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.1.3.tgz#48071625217ac9ecfab8c343a13d42ec09ff0526" js-tokens@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7" js-yaml@3.x, js-yaml@^3.5.1, js-yaml@^3.7.0: - version "3.8.3" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766" + version "3.8.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.1.tgz#782ba50200be7b9e5a8537001b7804db3ad02628" dependencies: argparse "^1.0.7" esprima "^3.1.1" jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + version "0.1.0" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd" jsesc@^1.3.0: version "1.3.0" @@ -2843,10 +2775,9 @@ jsonpointer@^4.0.0: resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" jsprim@^1.2.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918" + version "1.3.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.3.1.tgz#2a7256f70412a29ee3670aaca625994c4dcff252" dependencies: - assert-plus "1.0.0" extsprintf "1.0.2" json-schema "0.2.3" verror "1.3.6" @@ -2866,8 +2797,8 @@ jszip@^3.1.3: readable-stream "~2.0.6" karma-coverage-istanbul-reporter@^0.2.0: - version "0.2.3" - resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-0.2.3.tgz#11f1be9cfa93755a77bac39ab16e315a7100b5c5" + version "0.2.0" + resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-0.2.0.tgz#5766263338adeb0026f7e4ac7a89a5f056c5642c" dependencies: istanbul-api "^1.1.1" @@ -2876,14 +2807,14 @@ karma-jasmine@^1.1.0: resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf" karma-mocha-reporter@^2.2.2: - version "2.2.3" - resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.3.tgz#04fdda45a1d9697a73871c7472223c581701ab20" + version "2.2.2" + resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.2.tgz#876de9a287244e54a608591732a98e66611f6abe" dependencies: chalk "1.1.3" karma-phantomjs-launcher@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz#d23ca34801bda9863ad318e3bb4bd4062b13acd2" + version "1.0.2" + resolved "https://registry.yarnpkg.com/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.2.tgz#19e1041498fd75563ed86730a22c1fe579fa8fb1" dependencies: lodash "^4.0.1" phantomjs-prebuilt "^2.1.7" @@ -2895,8 +2826,8 @@ karma-sourcemap-loader@^0.3.7: graceful-fs "^4.1.2" karma-webpack@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.3.tgz#39cebf5ca2580139b27f9ae69b78816b9c82fae6" + version "2.0.2" + resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.2.tgz#bd38350af5645c9644090770939ebe7ce726f864" dependencies: async "~0.9.0" loader-utils "^0.2.5" @@ -2905,15 +2836,15 @@ karma-webpack@^2.0.2: webpack-dev-middleware "^1.0.11" karma@^1.4.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/karma/-/karma-1.6.0.tgz#0e871d4527d5eac56c41d181f03c5c0a7e6dbf3e" + version "1.4.1" + resolved "https://registry.yarnpkg.com/karma/-/karma-1.4.1.tgz#41981a71d54237606b0a3ea8c58c90773f41650e" dependencies: bluebird "^3.3.0" - body-parser "^1.16.1" + body-parser "^1.12.4" chokidar "^1.4.1" colors "^1.1.0" combine-lists "^1.0.0" - connect "^3.6.0" + connect "^3.3.5" core-js "^2.2.0" di "^0.0.1" dom-serialize "^2.2.0" @@ -2925,16 +2856,16 @@ karma@^1.4.1: lodash "^3.8.0" log4js "^0.6.31" mime "^1.3.4" - minimatch "^3.0.2" + minimatch "^3.0.0" optimist "^0.6.1" qjobs "^1.1.4" range-parser "^1.2.0" - rimraf "^2.6.0" + rimraf "^2.3.3" safe-buffer "^5.0.1" - socket.io "1.7.3" + socket.io "1.7.2" source-map "^0.5.3" - tmp "0.0.31" - useragent "^2.1.12" + tmp "0.0.28" + useragent "^2.1.10" kew@~0.7.0: version "0.7.0" @@ -2989,9 +2920,9 @@ loader-runner@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" -loader-utils@^0.2.16, loader-utils@^0.2.5: - version "0.2.17" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" +loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.5: + version "0.2.16" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d" dependencies: big.js "^3.1.3" emojis-list "^2.0.0" @@ -3142,1734 +3073,4 @@ micromatch@^2.1.5, micromatch@^2.3.11: is-glob "^2.0.1" kind-of "^3.0.2" normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -miller-rabin@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d" - dependencies: - bn.js "^4.0.0" - brorand "^1.0.1" - -"mime-db@>= 1.27.0 < 2", mime-db@~1.27.0: - version "1.27.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1" - -mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7: - version "2.1.15" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed" - dependencies: - mime-db "~1.27.0" - -mime@1.3.4, mime@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" - -minimalistic-assert@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" - -minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" - -"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" - dependencies: - brace-expansion "^1.0.0" - -minimist@0.0.8, minimist@~0.0.1: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -mkdirp@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12" - dependencies: - minimist "0.0.8" - -mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -moment@2.x: - version "2.18.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f" - -mousetrap@^1.4.6: - version "1.6.1" - resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.1.tgz#2a085f5c751294c75e7e81f6ec2545b29cbf42d9" - -ms@0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" - -ms@0.7.2: - version "0.7.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765" - -mute-stream@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" - -nan@^2.0.0, nan@^2.3.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.1.tgz#8c84f7b14c96b89f57fbc838012180ec8ca39a01" - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - -negotiator@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" - -node-libs-browser@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-1.1.1.tgz#2a38243abedd7dffcd07a97c9aca5668975a6fea" - dependencies: - assert "^1.1.1" - browserify-zlib "^0.1.4" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^1.0.0" - https-browserify "0.0.1" - os-browserify "^0.2.0" - path-browserify "0.0.0" - process "^0.11.0" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.0.5" - stream-browserify "^2.0.1" - stream-http "^2.3.1" - string_decoder "^0.10.25" - timers-browserify "^1.4.2" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.10.3" - vm-browserify "0.0.4" - -node-libs-browser@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646" - dependencies: - assert "^1.1.1" - browserify-zlib "^0.1.4" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^1.0.0" - https-browserify "0.0.1" - os-browserify "^0.2.0" - path-browserify "0.0.0" - process "^0.11.0" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.0.5" - stream-browserify "^2.0.1" - stream-http "^2.3.1" - string_decoder "^0.10.25" - timers-browserify "^2.0.2" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.10.3" - vm-browserify "0.0.4" - -node-pre-gyp@^0.6.29, node-pre-gyp@^0.6.4: - version "0.6.34" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7" - dependencies: - mkdirp "^0.5.1" - nopt "^4.0.1" - npmlog "^4.0.2" - rc "^1.1.7" - request "^2.81.0" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^2.2.1" - tar-pack "^3.4.0" - -node-zopfli@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/node-zopfli/-/node-zopfli-2.0.2.tgz#a7a473ae92aaea85d4c68d45bbf2c944c46116b8" - dependencies: - commander "^2.8.1" - defaults "^1.0.2" - nan "^2.0.0" - node-pre-gyp "^0.6.4" - -nopt@3.x: - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - dependencies: - abbrev "1" - -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - dependencies: - abbrev "1" - osenv "^0.1.4" - -normalize-package-data@^2.3.2: - version "2.3.6" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff" - dependencies: - hosted-git-info "^2.1.4" - is-builtin-module "^1.0.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-path@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - dependencies: - remove-trailing-separator "^1.0.1" - -npmlog@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f" - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.1" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - -oauth-sign@~0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" - -object-assign@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" - -object-assign@^4.0.1, object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - -object-component@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" - -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - -obuf@^1.0.0, obuf@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.1.tgz#104124b6c602c6796881a042541d36db43a5264e" - -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - dependencies: - ee-first "1.1.1" - -on-headers@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7" - -once@1.x, once@^1.3.0, once@^1.3.3, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -onetime@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" - -opener@^1.4.2: - version "1.4.3" - resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8" - -opn@4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95" - dependencies: - object-assign "^4.0.1" - pinkie-promise "^2.0.0" - -optimist@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" - dependencies: - minimist "~0.0.1" - wordwrap "~0.0.2" - -optionator@^0.8.1, optionator@^0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" - dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.4" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - wordwrap "~1.0.0" - -options@>=0.0.5: - version "0.0.6" - resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" - -original@>=0.0.5: - version "1.0.0" - resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b" - dependencies: - url-parse "1.0.x" - -os-browserify@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - dependencies: - lcid "^1.0.0" - -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - -osenv@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -p-limit@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc" - -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - dependencies: - p-limit "^1.1.0" - -pako@~0.2.0: - version "0.2.9" - resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" - -pako@~1.0.2: - version "1.0.5" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.5.tgz#d2205dfe5b9da8af797e7c163db4d1f84e4600bc" - -parse-asn1@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712" - dependencies: - asn1.js "^4.0.0" - browserify-aes "^1.0.0" - create-hash "^1.1.0" - evp_bytestokey "^1.0.0" - pbkdf2 "^3.0.3" - -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - -parse-json@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - dependencies: - error-ex "^1.2.0" - -parsejson@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab" - dependencies: - better-assert "~1.0.0" - -parseqs@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d" - dependencies: - better-assert "~1.0.0" - -parseuri@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a" - dependencies: - better-assert "~1.0.0" - -parseurl@~1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56" - -path-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" - -path-exists@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" - dependencies: - pinkie-promise "^2.0.0" - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-is-inside@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - -path-parse@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - -path-type@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" - dependencies: - graceful-fs "^4.1.2" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -pbkdf2@^3.0.3: - version "3.0.9" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.9.tgz#f2c4b25a600058b3c3773c086c37dbbee1ffe693" - dependencies: - create-hmac "^1.1.2" - -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - -performance-now@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" - -phantomjs-prebuilt@^2.1.7: - version "2.1.14" - resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz#d53d311fcfb7d1d08ddb24014558f1188c516da0" - dependencies: - es6-promise "~4.0.3" - extract-zip "~1.5.0" - fs-extra "~1.0.0" - hasha "~2.2.0" - kew "~0.7.0" - progress "~1.1.8" - request "~2.79.0" - request-progress "~2.0.1" - which "~1.2.10" - -pify@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - -pikaday@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/pikaday/-/pikaday-1.5.1.tgz#0a48549bc1a14ea1d08c44074d761bc2f2bfcfd3" - optionalDependencies: - moment "2.x" - -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - -pkg-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" - dependencies: - find-up "^1.0.0" - -pkg-up@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-1.0.0.tgz#3e08fb461525c4421624a33b9f7e6d0af5b05a26" - dependencies: - find-up "^1.0.0" - -pluralize@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45" - -portfinder@^1.0.9: - version "1.0.13" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9" - dependencies: - async "^1.5.2" - debug "^2.2.0" - mkdirp "0.5.x" - -prelude-ls@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - -private@^0.1.6: - version "0.1.7" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1" - -process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - -process@^0.11.0, process@~0.11.0: - version "0.11.9" - resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1" - -progress@^1.1.8, progress@~1.1.8: - version "1.1.8" - resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" - -proxy-addr@~1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3" - dependencies: - forwarded "~0.1.0" - ipaddr.js "1.3.0" - -prr@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" - -public-encrypt@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6" - dependencies: - bn.js "^4.1.0" - browserify-rsa "^4.0.0" - create-hash "^1.1.0" - parse-asn1 "^5.0.0" - randombytes "^2.0.1" - -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - -punycode@^1.2.4, punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - -qjobs@^1.1.4: - version "1.1.5" - resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73" - -qs@6.4.0, qs@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" - -qs@~6.3.0: - version "6.3.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c" - -querystring-es3@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" - -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - -querystringify@0.0.x: - version "0.0.4" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c" - -randomatic@^1.1.3: - version "1.1.6" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb" - dependencies: - is-number "^2.0.2" - kind-of "^3.0.2" - -randombytes@^2.0.0, randombytes@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec" - -range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" - -raphael@^2.2.7: - version "2.2.7" - resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.2.7.tgz#231b19141f8d086986d8faceb66f8b562ee2c810" - dependencies: - eve-raphael "0.5.0" - -raw-body@~2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.2.0.tgz#994976cf6a5096a41162840492f0bdc5d6e7fb96" - dependencies: - bytes "2.4.0" - iconv-lite "0.4.15" - unpipe "1.0.0" - -raw-loader@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" - -rc@^1.1.7: - version "1.2.1" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95" - dependencies: - deep-extend "~0.4.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -read-pkg-up@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" - dependencies: - find-up "^1.0.0" - read-pkg "^1.0.0" - -read-pkg@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" - dependencies: - load-json-file "^1.0.0" - normalize-package-data "^2.3.2" - path-type "^1.0.0" - -"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6: - version "2.2.8" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.8.tgz#ad28b686f3554c73d39bc32347fa058356624705" - dependencies: - buffer-shims "~1.0.0" - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~1.0.0" - util-deprecate "~1.0.1" - -readable-stream@^2.0.5, readable-stream@~2.0.0, readable-stream@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - -readable-stream@~1.0.2: - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readdirp@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" - dependencies: - graceful-fs "^4.1.2" - minimatch "^3.0.2" - readable-stream "^2.0.2" - set-immediate-shim "^1.0.1" - -readline2@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - mute-stream "0.0.5" - -rechoir@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" - dependencies: - resolve "^1.1.6" - -regenerate@^1.2.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260" - -regenerator-runtime@^0.10.0: - version "0.10.3" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e" - -regenerator-transform@0.9.8: - version "0.9.8" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.8.tgz#0f88bb2bc03932ddb7b6b7312e68078f01026d6c" - dependencies: - babel-runtime "^6.18.0" - babel-types "^6.19.0" - private "^0.1.6" - -regex-cache@^0.4.2: - version "0.4.3" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145" - dependencies: - is-equal-shallow "^0.1.3" - is-primitive "^2.0.0" - -regexpu-core@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - dependencies: - jsesc "~0.5.0" - -remove-trailing-separator@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4" - -repeat-element@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" - -repeat-string@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae" - -repeat-string@^1.5.2: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - dependencies: - is-finite "^1.0.0" - -request-progress@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08" - dependencies: - throttleit "^1.0.0" - -request@^2.81.0: - version "2.81.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~4.2.1" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - performance-now "^0.2.0" - qs "~6.4.0" - safe-buffer "^5.0.1" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "^0.6.0" - uuid "^3.0.0" - -request@~2.79.0: - version "2.79.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.11.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~2.0.6" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - qs "~6.3.0" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "~0.4.1" - uuid "^3.0.0" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - -require-main-filename@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" - -require-uncached@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" - dependencies: - caller-path "^0.1.0" - resolve-from "^1.0.0" - -requires-port@1.0.x, requires-port@1.x.x: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - -resolve-from@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" - -resolve@1.1.x: - version "1.1.7" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" - -resolve@^1.1.6, resolve@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235" - dependencies: - path-parse "^1.0.5" - -restore-cursor@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" - dependencies: - exit-hook "^1.0.0" - onetime "^1.0.0" - -right-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" - dependencies: - align-text "^0.1.1" - -rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.6.0, rimraf@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" - dependencies: - glob "^7.0.5" - -ripemd160@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e" - -run-async@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389" - dependencies: - once "^1.3.0" - -rx-lite@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" - -safe-buffer@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7" - -select-hose@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - -select2@3.5.2-browserify: - version "3.5.2-browserify" - resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz#dc4dafda38d67a734e8a97a46f0d3529ae05391d" - -"semver@2 || 3 || 4 || 5", semver@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - -semver@~4.3.3: - version "4.3.6" - resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" - -send@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.15.1.tgz#8a02354c26e6f5cca700065f5f0cdeba90ec7b5f" - dependencies: - debug "2.6.1" - depd "~1.1.0" - destroy "~1.0.4" - encodeurl "~1.0.1" - escape-html "~1.0.3" - etag "~1.8.0" - fresh "0.5.0" - http-errors "~1.6.1" - mime "1.3.4" - ms "0.7.2" - on-finished "~2.3.0" - range-parser "~1.2.0" - statuses "~1.3.1" - -serve-index@^1.7.2: - version "1.8.0" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.8.0.tgz#7c5d96c13fb131101f93c1c5774f8516a1e78d3b" - dependencies: - accepts "~1.3.3" - batch "0.5.3" - debug "~2.2.0" - escape-html "~1.0.3" - http-errors "~1.5.0" - mime-types "~2.1.11" - parseurl "~1.3.1" - -serve-static@1.12.1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.1.tgz#7443a965e3ced647aceb5639fa06bf4d1bbe0039" - dependencies: - encodeurl "~1.0.1" - escape-html "~1.0.3" - parseurl "~1.3.1" - send "0.15.1" - -set-blocking@^2.0.0, set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - -set-immediate-shim@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" - -setimmediate@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - -setprototypeof@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08" - -setprototypeof@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04" - -sha.js@^2.3.6: - version "2.4.8" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f" - dependencies: - inherits "^2.0.1" - -shelljs@^0.7.5: - version "0.7.7" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1" - dependencies: - glob "^7.0.0" - interpret "^1.0.0" - rechoir "^0.6.2" - -signal-exit@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - -slice-ansi@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35" - -sntp@1.x.x: - version "1.0.9" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" - dependencies: - hoek "2.x.x" - -socket.io-adapter@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b" - dependencies: - debug "2.3.3" - socket.io-parser "2.3.1" - -socket.io-client@1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.3.tgz#b30e86aa10d5ef3546601c09cde4765e381da377" - dependencies: - backo2 "1.0.2" - component-bind "1.0.0" - component-emitter "1.2.1" - debug "2.3.3" - engine.io-client "1.8.3" - has-binary "0.1.7" - indexof "0.0.1" - object-component "0.0.3" - parseuri "0.0.5" - socket.io-parser "2.3.1" - to-array "0.1.4" - -socket.io-parser@2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.3.1.tgz#dd532025103ce429697326befd64005fcfe5b4a0" - dependencies: - component-emitter "1.1.2" - debug "2.2.0" - isarray "0.0.1" - json3 "3.3.2" - -socket.io@1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.3.tgz#b8af9caba00949e568e369f1327ea9be9ea2461b" - dependencies: - debug "2.3.3" - engine.io "1.8.3" - has-binary "0.1.7" - object-assign "4.1.0" - socket.io-adapter "0.5.0" - socket.io-client "1.7.3" - socket.io-parser "2.3.1" - -sockjs-client@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.2.tgz#f0212a8550e4c9468c8cceaeefd2e3493c033ad5" - dependencies: - debug "^2.2.0" - eventsource "0.1.6" - faye-websocket "~0.11.0" - inherits "^2.0.1" - json3 "^3.3.2" - url-parse "^1.1.1" - -sockjs@0.3.18: - version "0.3.18" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.18.tgz#d9b289316ca7df77595ef299e075f0f937eb4207" - dependencies: - faye-websocket "^0.10.0" - uuid "^2.0.2" - -source-list-map@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.1.tgz#1a33ac210ca144d1e561f906ebccab5669ff4cb4" - -source-list-map@~0.1.7: - version "0.1.8" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106" - -source-map-support@^0.4.2: - version "0.4.14" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef" - dependencies: - source-map "^0.5.6" - -source-map@^0.1.41: - version "0.1.43" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346" - dependencies: - amdefine ">=0.0.4" - -source-map@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" - dependencies: - amdefine ">=0.0.4" - -source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3: - version "0.5.6" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" - -source-map@~0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" - dependencies: - amdefine ">=0.0.4" - -spdx-correct@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40" - dependencies: - spdx-license-ids "^1.0.2" - -spdx-expression-parse@~1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c" - -spdx-license-ids@^1.0.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57" - -spdy-transport@^2.0.15: - version "2.0.18" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.0.18.tgz#43fc9c56be2cccc12bb3e2754aa971154e836ea6" - dependencies: - debug "^2.2.0" - hpack.js "^2.1.6" - obuf "^1.1.0" - readable-stream "^2.0.1" - wbuf "^1.4.0" - -spdy@^3.4.1: - version "3.4.4" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.4.tgz#e0406407ca90ff01b553eb013505442649f5a819" - dependencies: - debug "^2.2.0" - handle-thing "^1.2.4" - http-deceiver "^1.2.4" - select-hose "^2.0.0" - spdy-transport "^2.0.15" - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - -sshpk@^1.7.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.11.0.tgz#2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77" - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - dashdash "^1.12.0" - getpass "^0.1.1" - optionalDependencies: - bcrypt-pbkdf "^1.0.0" - ecc-jsbn "~0.1.1" - jodid25519 "^1.0.0" - jsbn "~0.1.0" - tweetnacl "~0.14.0" - -stats-webpack-plugin@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.4.3.tgz#b2f618202f28dd04ab47d7ecf54ab846137b7aea" - -"statuses@>= 1.3.1 < 2", statuses@~1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" - -stream-browserify@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" - dependencies: - inherits "~2.0.1" - readable-stream "^2.0.2" - -stream-http@^2.3.1: - version "2.7.0" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6" - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.2.6" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - -string-width@^1.0.1, string-width@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string-width@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e" - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^3.0.0" - -string_decoder@^0.10.25, string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - -string_decoder@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667" - dependencies: - buffer-shims "~1.0.0" - -stringstream@~0.0.4: - version "0.0.5" - resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-bom@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" - dependencies: - is-utf8 "^0.2.0" - -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2: - version "3.2.3" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" - dependencies: - has-flag "^1.0.0" - -table@^3.7.8: - version "3.8.3" - resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f" - dependencies: - ajv "^4.7.0" - ajv-keywords "^1.0.0" - chalk "^1.1.1" - lodash "^4.0.0" - slice-ansi "0.0.4" - string-width "^2.0.0" - -tapable@^0.1.8: - version "0.1.10" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4" - -tapable@^0.2.5, tapable@~0.2.5: - version "0.2.6" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d" - -tar-pack@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984" - dependencies: - debug "^2.2.0" - fstream "^1.0.10" - fstream-ignore "^1.0.5" - once "^1.3.3" - readable-stream "^2.1.4" - rimraf "^2.5.1" - tar "^2.2.1" - uid-number "^0.0.6" - -tar@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - dependencies: - block-stream "*" - fstream "^1.0.2" - inherits "2" - -test-exclude@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.3.tgz#86a13ce3effcc60e6c90403cf31a27a60ac6c4e7" - dependencies: - arrify "^1.0.1" - micromatch "^2.3.11" - object-assign "^4.1.0" - read-pkg-up "^1.0.1" - require-main-filename "^1.0.1" - -text-table@~0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - -three-orbit-controls@^82.1.0: - version "82.1.0" - resolved "https://registry.yarnpkg.com/three-orbit-controls/-/three-orbit-controls-82.1.0.tgz#11a7f33d0a20ecec98f098b37780f6537374fab4" - -three-stl-loader@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/three-stl-loader/-/three-stl-loader-1.0.4.tgz#6b3319a31e3b910aab1883d19b00c81a663c3e03" - -three@^0.84.0: - version "0.84.0" - resolved "https://registry.yarnpkg.com/three/-/three-0.84.0.tgz#95be85a55a0fa002aa625ed559130957dcffd918" - -throttleit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" - -through@^2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - -timeago.js@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/timeago.js/-/timeago.js-2.0.5.tgz#730c74fbdb0b0917a553675a4460e3a7f80db86c" - -timers-browserify@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d" - dependencies: - process "~0.11.0" - -timers-browserify@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86" - dependencies: - setimmediate "^1.0.4" - -tmp@0.0.31, tmp@0.0.x: - version "0.0.31" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7" - dependencies: - os-tmpdir "~1.0.1" - -to-array@0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" - -to-arraybuffer@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" - -to-fast-properties@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320" - -tough-cookie@~2.3.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a" - dependencies: - punycode "^1.4.1" - -traverse@0.6.6: - version "0.6.6" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137" - -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - -tryit@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb" - -tty-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - dependencies: - safe-buffer "^5.0.1" - -tunnel-agent@~0.4.1: - version "0.4.3" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - -type-check@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - dependencies: - prelude-ls "~1.1.2" - -type-is@~1.6.14: - version "1.6.15" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410" - dependencies: - media-typer "0.3.0" - mime-types "~2.1.15" - -typedarray@^0.0.6, typedarray@~0.0.5: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - -uglify-js@^2.6, uglify-js@^2.8.5: - version "2.8.21" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.21.tgz#1733f669ae6f82fc90c7b25ec0f5c783ee375314" - dependencies: - source-map "~0.5.1" - yargs "~3.10.0" - optionalDependencies: - uglify-to-browserify "~1.0.0" - -uglify-to-browserify@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" - -uid-number@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" - -ultron@1.0.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" - -unc-path-regex@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" - -underscore@^1.8.3: - version "1.8.3" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - -url-parse@1.0.x: - version "1.0.5" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b" - dependencies: - querystringify "0.0.x" - requires-port "1.0.x" - -url-parse@^1.1.1: - version "1.1.8" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.8.tgz#7a65b3a8d57a1e86af6b4e2276e34774167c0156" - dependencies: - querystringify "0.0.x" - requires-port "1.0.x" - -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - dependencies: - punycode "1.3.2" - querystring "0.2.0" - -user-home@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f" - dependencies: - os-homedir "^1.0.0" - -useragent@^2.1.12: - version "2.1.13" - resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.13.tgz#bba43e8aa24d5ceb83c2937473e102e21df74c10" - dependencies: - lru-cache "2.2.x" - tmp "0.0.x" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -util@0.10.3, util@^0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - dependencies: - inherits "2.0.1" - -utils-merge@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8" - -uuid@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" - -uuid@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" - -validate-npm-package-license@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" - dependencies: - spdx-correct "~1.0.0" - spdx-expression-parse "~1.0.0" - -vary@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37" - -verror@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c" - dependencies: - extsprintf "1.0.2" - -visibilityjs@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/visibilityjs/-/visibilityjs-1.2.4.tgz#bff8663da62c8c10ad4ee5ae6a1ae6fac4259d63" - -vm-browserify@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" - dependencies: - indexof "0.0.1" - -void-elements@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" - -vue-resource@^0.9.3: - version "0.9.3" - resolved "https://registry.yarnpkg.com/vue-resource/-/vue-resource-0.9.3.tgz#ab46e1c44ea219142dcc28ae4043b3b04c80959d" - -vue@^2.2.4: - version "2.2.6" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.6.tgz#451714b394dd6d4eae7b773c40c2034a59621aed" - -watchpack@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87" - dependencies: - async "^2.1.2" - chokidar "^1.4.3" - graceful-fs "^4.1.2" - -wbuf@^1.1.0, wbuf@^1.4.0: - version "1.7.2" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.2.tgz#d697b99f1f59512df2751be42769c1580b5801fe" - dependencies: - minimalistic-assert "^1.0.0" - -webpack-bundle-analyzer@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.3.1.tgz#d97f8aadbcce68fc865c5787741d8549359a25cd" - dependencies: - acorn "^4.0.11" - chalk "^1.1.3" - commander "^2.9.0" - ejs "^2.5.5" - express "^4.14.1" - filesize "^3.5.4" - gzip-size "^3.0.0" - lodash "^4.17.4" - mkdirp "^0.5.1" - opener "^1.4.2" - -webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.9.0: - version "1.10.1" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.1.tgz#c6b4cf428139cf1aefbe06a0c00fdb4f8da2f893" - dependencies: - memory-fs "~0.4.1" - mime "^1.3.4" - path-is-absolute "^1.0.0" - range-parser "^1.0.3" - -webpack-dev-server@^2.3.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.2.tgz#cf595d6b40878452b6d2ad7229056b686f8a16be" - dependencies: - ansi-html "0.0.7" - chokidar "^1.6.0" - compression "^1.5.2" - connect-history-api-fallback "^1.3.0" - express "^4.13.3" - html-entities "^1.2.0" - http-proxy-middleware "~0.17.4" - opn "4.0.2" - portfinder "^1.0.9" - serve-index "^1.7.2" - sockjs "0.3.18" - sockjs-client "1.1.2" - spdy "^3.4.1" - strip-ansi "^3.0.0" - supports-color "^3.1.1" - webpack-dev-middleware "^1.9.0" - yargs "^6.0.0" - -webpack-sources@^0.1.0: - version "0.1.5" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750" - dependencies: - source-list-map "~0.1.7" - source-map "~0.5.3" - -webpack-sources@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb" - dependencies: - source-list-map "^1.1.1" - source-map "~0.5.3" - -webpack@^2.2.1: - version "2.3.3" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.3.tgz#eecc083c18fb7bf958ea4f40b57a6640c5a0cc78" - dependencies: - acorn "^4.0.4" - acorn-dynamic-import "^2.0.0" - ajv "^4.7.0" - ajv-keywords "^1.1.1" - async "^2.1.2" - enhanced-resolve "^3.0.0" - interpret "^1.0.0" - json-loader "^0.5.4" - loader-runner "^2.3.0" - loader-utils "^0.2.16" - memory-fs "~0.4.1" - mkdirp "~0.5.0" - node-libs-browser "^2.0.0" - source-map "^0.5.3" - supports-color "^3.1.0" - tapable "~0.2.5" - uglify-js "^2.8.5" - watchpack "^1.3.1" - webpack-sources "^0.2.3" - yargs "^6.0.0" - -websocket-driver@>=0.5.1: - version "0.6.5" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36" - dependencies: - websocket-extensions ">=0.1.1" - -websocket-extensions@>=0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz#76899499c184b6ef754377c2dbb0cd6cb55d29e7" - -which-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" - -which@^1.1.1, which@~1.2.10: - version "1.2.14" - resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad" - dependencies: - string-width "^1.0.1" - -window-size@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" - -wordwrap@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" - -wordwrap@^1.0.0, wordwrap@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - -wordwrap@~0.0.2: - version "0.0.3" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" - -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -write@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" - dependencies: - mkdirp "^0.5.1" - -ws@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f" - dependencies: - options ">=0.0.5" - ultron "1.0.x" - -wtf-8@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a" - -xmlhttprequest-ssl@1.5.3: - version "1.5.3" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d" - -xtend@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" - -y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - -yargs-parser@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c" - dependencies: - camelcase "^3.0.0" - -yargs@^6.0.0: - version "6.6.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" - dependencies: - camelcase "^3.0.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^1.4.0" - read-pkg-up "^1.0.1" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^1.0.2" - which-module "^1.0.0" - y18n "^3.2.1" - yargs-parser "^4.2.0" - -yargs@~3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" - dependencies: - camelcase "^1.0.2" - cliui "^2.1.0" - decamelize "^1.0.0" - window-size "0.1.0" - -yauzl@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" - dependencies: - fd-slicer "~1.0.1" - -yeast@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" + object.omit From 1ebfcf903638018c610cc882136421428bd3941c Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 7 Apr 2017 21:20:02 +0100 Subject: [PATCH 68/70] Revert yarn.lock changes --- package.json | 1 - yarn.lock | 2327 ++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 2055 insertions(+), 273 deletions(-) diff --git a/package.json b/package.json index 5be299da699..312e38f7407 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js" }, "dependencies": { - "@gitlab-org/droplab": "^0.1.0", "babel-core": "^6.22.1", "babel-loader": "^6.2.10", "babel-plugin-transform-define": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index 266bcc63385..8f0be2c50a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14,8 +14,8 @@ accepts@1.3.3, accepts@~1.3.3: negotiator "0.6.1" acorn-dynamic-import@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz#23f671eb6e650dab277fef477c321b1178a8cca2" + version "2.0.2" + resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4" dependencies: acorn "^4.0.3" @@ -25,18 +25,18 @@ acorn-jsx@^3.0.0: dependencies: acorn "^3.0.4" -acorn@4.0.4, acorn@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a" - acorn@^3.0.4: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" -acorn@^4.0.11, acorn@^4.0.3: +acorn@^4.0.11, acorn@^4.0.3, acorn@^4.0.4: version "4.0.11" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0" +acorn@^5.0.1: + version "5.0.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d" + after@0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" @@ -45,9 +45,9 @@ ajv-keywords@^1.0.0, ajv-keywords@^1.1.1: version "1.5.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c" -ajv@^4.7.0: - version "4.11.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.2.tgz#f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6" +ajv@^4.7.0, ajv@^4.9.1: + version "4.11.5" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd" dependencies: co "^4.6.0" json-stable-stringify "^1.0.1" @@ -94,8 +94,8 @@ append-transform@^0.4.0: default-require-extensions "^1.0.0" aproba@^1.0.3: - version "1.1.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.0.tgz#4d8f047a318604e18e3c06a0e52230d3d19f147b" + version "1.1.1" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab" are-we-there-yet@~1.1.2: version "1.1.2" @@ -166,14 +166,14 @@ asn1@~0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + assert-plus@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" -assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - assert@^1.1.1: version "1.4.1" resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" @@ -184,17 +184,17 @@ async-each@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" -async@0.2.x, async@~0.2.6: +async@0.2.x: version "0.2.10" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" -async@1.x, async@^1.4.0, async@^1.4.2, async@^1.5.2: +async@1.x, async@^1.4.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" async@^2.1.2, async@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4" + version "2.3.0" + resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9" dependencies: lodash "^4.14.0" @@ -222,15 +222,15 @@ babel-code-frame@^6.16.0, babel-code-frame@^6.22.0: esutils "^2.0.2" js-tokens "^3.0.0" -babel-core@^6.22.1, babel-core@^6.23.0: - version "6.23.1" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.23.1.tgz#c143cb621bb2f621710c220c5d579d15b8a442df" +babel-core@^6.22.1, babel-core@^6.24.0: + version "6.24.0" + resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.0.tgz#8f36a0a77f5c155aed6f920b844d23ba56742a02" dependencies: babel-code-frame "^6.22.0" - babel-generator "^6.23.0" + babel-generator "^6.24.0" babel-helpers "^6.23.0" babel-messages "^6.23.0" - babel-register "^6.23.0" + babel-register "^6.24.0" babel-runtime "^6.22.0" babel-template "^6.23.0" babel-traverse "^6.23.1" @@ -246,9 +246,9 @@ babel-core@^6.22.1, babel-core@^6.23.0: slash "^1.0.0" source-map "^0.5.0" -babel-generator@^6.18.0, babel-generator@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.23.0.tgz#6b8edab956ef3116f79d8c84c5a3c05f32a74bc5" +babel-generator@^6.18.0, babel-generator@^6.24.0: + version "6.24.0" + resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56" dependencies: babel-messages "^6.23.0" babel-runtime "^6.22.0" @@ -378,11 +378,11 @@ babel-helpers@^6.23.0: babel-template "^6.23.0" babel-loader@^6.2.10: - version "6.2.10" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.2.10.tgz#adefc2b242320cd5d15e65b31cea0e8b1b02d4b0" + version "6.4.1" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca" dependencies: find-cache-dir "^0.1.1" - loader-utils "^0.2.11" + loader-utils "^0.2.16" mkdirp "^0.5.1" object-assign "^4.0.1" @@ -399,12 +399,12 @@ babel-plugin-check-es2015-constants@^6.22.0: babel-runtime "^6.22.0" babel-plugin-istanbul@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.0.0.tgz#36bde8fbef4837e5ff0366531a2beabd7b1ffa10" + version "4.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.1.tgz#c12de0fc6fe42adfb16be56f1ad11e4a9782eca9" dependencies: find-up "^2.1.0" - istanbul-lib-instrument "^1.4.2" - test-exclude "^4.0.0" + istanbul-lib-instrument "^1.6.2" + test-exclude "^4.0.3" babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" @@ -745,11 +745,11 @@ babel-preset-stage-3@^6.22.0: babel-plugin-transform-exponentiation-operator "^6.22.0" babel-plugin-transform-object-rest-spread "^6.22.0" -babel-register@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.23.0.tgz#c9aa3d4cca94b51da34826c4a0f9e08145d74ff3" +babel-register@^6.24.0: + version "6.24.0" + resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.0.tgz#5e89f8463ba9970356d02eb07dabe3308b080cfd" dependencies: - babel-core "^6.23.0" + babel-core "^6.24.0" babel-runtime "^6.22.0" core-js "^2.4.0" home-or-tmp "^2.0.0" @@ -758,8 +758,8 @@ babel-register@^6.23.0: source-map-support "^0.4.2" babel-runtime@^6.18.0, babel-runtime@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611" + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b" dependencies: core-js "^2.4.0" regenerator-runtime "^0.10.0" @@ -798,8 +798,8 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23 to-fast-properties "^1.0.1" babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0: - version "6.15.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e" + version "6.16.1" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3" backo2@1.0.2: version "1.0.2" @@ -856,25 +856,25 @@ block-stream@*: inherits "~2.0.0" bluebird@^3.3.0: - version "3.4.7" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" + version "3.5.0" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.6" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215" -body-parser@^1.12.4: - version "1.16.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.16.0.tgz#924a5e472c6229fb9d69b85a20d5f2532dec788b" +body-parser@^1.16.1: + version "1.17.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.17.1.tgz#75b3bc98ddd6e7e0d8ffe750dfaca5c66993fa47" dependencies: bytes "2.4.0" content-type "~1.0.2" - debug "2.6.0" + debug "2.6.1" depd "~1.1.0" - http-errors "~1.5.1" + http-errors "~1.6.1" iconv-lite "0.4.15" on-finished "~2.3.0" - qs "6.2.1" + qs "6.4.0" raw-body "~2.2.0" type-is "~1.6.14" @@ -885,8 +885,8 @@ boom@2.x.x: hoek "2.x.x" bootstrap-sass@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.6.tgz#363b0d300e868d3e70134c1a742bb17288444fd1" + version "3.3.7" + resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz#6596c7ab40f6637393323ab0bc80d064fc630498" brace-expansion@^1.0.0: version "1.1.6" @@ -910,8 +910,8 @@ braces@^1.8.2: repeat-element "^1.1.2" brorand@^1.0.1: - version "1.0.7" - resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.0.7.tgz#6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc" + version "1.1.0" + resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.0.6" @@ -947,8 +947,8 @@ browserify-rsa@^4.0.0: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.0.tgz#10773910c3c206d5420a46aad8694f820b85968f" + version "4.0.4" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298" dependencies: bn.js "^4.1.1" browserify-rsa "^4.0.0" @@ -1022,6 +1022,10 @@ caseless@~0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7" +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + center-align@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" @@ -1145,10 +1149,10 @@ component-inherit@0.0.3: resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" compressible@~2.0.8: - version "2.0.9" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.9.tgz#6daab4e2b599c2770dd9e21e7a891b1c5a755425" + version "2.0.10" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd" dependencies: - mime-db ">= 1.24.0 < 2" + mime-db ">= 1.27.0 < 2" compression-webpack-plugin@^0.3.2: version "0.3.2" @@ -1182,7 +1186,7 @@ concat-stream@1.5.0: readable-stream "~2.0.0" typedarray "~0.0.5" -concat-stream@^1.4.6: +concat-stream@^1.5.2: version "1.6.0" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" dependencies: @@ -1194,12 +1198,12 @@ connect-history-api-fallback@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169" -connect@^3.3.5: - version "3.5.0" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.5.0.tgz#b357525a0b4c1f50599cd983e1d9efeea9677198" +connect@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.0.tgz#f09a4f7dcd17324b663b725c815bdb1c4158a46e" dependencies: - debug "~2.2.0" - finalhandler "0.5.0" + debug "2.6.1" + finalhandler "1.0.0" parseurl "~1.3.1" utils-merge "1.0.0" @@ -1230,8 +1234,8 @@ content-type@~1.0.2: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed" convert-source-map@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.3.0.tgz#e9f3e9c6e2728efc2676696a70eb382f73106a67" + version "1.5.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5" cookie-signature@1.0.6: version "1.0.6" @@ -1302,14 +1306,14 @@ custom-event@~1.0.0: resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" d3@^3.5.11: - version "3.5.11" - resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.11.tgz#d130750eed0554db70e8432102f920a12407b69c" + version "3.5.17" + resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8" -d@^0.1.1, d@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309" +d@1: + version "1.0.0" + resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" dependencies: - es5-ext "~0.10.2" + es5-ext "^0.10.9" dashdash@^1.12.0: version "1.14.1" @@ -1337,9 +1341,15 @@ debug@2.3.3: dependencies: ms "0.7.2" -debug@2.6.0, debug@^2.1.1, debug@^2.2.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b" +debug@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351" + dependencies: + ms "0.7.2" + +debug@2.6.3, debug@^2.1.1, debug@^2.2.0: + version "2.6.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d" dependencies: ms "0.7.2" @@ -1387,7 +1397,7 @@ delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" -depd@~1.1.0: +depd@1.1.0, depd@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3" @@ -1420,16 +1430,23 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -doctrine@1.5.0, doctrine@^1.2.2: +doctrine@1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" dependencies: esutils "^2.0.2" isarray "^1.0.0" +doctrine@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63" + dependencies: + esutils "^2.0.2" + isarray "^1.0.0" + document-register-element@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.3.0.tgz#fb3babb523c74662be47be19c6bc33e71990d940" + version "1.4.1" + resolved "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.4.1.tgz#22b41e96fb86cccab2fa30f7d2a8d62ac7be8c57" dom-serialize@^2.2.0: version "2.2.1" @@ -1445,8 +1462,8 @@ domain-browser@^1.1.1: resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" dropzone@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-4.2.0.tgz#fbe7acbb9918e0706489072ef663effeef8a79f3" + version "4.3.0" + resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-4.3.0.tgz#48b0b8f2ad092872e4b535b672a7c3f1a1d67c91" duplexer@^0.1.1: version "0.1.1" @@ -1467,13 +1484,16 @@ ejs@^2.5.5: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88" elliptic@^6.0.0: - version "6.3.3" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.3.tgz#5482d9646d54bcb89fd7d994fc9e2e9568876e3f" + version "6.4.0" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df" dependencies: bn.js "^4.4.0" brorand "^1.0.1" hash.js "^1.0.0" + hmac-drbg "^1.0.0" inherits "^2.0.1" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.0" emoji-unicode-version@^0.2.1: version "0.2.1" @@ -1487,9 +1507,9 @@ encodeurl@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20" -engine.io-client@1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.2.tgz#c38767547f2a7d184f5752f6f0ad501006703766" +engine.io-client@1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.3.tgz#1798ed93451246453d4c6f635d7a201fe940d5ab" dependencies: component-emitter "1.2.1" component-inherit "0.0.3" @@ -1500,7 +1520,7 @@ engine.io-client@1.8.2: parsejson "0.0.3" parseqs "0.0.5" parseuri "0.0.5" - ws "1.1.1" + ws "1.1.2" xmlhttprequest-ssl "1.5.3" yeast "0.1.2" @@ -1515,16 +1535,16 @@ engine.io-parser@1.3.2: has-binary "0.1.7" wtf-8 "1.0.0" -engine.io@1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.2.tgz#6b59be730b348c0125b0a4589de1c355abcf7a7e" +engine.io@1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.3.tgz#8de7f97895d20d39b85f88eeee777b2bd42b13d4" dependencies: accepts "1.3.3" base64id "1.0.0" cookie "0.3.1" debug "2.3.3" engine.io-parser "1.3.2" - ws "1.1.1" + ws "1.1.2" enhanced-resolve@^3.0.0: version "3.1.0" @@ -1554,36 +1574,36 @@ errno@^0.1.3: prr "~0.0.0" error-ex@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.0.tgz#e67b43f3e82c96ea3a584ffee0b9fc3325d802d9" + version "1.3.1" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" dependencies: is-arrayish "^0.2.1" -es5-ext@^0.10.7, es5-ext@^0.10.8, es5-ext@~0.10.11, es5-ext@~0.10.2, es5-ext@~0.10.7: - version "0.10.12" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.12.tgz#aa84641d4db76b62abba5e45fd805ecbab140047" +es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14: + version "0.10.15" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.15.tgz#c330a5934c1ee21284a7c081a86e5fd937c91ea6" dependencies: es6-iterator "2" es6-symbol "~3.1" -es6-iterator@2: - version "2.0.0" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.0.tgz#bd968567d61635e33c0b80727613c9cb4b096bac" +es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512" dependencies: - d "^0.1.1" - es5-ext "^0.10.7" - es6-symbol "3" + d "1" + es5-ext "^0.10.14" + es6-symbol "^3.1" es6-map@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.4.tgz#a34b147be224773a4d7da8072794cefa3632b897" + version "0.1.5" + resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0" dependencies: - d "~0.1.1" - es5-ext "~0.10.11" - es6-iterator "2" - es6-set "~0.1.3" - es6-symbol "~3.1.0" - event-emitter "~0.3.4" + d "1" + es5-ext "~0.10.14" + es6-iterator "~2.0.1" + es6-set "~0.1.5" + es6-symbol "~3.1.1" + event-emitter "~0.3.5" es6-promise@~3.0.2: version "3.0.2" @@ -1593,31 +1613,31 @@ es6-promise@~4.0.3: version "4.0.5" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42" -es6-set@~0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.4.tgz#9516b6761c2964b92ff479456233a247dc707ce8" +es6-set@~0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1" dependencies: - d "~0.1.1" - es5-ext "~0.10.11" - es6-iterator "2" - es6-symbol "3" - event-emitter "~0.3.4" + d "1" + es5-ext "~0.10.14" + es6-iterator "~2.0.1" + es6-symbol "3.1.1" + event-emitter "~0.3.5" -es6-symbol@3, es6-symbol@~3.1, es6-symbol@~3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa" +es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" dependencies: - d "~0.1.1" - es5-ext "~0.10.11" + d "1" + es5-ext "~0.10.14" es6-weak-map@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.1.tgz#0d2bbd8827eb5fb4ba8f97fbfea50d43db21ea81" + version "2.0.2" + resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f" dependencies: - d "^0.1.1" - es5-ext "^0.10.8" - es6-iterator "2" - es6-symbol "3" + d "1" + es5-ext "^0.10.14" + es6-iterator "^2.0.1" + es6-symbol "^3.1.1" escape-html@~1.0.3: version "1.0.3" @@ -1710,16 +1730,17 @@ eslint-plugin-jasmine@^2.1.0: resolved "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.2.0.tgz#7135879383c39a667c721d302b9f20f0389543de" eslint@^3.10.1: - version "3.15.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.15.0.tgz#bdcc6a6c5ffe08160e7b93c066695362a91e30f2" + version "3.19.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc" dependencies: babel-code-frame "^6.16.0" chalk "^1.1.3" - concat-stream "^1.4.6" + concat-stream "^1.5.2" debug "^2.1.1" - doctrine "^1.2.2" + doctrine "^2.0.0" escope "^3.6.0" espree "^3.4.0" + esquery "^1.0.0" estraverse "^4.2.0" esutils "^2.0.2" file-entry-cache "^2.0.0" @@ -1749,10 +1770,10 @@ eslint@^3.10.1: user-home "^2.0.0" espree@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.0.tgz#41656fa5628e042878025ef467e78f125cb86e1d" + version "3.4.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2" dependencies: - acorn "4.0.4" + acorn "^5.0.1" acorn-jsx "^3.0.0" esprima@2.7.x, esprima@^2.7.1: @@ -1763,6 +1784,12 @@ esprima@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" +esquery@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa" + dependencies: + estraverse "^4.0.0" + esrecurse@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220" @@ -1774,7 +1801,7 @@ estraverse@^1.9.1: version "1.9.3" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44" -estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -1786,20 +1813,20 @@ esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" -etag@~1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.7.0.tgz#03d30b5f67dd6e632d2945d30d6652731a34d5d8" +etag@~1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.0.tgz#6f631aef336d6c46362b51764044ce216be3c051" eve-raphael@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz#17c754b792beef3fa6684d79cf5a47c63c4cda30" -event-emitter@~0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.4.tgz#8d63ddfb4cfe1fae3b32ca265c4c720222080bb5" +event-emitter@~0.3.5: + version "0.3.5" + resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" dependencies: - d "~0.1.1" - es5-ext "~0.10.7" + d "1" + es5-ext "~0.10.14" eventemitter3@1.x.x: version "1.2.0" @@ -1809,7 +1836,7 @@ events@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" -eventsource@~0.1.6: +eventsource@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232" dependencies: @@ -1853,8 +1880,8 @@ expand-range@^1.8.1: fill-range "^2.1.0" express@^4.13.3, express@^4.14.1: - version "4.14.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.14.1.tgz#646c237f766f148c2120aff073817b9e4d7e0d33" + version "4.15.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.15.2.tgz#af107fc148504457f2dca9a6f2571d7129b97b35" dependencies: accepts "~1.3.3" array-flatten "1.1.1" @@ -1862,23 +1889,25 @@ express@^4.13.3, express@^4.14.1: content-type "~1.0.2" cookie "0.3.1" cookie-signature "1.0.6" - debug "~2.2.0" + debug "2.6.1" depd "~1.1.0" encodeurl "~1.0.1" escape-html "~1.0.3" - etag "~1.7.0" - finalhandler "0.5.1" - fresh "0.3.0" + etag "~1.8.0" + finalhandler "~1.0.0" + fresh "0.5.0" merge-descriptors "1.0.1" methods "~1.1.2" on-finished "~2.3.0" parseurl "~1.3.1" path-to-regexp "0.1.7" proxy-addr "~1.1.3" - qs "6.2.0" + qs "6.4.0" range-parser "~1.2.0" - send "0.14.2" - serve-static "~1.11.2" + send "0.15.1" + serve-static "1.12.1" + setprototypeof "1.0.3" + statuses "~1.3.1" type-is "~1.6.14" utils-merge "1.0.0" vary "~1.1.0" @@ -1960,8 +1989,8 @@ fileset@^2.0.2: minimatch "^3.0.3" filesize@^3.5.4: - version "3.5.4" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.4.tgz#742fc7fb6aef4ee3878682600c22f840731e1fda" + version "3.5.6" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a" fill-range@^2.1.0: version "2.2.3" @@ -1973,23 +2002,27 @@ fill-range@^2.1.0: repeat-element "^1.1.2" repeat-string "^1.5.2" -finalhandler@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.0.tgz#e9508abece9b6dba871a6942a1d7911b91911ac7" +finalhandler@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.0.tgz#b5691c2c0912092f18ac23e9416bde5cd7dc6755" dependencies: - debug "~2.2.0" + debug "2.6.1" + encodeurl "~1.0.1" escape-html "~1.0.3" on-finished "~2.3.0" - statuses "~1.3.0" + parseurl "~1.3.1" + statuses "~1.3.1" unpipe "~1.0.0" -finalhandler@0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.1.tgz#2c400d8d4530935bc232549c5fa385ec07de6fcd" +finalhandler@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.1.tgz#bcd15d1689c0e5ed729b6f7f541a6df984117db8" dependencies: - debug "~2.2.0" + debug "2.6.3" + encodeurl "~1.0.1" escape-html "~1.0.3" on-finished "~2.3.0" + parseurl "~1.3.1" statuses "~1.3.1" unpipe "~1.0.0" @@ -2027,15 +2060,15 @@ flat-cache@^1.2.1: graceful-fs "^4.1.2" write "^0.2.1" -for-in@^0.1.5: - version "0.1.6" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.6.tgz#c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8" +for-in@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" for-own@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.4.tgz#0149b41a39088c7515f51ebe1c1386d45f935072" + version "0.1.5" + resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" dependencies: - for-in "^0.1.5" + for-in "^1.0.1" forever-agent@~0.6.1: version "0.6.1" @@ -2053,9 +2086,9 @@ forwarded@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363" -fresh@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f" +fresh@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e" fs-extra@~1.0.0: version "1.0.0" @@ -2070,13 +2103,13 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.0.0: - version "1.0.17" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.17.tgz#8537f3f12272678765b4fd6528c0f1f66f8f4558" + version "1.1.1" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff" dependencies: nan "^2.3.0" node-pre-gyp "^0.6.29" -fstream-ignore@~1.0.5: +fstream-ignore@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" dependencies: @@ -2084,9 +2117,9 @@ fstream-ignore@~1.0.5: inherits "2" minimatch "^3.0.0" -fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.10.tgz#604e8a92fe26ffd9f6fae30399d4984e1ab22822" +fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: + version "1.0.11" + resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" dependencies: graceful-fs "^4.1.2" inherits "~2.0.0" @@ -2098,8 +2131,8 @@ function-bind@^1.0.2: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771" gauge@~2.7.1: - version "2.7.2" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.2.tgz#15cecc31b02d05345a5d6b0e171cdb3ad2307774" + version "2.7.3" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.3.tgz#1c23855f962f17b3ad3d0dc7443f304542edfe09" dependencies: aproba "^1.0.3" console-control-strings "^1.0.0" @@ -2108,7 +2141,6 @@ gauge@~2.7.1: signal-exit "^3.0.0" string-width "^1.0.1" strip-ansi "^3.0.1" - supports-color "^0.2.0" wide-align "^1.1.0" generate-function@^2.0.0: @@ -2166,8 +2198,8 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1: path-is-absolute "^1.0.0" globals@^9.0.0, globals@^9.14.0: - version "9.14.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034" + version "9.17.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286" globby@^5.0.0: version "5.0.0" @@ -2208,6 +2240,10 @@ handlebars@^4.0.1, handlebars@^4.0.3: optionalDependencies: uglify-js "^2.6" +har-schema@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" + har-validator@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d" @@ -2217,6 +2253,13 @@ har-validator@~2.0.6: is-my-json-valid "^2.12.4" pinkie-promise "^2.0.0" +har-validator@~4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" + dependencies: + ajv "^4.9.1" + har-schema "^1.0.5" + has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" @@ -2247,7 +2290,7 @@ has@^1.0.1: dependencies: function-bind "^1.0.2" -hash.js@^1.0.0: +hash.js@^1.0.0, hash.js@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573" dependencies: @@ -2269,6 +2312,14 @@ hawk@~3.1.3: hoek "2.x.x" sntp "1.x.x" +hmac-drbg@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.0.tgz#3db471f45aae4a994a0688322171f51b8b91bee5" + dependencies: + hash.js "^1.0.3" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.1" + hoek@2.x.x: version "2.16.3" resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" @@ -2281,8 +2332,8 @@ home-or-tmp@^2.0.0: os-tmpdir "^1.0.1" hosted-git-info@^2.1.4: - version "2.2.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.2.0.tgz#7a0d097863d886c0fabbdcd37bf1758d8becf8a5" + version "2.4.1" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.1.tgz#4b0445e41c004a8bd1337773a4ff790ca40318c8" hpack.js@^2.1.6: version "2.1.6" @@ -2301,7 +2352,7 @@ http-deceiver@^1.2.4: version "1.2.7" resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" -http-errors@~1.5.0, http-errors@~1.5.1: +http-errors@~1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750" dependencies: @@ -2309,9 +2360,18 @@ http-errors@~1.5.0, http-errors@~1.5.1: setprototypeof "1.0.2" statuses ">= 1.3.1 < 2" -http-proxy-middleware@~0.17.1: - version "0.17.3" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz#940382147149b856084f5534752d5b5a8168cd1d" +http-errors@~1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.1.tgz#5f8b8ed98aca545656bf572997387f904a722257" + dependencies: + depd "1.1.0" + inherits "2.0.3" + setprototypeof "1.0.3" + statuses ">= 1.3.1 < 2" + +http-proxy-middleware@~0.17.4: + version "0.17.4" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833" dependencies: http-proxy "^1.16.2" is-glob "^3.1.0" @@ -2346,8 +2406,8 @@ ieee754@^1.1.4: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" ignore@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.2.tgz#1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410" + version "3.2.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.6.tgz#26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c" immediate@~3.0.5: version "3.0.6" @@ -2399,8 +2459,8 @@ inquirer@^0.12.0: through "^2.3.6" interpret@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c" + version "1.0.2" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.2.tgz#f4f623f0bb7122f15f5717c8e254b8161b5c5b2d" invariant@^2.2.0: version "2.2.2" @@ -2412,9 +2472,9 @@ invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" -ipaddr.js@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.2.0.tgz#8aba49c9192799585bdd643e0ccb50e8ae777ba4" +ipaddr.js@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec" is-absolute@^0.2.3: version "0.2.6" @@ -2434,8 +2494,8 @@ is-binary-path@^1.0.0: binary-extensions "^1.0.0" is-buffer@^1.0.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b" + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc" is-builtin-module@^1.0.0: version "1.0.0" @@ -2494,8 +2554,8 @@ is-glob@^3.1.0: is-extglob "^2.1.0" is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4: - version "2.15.0" - resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz#936edda3ca3c211fd98f3b2d3e08da43f7b2915b" + version "2.16.0" + resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693" dependencies: generate-function "^2.0.0" generate-object-property "^1.1.0" @@ -2586,9 +2646,9 @@ isbinaryfile@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621" -isexe@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0" +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" isobject@^2.0.0: version "2.1.0" @@ -2601,66 +2661,64 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" istanbul-api@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.1.tgz#d36e2f1560d1a43ce304c4ff7338182de61c8f73" + version "1.1.7" + resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.7.tgz#f6f37f09f8002b130f891c646b70ee4a8e7345ae" dependencies: async "^2.1.4" fileset "^2.0.2" - istanbul-lib-coverage "^1.0.0" - istanbul-lib-hook "^1.0.0" - istanbul-lib-instrument "^1.3.0" - istanbul-lib-report "^1.0.0-alpha.3" - istanbul-lib-source-maps "^1.1.0" - istanbul-reports "^1.0.0" + istanbul-lib-coverage "^1.0.2" + istanbul-lib-hook "^1.0.5" + istanbul-lib-instrument "^1.7.0" + istanbul-lib-report "^1.0.0" + istanbul-lib-source-maps "^1.1.1" + istanbul-reports "^1.0.2" js-yaml "^3.7.0" mkdirp "^0.5.1" once "^1.4.0" -istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.0-alpha, istanbul-lib-coverage@^1.0.0-alpha.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.1.tgz#f263efb519c051c5f1f3343034fc40e7b43ff212" +istanbul-lib-coverage@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz#87a0c015b6910651cb3b184814dfb339337e25e1" -istanbul-lib-hook@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.0.tgz#fc5367ee27f59268e8f060b0c7aaf051d9c425c5" +istanbul-lib-hook@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.5.tgz#6ca3d16d60c5f4082da39f7c5cd38ea8a772b88e" dependencies: append-transform "^0.4.0" -istanbul-lib-instrument@^1.3.0, istanbul-lib-instrument@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.4.2.tgz#0e2fdfac93c1dabf2e31578637dc78a19089f43e" +istanbul-lib-instrument@^1.6.2, istanbul-lib-instrument@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.0.tgz#b8e0dc25709bb44e17336ab47b7bb5c97c23f659" dependencies: babel-generator "^6.18.0" babel-template "^6.16.0" babel-traverse "^6.18.0" babel-types "^6.18.0" babylon "^6.13.0" - istanbul-lib-coverage "^1.0.0" + istanbul-lib-coverage "^1.0.2" semver "^5.3.0" -istanbul-lib-report@^1.0.0-alpha.3: - version "1.0.0-alpha.3" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0-alpha.3.tgz#32d5f6ec7f33ca3a602209e278b2e6ff143498af" +istanbul-lib-report@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0.tgz#d83dac7f26566b521585569367fe84ccfc7aaecb" dependencies: - async "^1.4.2" - istanbul-lib-coverage "^1.0.0-alpha" + istanbul-lib-coverage "^1.0.2" mkdirp "^0.5.1" path-parse "^1.0.5" - rimraf "^2.4.3" supports-color "^3.1.2" -istanbul-lib-source-maps@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.0.tgz#9d429218f35b823560ea300a96ff0c3bbdab785f" +istanbul-lib-source-maps@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.1.tgz#f8c8c2e8f2160d1d91526d97e5bd63b2079af71c" dependencies: - istanbul-lib-coverage "^1.0.0-alpha.0" + istanbul-lib-coverage "^1.0.2" mkdirp "^0.5.1" rimraf "^2.4.4" source-map "^0.5.3" -istanbul-reports@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.1.tgz#9a17176bc4a6cbebdae52b2f15961d52fa623fbc" +istanbul-reports@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.2.tgz#4e8366abe6fa746cc1cd6633f108de12cc6ac6fa" dependencies: handlebars "^4.0.3" @@ -2698,33 +2756,33 @@ jodid25519@^1.0.0: jsbn "~0.1.0" jquery-ujs@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.1.tgz#6ee75b1ef4e9ac95e7124f8d71f7d351f5548e92" + version "1.2.2" + resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.2.tgz#6a8ef1020e6b6dda385b90a4bddc128c21c56397" dependencies: jquery ">=1.8.0" jquery@>=1.8.0, jquery@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.1.tgz#3c3e16854ad3d2ac44ac65021b17426d22ad803f" + version "2.2.4" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02" js-cookie@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.1.3.tgz#48071625217ac9ecfab8c343a13d42ec09ff0526" + version "2.1.4" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.1.4.tgz#da4ec503866f149d164cf25f579ef31015025d8d" js-tokens@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7" js-yaml@3.x, js-yaml@^3.5.1, js-yaml@^3.7.0: - version "3.8.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.1.tgz#782ba50200be7b9e5a8537001b7804db3ad02628" + version "3.8.3" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766" dependencies: argparse "^1.0.7" esprima "^3.1.1" jsbn@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd" + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" jsesc@^1.3.0: version "1.3.0" @@ -2775,9 +2833,10 @@ jsonpointer@^4.0.0: resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" jsprim@^1.2.2: - version "1.3.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.3.1.tgz#2a7256f70412a29ee3670aaca625994c4dcff252" + version "1.4.0" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918" dependencies: + assert-plus "1.0.0" extsprintf "1.0.2" json-schema "0.2.3" verror "1.3.6" @@ -2797,8 +2856,8 @@ jszip@^3.1.3: readable-stream "~2.0.6" karma-coverage-istanbul-reporter@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-0.2.0.tgz#5766263338adeb0026f7e4ac7a89a5f056c5642c" + version "0.2.3" + resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-0.2.3.tgz#11f1be9cfa93755a77bac39ab16e315a7100b5c5" dependencies: istanbul-api "^1.1.1" @@ -2807,14 +2866,14 @@ karma-jasmine@^1.1.0: resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf" karma-mocha-reporter@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.2.tgz#876de9a287244e54a608591732a98e66611f6abe" + version "2.2.3" + resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.3.tgz#04fdda45a1d9697a73871c7472223c581701ab20" dependencies: chalk "1.1.3" karma-phantomjs-launcher@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.2.tgz#19e1041498fd75563ed86730a22c1fe579fa8fb1" + version "1.0.4" + resolved "https://registry.yarnpkg.com/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz#d23ca34801bda9863ad318e3bb4bd4062b13acd2" dependencies: lodash "^4.0.1" phantomjs-prebuilt "^2.1.7" @@ -2826,8 +2885,8 @@ karma-sourcemap-loader@^0.3.7: graceful-fs "^4.1.2" karma-webpack@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.2.tgz#bd38350af5645c9644090770939ebe7ce726f864" + version "2.0.3" + resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.3.tgz#39cebf5ca2580139b27f9ae69b78816b9c82fae6" dependencies: async "~0.9.0" loader-utils "^0.2.5" @@ -2836,15 +2895,15 @@ karma-webpack@^2.0.2: webpack-dev-middleware "^1.0.11" karma@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/karma/-/karma-1.4.1.tgz#41981a71d54237606b0a3ea8c58c90773f41650e" + version "1.5.0" + resolved "https://registry.yarnpkg.com/karma/-/karma-1.5.0.tgz#9c4c14f0400bef2c04c8e8e6bff59371025cc009" dependencies: bluebird "^3.3.0" - body-parser "^1.12.4" + body-parser "^1.16.1" chokidar "^1.4.1" colors "^1.1.0" combine-lists "^1.0.0" - connect "^3.3.5" + connect "^3.6.0" core-js "^2.2.0" di "^0.0.1" dom-serialize "^2.2.0" @@ -2860,12 +2919,12 @@ karma@^1.4.1: optimist "^0.6.1" qjobs "^1.1.4" range-parser "^1.2.0" - rimraf "^2.3.3" + rimraf "^2.6.0" safe-buffer "^5.0.1" - socket.io "1.7.2" + socket.io "1.7.3" source-map "^0.5.3" - tmp "0.0.28" - useragent "^2.1.10" + tmp "0.0.31" + useragent "^2.1.12" kew@~0.7.0: version "0.7.0" @@ -2920,9 +2979,9 @@ loader-runner@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" -loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.5: - version "0.2.16" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d" +loader-utils@^0.2.16, loader-utils@^0.2.5: + version "0.2.17" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" dependencies: big.js "^3.1.3" emojis-list "^2.0.0" @@ -3073,4 +3132,1728 @@ micromatch@^2.1.5, micromatch@^2.3.11: is-glob "^2.0.1" kind-of "^3.0.2" normalize-path "^2.0.1" - object.omit + object.omit "^2.0.0" + parse-glob "^3.0.4" + regex-cache "^0.4.2" + +miller-rabin@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d" + dependencies: + bn.js "^4.0.0" + brorand "^1.0.1" + +"mime-db@>= 1.27.0 < 2", mime-db@~1.27.0: + version "1.27.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1" + +mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7: + version "2.1.15" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed" + dependencies: + mime-db "~1.27.0" + +mime@1.3.4, mime@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" + +minimalistic-assert@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" + +minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" + +"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" + dependencies: + brace-expansion "^1.0.0" + +minimist@0.0.8, minimist@~0.0.1: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + +minimist@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + +mkdirp@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12" + dependencies: + minimist "0.0.8" + +mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + dependencies: + minimist "0.0.8" + +moment@2.x: + version "2.18.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f" + +mousetrap@^1.4.6: + version "1.6.1" + resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.1.tgz#2a085f5c751294c75e7e81f6ec2545b29cbf42d9" + +ms@0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" + +ms@0.7.2: + version "0.7.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765" + +mute-stream@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" + +nan@^2.0.0, nan@^2.3.0: + version "2.5.1" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2" + +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + +negotiator@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" + +node-libs-browser@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-1.1.1.tgz#2a38243abedd7dffcd07a97c9aca5668975a6fea" + dependencies: + assert "^1.1.1" + browserify-zlib "^0.1.4" + buffer "^4.3.0" + console-browserify "^1.1.0" + constants-browserify "^1.0.0" + crypto-browserify "^3.11.0" + domain-browser "^1.1.1" + events "^1.0.0" + https-browserify "0.0.1" + os-browserify "^0.2.0" + path-browserify "0.0.0" + process "^0.11.0" + punycode "^1.2.4" + querystring-es3 "^0.2.0" + readable-stream "^2.0.5" + stream-browserify "^2.0.1" + stream-http "^2.3.1" + string_decoder "^0.10.25" + timers-browserify "^1.4.2" + tty-browserify "0.0.0" + url "^0.11.0" + util "^0.10.3" + vm-browserify "0.0.4" + +node-libs-browser@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646" + dependencies: + assert "^1.1.1" + browserify-zlib "^0.1.4" + buffer "^4.3.0" + console-browserify "^1.1.0" + constants-browserify "^1.0.0" + crypto-browserify "^3.11.0" + domain-browser "^1.1.1" + events "^1.0.0" + https-browserify "0.0.1" + os-browserify "^0.2.0" + path-browserify "0.0.0" + process "^0.11.0" + punycode "^1.2.4" + querystring-es3 "^0.2.0" + readable-stream "^2.0.5" + stream-browserify "^2.0.1" + stream-http "^2.3.1" + string_decoder "^0.10.25" + timers-browserify "^2.0.2" + tty-browserify "0.0.0" + url "^0.11.0" + util "^0.10.3" + vm-browserify "0.0.4" + +node-pre-gyp@^0.6.29, node-pre-gyp@^0.6.4: + version "0.6.34" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7" + dependencies: + mkdirp "^0.5.1" + nopt "^4.0.1" + npmlog "^4.0.2" + rc "^1.1.7" + request "^2.81.0" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^2.2.1" + tar-pack "^3.4.0" + +node-zopfli@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/node-zopfli/-/node-zopfli-2.0.2.tgz#a7a473ae92aaea85d4c68d45bbf2c944c46116b8" + dependencies: + commander "^2.8.1" + defaults "^1.0.2" + nan "^2.0.0" + node-pre-gyp "^0.6.4" + +nopt@3.x: + version "3.0.6" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + dependencies: + abbrev "1" + +nopt@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + dependencies: + abbrev "1" + osenv "^0.1.4" + +normalize-package-data@^2.3.2: + version "2.3.6" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff" + dependencies: + hosted-git-info "^2.1.4" + is-builtin-module "^1.0.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-path@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + dependencies: + remove-trailing-separator "^1.0.1" + +npmlog@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f" + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.1" + set-blocking "~2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + +oauth-sign@~0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" + +object-assign@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" + +object-assign@^4.0.1, object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + +object-component@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" + +object.omit@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" + dependencies: + for-own "^0.1.4" + is-extendable "^0.1.1" + +obuf@^1.0.0, obuf@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.1.tgz#104124b6c602c6796881a042541d36db43a5264e" + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + dependencies: + ee-first "1.1.1" + +on-headers@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7" + +once@1.x, once@^1.3.0, once@^1.3.3, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + dependencies: + wrappy "1" + +onetime@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" + +opener@^1.4.2: + version "1.4.3" + resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8" + +opn@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95" + dependencies: + object-assign "^4.0.1" + pinkie-promise "^2.0.0" + +optimist@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" + dependencies: + minimist "~0.0.1" + wordwrap "~0.0.2" + +optionator@^0.8.1, optionator@^0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.4" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + wordwrap "~1.0.0" + +options@>=0.0.5: + version "0.0.6" + resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" + +original@>=0.0.5: + version "1.0.0" + resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b" + dependencies: + url-parse "1.0.x" + +os-browserify@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f" + +os-homedir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + +os-locale@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + dependencies: + lcid "^1.0.0" + +os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + +osenv@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644" + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + +p-limit@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc" + +p-locate@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + dependencies: + p-limit "^1.1.0" + +pako@~0.2.0: + version "0.2.9" + resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" + +pako@~1.0.2: + version "1.0.5" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.5.tgz#d2205dfe5b9da8af797e7c163db4d1f84e4600bc" + +parse-asn1@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712" + dependencies: + asn1.js "^4.0.0" + browserify-aes "^1.0.0" + create-hash "^1.1.0" + evp_bytestokey "^1.0.0" + pbkdf2 "^3.0.3" + +parse-glob@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" + dependencies: + glob-base "^0.3.0" + is-dotfile "^1.0.0" + is-extglob "^1.0.0" + is-glob "^2.0.0" + +parse-json@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" + dependencies: + error-ex "^1.2.0" + +parsejson@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab" + dependencies: + better-assert "~1.0.0" + +parseqs@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d" + dependencies: + better-assert "~1.0.0" + +parseuri@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a" + dependencies: + better-assert "~1.0.0" + +parseurl@~1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56" + +path-browserify@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" + +path-exists@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" + dependencies: + pinkie-promise "^2.0.0" + +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + +path-is-inside@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + +path-parse@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + +path-type@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" + dependencies: + graceful-fs "^4.1.2" + pify "^2.0.0" + pinkie-promise "^2.0.0" + +pbkdf2@^3.0.3: + version "3.0.9" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.9.tgz#f2c4b25a600058b3c3773c086c37dbbee1ffe693" + dependencies: + create-hmac "^1.1.2" + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + +performance-now@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" + +phantomjs-prebuilt@^2.1.7: + version "2.1.14" + resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz#d53d311fcfb7d1d08ddb24014558f1188c516da0" + dependencies: + es6-promise "~4.0.3" + extract-zip "~1.5.0" + fs-extra "~1.0.0" + hasha "~2.2.0" + kew "~0.7.0" + progress "~1.1.8" + request "~2.79.0" + request-progress "~2.0.1" + which "~1.2.10" + +pify@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + +pikaday@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/pikaday/-/pikaday-1.5.1.tgz#0a48549bc1a14ea1d08c44074d761bc2f2bfcfd3" + optionalDependencies: + moment "2.x" + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + +pkg-dir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" + dependencies: + find-up "^1.0.0" + +pkg-up@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-1.0.0.tgz#3e08fb461525c4421624a33b9f7e6d0af5b05a26" + dependencies: + find-up "^1.0.0" + +pluralize@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45" + +portfinder@^1.0.9: + version "1.0.13" + resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9" + dependencies: + async "^1.5.2" + debug "^2.2.0" + mkdirp "0.5.x" + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + +preserve@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" + +private@^0.1.6: + version "0.1.7" + resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1" + +process-nextick-args@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" + +process@^0.11.0, process@~0.11.0: + version "0.11.9" + resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1" + +progress@^1.1.8, progress@~1.1.8: + version "1.1.8" + resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" + +proxy-addr@~1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3" + dependencies: + forwarded "~0.1.0" + ipaddr.js "1.3.0" + +prr@~0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" + +public-encrypt@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6" + dependencies: + bn.js "^4.1.0" + browserify-rsa "^4.0.0" + create-hash "^1.1.0" + parse-asn1 "^5.0.0" + randombytes "^2.0.1" + +punycode@1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + +punycode@^1.2.4, punycode@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + +qjobs@^1.1.4: + version "1.1.5" + resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73" + +qs@6.4.0, qs@~6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" + +qs@~6.3.0: + version "6.3.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c" + +querystring-es3@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" + +querystring@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" + +querystringify@0.0.x: + version "0.0.4" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c" + +randomatic@^1.1.3: + version "1.1.6" + resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb" + dependencies: + is-number "^2.0.2" + kind-of "^3.0.2" + +randombytes@^2.0.0, randombytes@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec" + +range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" + +raphael@^2.2.7: + version "2.2.7" + resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.2.7.tgz#231b19141f8d086986d8faceb66f8b562ee2c810" + dependencies: + eve-raphael "0.5.0" + +raw-body@~2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.2.0.tgz#994976cf6a5096a41162840492f0bdc5d6e7fb96" + dependencies: + bytes "2.4.0" + iconv-lite "0.4.15" + unpipe "1.0.0" + +raw-loader@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" + +rc@^1.1.7: + version "1.2.1" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95" + dependencies: + deep-extend "~0.4.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +read-pkg-up@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" + dependencies: + find-up "^1.0.0" + read-pkg "^1.0.0" + +read-pkg@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" + dependencies: + load-json-file "^1.0.0" + normalize-package-data "^2.3.2" + path-type "^1.0.0" + +"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6: + version "2.2.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816" + dependencies: + buffer-shims "^1.0.0" + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + string_decoder "~0.10.x" + util-deprecate "~1.0.1" + +readable-stream@^2.0.1, readable-stream@^2.0.5, readable-stream@~2.0.0, readable-stream@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + string_decoder "~0.10.x" + util-deprecate "~1.0.1" + +readable-stream@~1.0.2: + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readdirp@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" + dependencies: + graceful-fs "^4.1.2" + minimatch "^3.0.2" + readable-stream "^2.0.2" + set-immediate-shim "^1.0.1" + +readline2@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35" + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + mute-stream "0.0.5" + +rechoir@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" + dependencies: + resolve "^1.1.6" + +regenerate@^1.2.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260" + +regenerator-runtime@^0.10.0: + version "0.10.3" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e" + +regenerator-transform@0.9.8: + version "0.9.8" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.8.tgz#0f88bb2bc03932ddb7b6b7312e68078f01026d6c" + dependencies: + babel-runtime "^6.18.0" + babel-types "^6.19.0" + private "^0.1.6" + +regex-cache@^0.4.2: + version "0.4.3" + resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145" + dependencies: + is-equal-shallow "^0.1.3" + is-primitive "^2.0.0" + +regexpu-core@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" + dependencies: + regenerate "^1.2.1" + regjsgen "^0.2.0" + regjsparser "^0.1.4" + +regjsgen@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" + +regjsparser@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" + dependencies: + jsesc "~0.5.0" + +remove-trailing-separator@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4" + +repeat-element@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" + +repeat-string@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae" + +repeat-string@^1.5.2: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + +repeating@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" + dependencies: + is-finite "^1.0.0" + +request-progress@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08" + dependencies: + throttleit "^1.0.0" + +request@^2.81.0: + version "2.81.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" + dependencies: + aws-sign2 "~0.6.0" + aws4 "^1.2.1" + caseless "~0.12.0" + combined-stream "~1.0.5" + extend "~3.0.0" + forever-agent "~0.6.1" + form-data "~2.1.1" + har-validator "~4.2.1" + hawk "~3.1.3" + http-signature "~1.1.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.7" + oauth-sign "~0.8.1" + performance-now "^0.2.0" + qs "~6.4.0" + safe-buffer "^5.0.1" + stringstream "~0.0.4" + tough-cookie "~2.3.0" + tunnel-agent "^0.6.0" + uuid "^3.0.0" + +request@~2.79.0: + version "2.79.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" + dependencies: + aws-sign2 "~0.6.0" + aws4 "^1.2.1" + caseless "~0.11.0" + combined-stream "~1.0.5" + extend "~3.0.0" + forever-agent "~0.6.1" + form-data "~2.1.1" + har-validator "~2.0.6" + hawk "~3.1.3" + http-signature "~1.1.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.7" + oauth-sign "~0.8.1" + qs "~6.3.0" + stringstream "~0.0.4" + tough-cookie "~2.3.0" + tunnel-agent "~0.4.1" + uuid "^3.0.0" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + +require-main-filename@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" + +require-uncached@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" + dependencies: + caller-path "^0.1.0" + resolve-from "^1.0.0" + +requires-port@1.0.x, requires-port@1.x.x: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + +resolve-from@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" + +resolve@1.1.x: + version "1.1.7" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" + +resolve@^1.1.6, resolve@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235" + dependencies: + path-parse "^1.0.5" + +restore-cursor@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" + dependencies: + exit-hook "^1.0.0" + onetime "^1.0.0" + +right-align@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" + dependencies: + align-text "^0.1.1" + +rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.6.0, rimraf@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" + dependencies: + glob "^7.0.5" + +ripemd160@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e" + +run-async@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389" + dependencies: + once "^1.3.0" + +rx-lite@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" + +safe-buffer@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7" + +select-hose@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" + +select2@3.5.2-browserify: + version "3.5.2-browserify" + resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz#dc4dafda38d67a734e8a97a46f0d3529ae05391d" + +"semver@2 || 3 || 4 || 5", semver@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + +semver@~4.3.3: + version "4.3.6" + resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" + +send@0.15.1: + version "0.15.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.15.1.tgz#8a02354c26e6f5cca700065f5f0cdeba90ec7b5f" + dependencies: + debug "2.6.1" + depd "~1.1.0" + destroy "~1.0.4" + encodeurl "~1.0.1" + escape-html "~1.0.3" + etag "~1.8.0" + fresh "0.5.0" + http-errors "~1.6.1" + mime "1.3.4" + ms "0.7.2" + on-finished "~2.3.0" + range-parser "~1.2.0" + statuses "~1.3.1" + +serve-index@^1.7.2: + version "1.8.0" + resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.8.0.tgz#7c5d96c13fb131101f93c1c5774f8516a1e78d3b" + dependencies: + accepts "~1.3.3" + batch "0.5.3" + debug "~2.2.0" + escape-html "~1.0.3" + http-errors "~1.5.0" + mime-types "~2.1.11" + parseurl "~1.3.1" + +serve-static@1.12.1: + version "1.12.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.1.tgz#7443a965e3ced647aceb5639fa06bf4d1bbe0039" + dependencies: + encodeurl "~1.0.1" + escape-html "~1.0.3" + parseurl "~1.3.1" + send "0.15.1" + +set-blocking@^2.0.0, set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + +set-immediate-shim@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" + +setimmediate@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + +setprototypeof@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08" + +setprototypeof@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04" + +sha.js@^2.3.6: + version "2.4.8" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f" + dependencies: + inherits "^2.0.1" + +shelljs@^0.7.5: + version "0.7.7" + resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1" + dependencies: + glob "^7.0.0" + interpret "^1.0.0" + rechoir "^0.6.2" + +signal-exit@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + +slash@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" + +slice-ansi@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35" + +sntp@1.x.x: + version "1.0.9" + resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" + dependencies: + hoek "2.x.x" + +socket.io-adapter@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b" + dependencies: + debug "2.3.3" + socket.io-parser "2.3.1" + +socket.io-client@1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.3.tgz#b30e86aa10d5ef3546601c09cde4765e381da377" + dependencies: + backo2 "1.0.2" + component-bind "1.0.0" + component-emitter "1.2.1" + debug "2.3.3" + engine.io-client "1.8.3" + has-binary "0.1.7" + indexof "0.0.1" + object-component "0.0.3" + parseuri "0.0.5" + socket.io-parser "2.3.1" + to-array "0.1.4" + +socket.io-parser@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.3.1.tgz#dd532025103ce429697326befd64005fcfe5b4a0" + dependencies: + component-emitter "1.1.2" + debug "2.2.0" + isarray "0.0.1" + json3 "3.3.2" + +socket.io@1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.3.tgz#b8af9caba00949e568e369f1327ea9be9ea2461b" + dependencies: + debug "2.3.3" + engine.io "1.8.3" + has-binary "0.1.7" + object-assign "4.1.0" + socket.io-adapter "0.5.0" + socket.io-client "1.7.3" + socket.io-parser "2.3.1" + +sockjs-client@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.2.tgz#f0212a8550e4c9468c8cceaeefd2e3493c033ad5" + dependencies: + debug "^2.2.0" + eventsource "0.1.6" + faye-websocket "~0.11.0" + inherits "^2.0.1" + json3 "^3.3.2" + url-parse "^1.1.1" + +sockjs@0.3.18: + version "0.3.18" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.18.tgz#d9b289316ca7df77595ef299e075f0f937eb4207" + dependencies: + faye-websocket "^0.10.0" + uuid "^2.0.2" + +source-list-map@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.1.tgz#1a33ac210ca144d1e561f906ebccab5669ff4cb4" + +source-list-map@~0.1.7: + version "0.1.8" + resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106" + +source-map-support@^0.4.2: + version "0.4.14" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef" + dependencies: + source-map "^0.5.6" + +source-map@^0.1.41: + version "0.1.43" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346" + dependencies: + amdefine ">=0.0.4" + +source-map@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" + dependencies: + amdefine ">=0.0.4" + +source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3: + version "0.5.6" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" + +source-map@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" + dependencies: + amdefine ">=0.0.4" + +spdx-correct@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40" + dependencies: + spdx-license-ids "^1.0.2" + +spdx-expression-parse@~1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c" + +spdx-license-ids@^1.0.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57" + +spdy-transport@^2.0.15: + version "2.0.18" + resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.0.18.tgz#43fc9c56be2cccc12bb3e2754aa971154e836ea6" + dependencies: + debug "^2.2.0" + hpack.js "^2.1.6" + obuf "^1.1.0" + readable-stream "^2.0.1" + wbuf "^1.4.0" + +spdy@^3.4.1: + version "3.4.4" + resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.4.tgz#e0406407ca90ff01b553eb013505442649f5a819" + dependencies: + debug "^2.2.0" + handle-thing "^1.2.4" + http-deceiver "^1.2.4" + select-hose "^2.0.0" + spdy-transport "^2.0.15" + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + +sshpk@^1.7.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.11.0.tgz#2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77" + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + dashdash "^1.12.0" + getpass "^0.1.1" + optionalDependencies: + bcrypt-pbkdf "^1.0.0" + ecc-jsbn "~0.1.1" + jodid25519 "^1.0.0" + jsbn "~0.1.0" + tweetnacl "~0.14.0" + +stats-webpack-plugin@^0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.4.3.tgz#b2f618202f28dd04ab47d7ecf54ab846137b7aea" + +"statuses@>= 1.3.1 < 2", statuses@~1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" + +stream-browserify@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" + dependencies: + inherits "~2.0.1" + readable-stream "^2.0.2" + +stream-http@^2.3.1: + version "2.7.0" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6" + dependencies: + builtin-status-codes "^3.0.0" + inherits "^2.0.1" + readable-stream "^2.2.6" + to-arraybuffer "^1.0.0" + xtend "^4.0.0" + +string-width@^1.0.1, string-width@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +string-width@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e" + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^3.0.0" + +string_decoder@^0.10.25, string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + +stringstream@~0.0.4: + version "0.0.5" + resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + dependencies: + ansi-regex "^2.0.0" + +strip-bom@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" + dependencies: + is-utf8 "^0.2.0" + +strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + +supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2: + version "3.2.3" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" + dependencies: + has-flag "^1.0.0" + +table@^3.7.8: + version "3.8.3" + resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f" + dependencies: + ajv "^4.7.0" + ajv-keywords "^1.0.0" + chalk "^1.1.1" + lodash "^4.0.0" + slice-ansi "0.0.4" + string-width "^2.0.0" + +tapable@^0.1.8: + version "0.1.10" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4" + +tapable@^0.2.5, tapable@~0.2.5: + version "0.2.6" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d" + +tar-pack@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984" + dependencies: + debug "^2.2.0" + fstream "^1.0.10" + fstream-ignore "^1.0.5" + once "^1.3.3" + readable-stream "^2.1.4" + rimraf "^2.5.1" + tar "^2.2.1" + uid-number "^0.0.6" + +tar@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" + dependencies: + block-stream "*" + fstream "^1.0.2" + inherits "2" + +test-exclude@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.3.tgz#86a13ce3effcc60e6c90403cf31a27a60ac6c4e7" + dependencies: + arrify "^1.0.1" + micromatch "^2.3.11" + object-assign "^4.1.0" + read-pkg-up "^1.0.1" + require-main-filename "^1.0.1" + +text-table@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + +three-orbit-controls@^82.1.0: + version "82.1.0" + resolved "https://registry.yarnpkg.com/three-orbit-controls/-/three-orbit-controls-82.1.0.tgz#11a7f33d0a20ecec98f098b37780f6537374fab4" + +three-stl-loader@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/three-stl-loader/-/three-stl-loader-1.0.4.tgz#6b3319a31e3b910aab1883d19b00c81a663c3e03" + +three@^0.84.0: + version "0.84.0" + resolved "https://registry.yarnpkg.com/three/-/three-0.84.0.tgz#95be85a55a0fa002aa625ed559130957dcffd918" + +throttleit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" + +through@^2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + +timeago.js@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/timeago.js/-/timeago.js-2.0.5.tgz#730c74fbdb0b0917a553675a4460e3a7f80db86c" + +timers-browserify@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d" + dependencies: + process "~0.11.0" + +timers-browserify@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86" + dependencies: + setimmediate "^1.0.4" + +tmp@0.0.31, tmp@0.0.x: + version "0.0.31" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7" + dependencies: + os-tmpdir "~1.0.1" + +to-array@0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" + +to-arraybuffer@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" + +to-fast-properties@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320" + +tough-cookie@~2.3.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a" + dependencies: + punycode "^1.4.1" + +traverse@0.6.6: + version "0.6.6" + resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137" + +trim-right@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" + +tryit@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb" + +tty-browserify@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + dependencies: + safe-buffer "^5.0.1" + +tunnel-agent@~0.4.1: + version "0.4.3" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + dependencies: + prelude-ls "~1.1.2" + +type-is@~1.6.14: + version "1.6.15" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410" + dependencies: + media-typer "0.3.0" + mime-types "~2.1.15" + +typedarray@^0.0.6, typedarray@~0.0.5: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + +uglify-js@^2.6, uglify-js@^2.8.5: + version "2.8.21" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.21.tgz#1733f669ae6f82fc90c7b25ec0f5c783ee375314" + dependencies: + source-map "~0.5.1" + yargs "~3.10.0" + optionalDependencies: + uglify-to-browserify "~1.0.0" + +uglify-to-browserify@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" + +uid-number@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" + +ultron@1.0.x: + version "1.0.2" + resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" + +unc-path-regex@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" + +underscore@^1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + +url-parse@1.0.x: + version "1.0.5" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b" + dependencies: + querystringify "0.0.x" + requires-port "1.0.x" + +url-parse@^1.1.1: + version "1.1.8" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.8.tgz#7a65b3a8d57a1e86af6b4e2276e34774167c0156" + dependencies: + querystringify "0.0.x" + requires-port "1.0.x" + +url@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" + dependencies: + punycode "1.3.2" + querystring "0.2.0" + +user-home@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f" + dependencies: + os-homedir "^1.0.0" + +useragent@^2.1.12: + version "2.1.13" + resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.13.tgz#bba43e8aa24d5ceb83c2937473e102e21df74c10" + dependencies: + lru-cache "2.2.x" + tmp "0.0.x" + +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + +util@0.10.3, util@^0.10.3: + version "0.10.3" + resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" + dependencies: + inherits "2.0.1" + +utils-merge@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8" + +uuid@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" + +uuid@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" + +validate-npm-package-license@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" + dependencies: + spdx-correct "~1.0.0" + spdx-expression-parse "~1.0.0" + +vary@~1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37" + +verror@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c" + dependencies: + extsprintf "1.0.2" + +visibilityjs@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/visibilityjs/-/visibilityjs-1.2.4.tgz#bff8663da62c8c10ad4ee5ae6a1ae6fac4259d63" + +vm-browserify@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" + dependencies: + indexof "0.0.1" + +void-elements@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" + +vue-resource@^0.9.3: + version "0.9.3" + resolved "https://registry.yarnpkg.com/vue-resource/-/vue-resource-0.9.3.tgz#ab46e1c44ea219142dcc28ae4043b3b04c80959d" + +vue@^2.2.4: + version "2.2.6" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.6.tgz#451714b394dd6d4eae7b773c40c2034a59621aed" + +watchpack@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87" + dependencies: + async "^2.1.2" + chokidar "^1.4.3" + graceful-fs "^4.1.2" + +wbuf@^1.1.0, wbuf@^1.4.0: + version "1.7.2" + resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.2.tgz#d697b99f1f59512df2751be42769c1580b5801fe" + dependencies: + minimalistic-assert "^1.0.0" + +webpack-bundle-analyzer@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.3.1.tgz#d97f8aadbcce68fc865c5787741d8549359a25cd" + dependencies: + acorn "^4.0.11" + chalk "^1.1.3" + commander "^2.9.0" + ejs "^2.5.5" + express "^4.14.1" + filesize "^3.5.4" + gzip-size "^3.0.0" + lodash "^4.17.4" + mkdirp "^0.5.1" + opener "^1.4.2" + +webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.9.0: + version "1.10.1" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.1.tgz#c6b4cf428139cf1aefbe06a0c00fdb4f8da2f893" + dependencies: + memory-fs "~0.4.1" + mime "^1.3.4" + path-is-absolute "^1.0.0" + range-parser "^1.0.3" + +webpack-dev-server@^2.3.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.2.tgz#cf595d6b40878452b6d2ad7229056b686f8a16be" + dependencies: + ansi-html "0.0.7" + chokidar "^1.6.0" + compression "^1.5.2" + connect-history-api-fallback "^1.3.0" + express "^4.13.3" + html-entities "^1.2.0" + http-proxy-middleware "~0.17.4" + opn "4.0.2" + portfinder "^1.0.9" + serve-index "^1.7.2" + sockjs "0.3.18" + sockjs-client "1.1.2" + spdy "^3.4.1" + strip-ansi "^3.0.0" + supports-color "^3.1.1" + webpack-dev-middleware "^1.9.0" + yargs "^6.0.0" + +webpack-sources@^0.1.0: + version "0.1.5" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750" + dependencies: + source-list-map "~0.1.7" + source-map "~0.5.3" + +webpack-sources@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb" + dependencies: + source-list-map "^1.1.1" + source-map "~0.5.3" + +webpack@^2.2.1: + version "2.3.3" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.3.tgz#eecc083c18fb7bf958ea4f40b57a6640c5a0cc78" + dependencies: + acorn "^4.0.4" + acorn-dynamic-import "^2.0.0" + ajv "^4.7.0" + ajv-keywords "^1.1.1" + async "^2.1.2" + enhanced-resolve "^3.0.0" + interpret "^1.0.0" + json-loader "^0.5.4" + loader-runner "^2.3.0" + loader-utils "^0.2.16" + memory-fs "~0.4.1" + mkdirp "~0.5.0" + node-libs-browser "^2.0.0" + source-map "^0.5.3" + supports-color "^3.1.0" + tapable "~0.2.5" + uglify-js "^2.8.5" + watchpack "^1.3.1" + webpack-sources "^0.2.3" + yargs "^6.0.0" + +websocket-driver@>=0.5.1: + version "0.6.5" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36" + dependencies: + websocket-extensions ">=0.1.1" + +websocket-extensions@>=0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz#76899499c184b6ef754377c2dbb0cd6cb55d29e7" + +which-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" + +which@^1.1.1, which@~1.2.10: + version "1.2.14" + resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" + dependencies: + isexe "^2.0.0" + +wide-align@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad" + dependencies: + string-width "^1.0.1" + +window-size@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" + +wordwrap@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" + +wordwrap@^1.0.0, wordwrap@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + +wordwrap@~0.0.2: + version "0.0.3" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" + +wrap-ansi@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + +write@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" + dependencies: + mkdirp "^0.5.1" + +ws@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f" + dependencies: + options ">=0.0.5" + ultron "1.0.x" + +wtf-8@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a" + +xmlhttprequest-ssl@1.5.3: + version "1.5.3" + resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d" + +xtend@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" + +y18n@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" + +yargs-parser@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c" + dependencies: + camelcase "^3.0.0" + +yargs@^6.0.0: + version "6.6.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" + dependencies: + camelcase "^3.0.0" + cliui "^3.2.0" + decamelize "^1.1.1" + get-caller-file "^1.0.1" + os-locale "^1.4.0" + read-pkg-up "^1.0.1" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^1.0.2" + which-module "^1.0.0" + y18n "^3.2.1" + yargs-parser "^4.2.0" + +yargs@~3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" + dependencies: + camelcase "^1.0.2" + cliui "^2.1.0" + decamelize "^1.0.0" + window-size "0.1.0" + +yauzl@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" + dependencies: + fd-slicer "~1.0.1" + +yeast@0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" From c8cea68fe07af46c3a4c8c6429d10473e09d557b Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 7 Apr 2017 22:21:21 +0100 Subject: [PATCH 69/70] alfredo review changes --- app/assets/javascripts/notes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index eeb97fa2ee0..15f7a813626 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -143,7 +143,7 @@ require('./task_list'); const noteTypeInput = form.querySelector('#note_type'); const submitButton = form.querySelector('.js-comment-type-dropdown .js-comment-submit-button'); const closeButton = form.querySelector('.js-note-target-close'); - const reopenButton = form.querySelector('.reopen-mr-link') || form.querySelector('.js-note-target-reopen'); + const reopenButton = form.querySelector('.js-note-target-reopen'); const commentTypeToggle = new CommentTypeToggle({ dropdownTrigger, From 130a1e86e215d5d43cd3c53a44589aa5b8c69aab Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 7 Apr 2017 20:03:39 -0500 Subject: [PATCH 70/70] Fix specs --- spec/support/slash_commands_helpers.rb | 2 +- spec/support/time_tracking_shared_examples.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/support/slash_commands_helpers.rb b/spec/support/slash_commands_helpers.rb index 0d91fe5fd5d..4bfe481115f 100644 --- a/spec/support/slash_commands_helpers.rb +++ b/spec/support/slash_commands_helpers.rb @@ -3,7 +3,7 @@ module SlashCommandsHelpers Sidekiq::Testing.fake! do page.within('.js-main-target-form') do fill_in 'note[note]', with: text - find('.comment-btn').trigger('click') + find('.js-comment-submit-button').trigger('click') end end end diff --git a/spec/support/time_tracking_shared_examples.rb b/spec/support/time_tracking_shared_examples.rb index 52f4fabdc47..01bc80f957e 100644 --- a/spec/support/time_tracking_shared_examples.rb +++ b/spec/support/time_tracking_shared_examples.rb @@ -77,6 +77,6 @@ end def submit_time(slash_command) fill_in 'note[note]', with: slash_command - find('.comment-btn').trigger('click') + find('.js-comment-submit-button').trigger('click') wait_for_ajax end