Merge remote-tracking branch 'origin/master'

Author: nemerovchenko

.gitattributes

@@ -1,3 +1,3 @@
-mojs-curve-editor.js merge=ours
-mojs-curve-editor.min.js merge=ours
+app/build/mojs-curve-editor.js merge=ours
+app/build/mojs-curve-editor.min.js merge=ours
 *.postcss.css.json merge=ours

app/build/mojs-curve-editor.js

@@ -75,7 +75,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 	}
 /******/ 	
 /******/ 	var hotApplyOnUpdate = true;
-/******/ 	var hotCurrentHash = "654c693aa5c9f2466b16"; // eslint-disable-line no-unused-vars
+/******/ 	var hotCurrentHash = "3074fd175cc069076662"; // eslint-disable-line no-unused-vars
 /******/ 	var hotCurrentModuleData = {};
 /******/ 	var hotCurrentParents = []; // eslint-disable-line no-unused-vars
 /******/ 	
@@ -4225,6 +4225,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /***/ function(module, exports) {
 
 	// shim for using process in browser
+	
 	var process = module.exports = {};
 
 	// cached from whatever global is present so that test runners that stub it
@@ -4236,35 +4237,21 @@ return /******/ (function(modules) { // webpackBootstrap
 	var cachedClearTimeout;
 
 	(function () {
-	    try {
-	        cachedSetTimeout = setTimeout;
-	    } catch (e) {
-	        cachedSetTimeout = function () {
-	            throw new Error('setTimeout is not defined');
-	        }
+	  try {
+	    cachedSetTimeout = setTimeout;
+	  } catch (e) {
+	    cachedSetTimeout = function () {
+	      throw new Error('setTimeout is not defined');
 	    }
-	    try {
-	        cachedClearTimeout = clearTimeout;
-	    } catch (e) {
-	        cachedClearTimeout = function () {
-	            throw new Error('clearTimeout is not defined');
-	        }
+	  }
+	  try {
+	    cachedClearTimeout = clearTimeout;
+	  } catch (e) {
+	    cachedClearTimeout = function () {
+	      throw new Error('clearTimeout is not defined');
 	    }
+	  }
 	} ())
-	function runTimeout(fun) {
-	    if (cachedSetTimeout === setTimeout) {
-	        return setTimeout(fun, 0);
-	    } else {
-	        return cachedSetTimeout.call(null, fun, 0);
-	    }
-	}
-	function runClearTimeout(marker) {
-	    if (cachedClearTimeout === clearTimeout) {
-	        clearTimeout(marker);
-	    } else {
-	        cachedClearTimeout.call(null, marker);
-	    }
-	}
 	var queue = [];
 	var draining = false;
 	var currentQueue;
@@ -4289,7 +4276,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    if (draining) {
 	        return;
 	    }
-	    var timeout = runTimeout(cleanUpNextTick);
+	    var timeout = cachedSetTimeout.call(null, cleanUpNextTick);
 	    draining = true;
 
 	    var len = queue.length;
@@ -4306,7 +4293,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }
 	    currentQueue = null;
 	    draining = false;
-	    runClearTimeout(timeout);
+	    cachedClearTimeout.call(null, timeout);
 	}
 
 	process.nextTick = function (fun) {
@@ -4318,7 +4305,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }
 	    queue.push(new Item(fun, args));
 	    if (queue.length === 1 && !draining) {
-	        runTimeout(drainQueue);
+	        cachedSetTimeout.call(null, drainQueue, 0);
 	    }
 	};
 
@@ -9861,9 +9848,9 @@ return /******/ (function(modules) { // webpackBootstrap
 /***/ function(module, exports) {
 
 	module.exports = {
-		"point": "_point_eogtk_5",
-		"is-selected": "_is-selected_eogtk_40",
-		"is-hide-handles": "_is-hide-handles_eogtk_50"
+		"point": "_point_at09i_5",
+		"is-selected": "_is-selected_at09i_40",
+		"is-hide-handles": "_is-hide-handles_at09i_50"
 	};
 
 /***/ },
@@ -9901,7 +9888,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 	// module
-	exports.push([module.id, "._point_eogtk_5{position:absolute;width:10px;height:10px;margin-left:-5px;margin-top:-5px;cursor:move;background:#fff;border-radius:50%;z-index:3;box-shadow:3px 3px 0 rgba(0,0,0,.5);border:2px solid #fff}._point_eogtk_5 little-handle{position:absolute;left:50%;top:50%;margin-left:-3px;margin-top:-3px}._point_eogtk_5:after{content:'';position:absolute;left:50%;top:50%;width:20px;height:20px;margin-left:-10px;margin-top:-10px}._point_eogtk_5._is-selected_eogtk_40,._point_eogtk_5:hover{border-color:#8c6d8b}._point_eogtk_5._is-selected_eogtk_40 little-handle{display:block}._point_eogtk_5._is-hide-handles_eogtk_50 little-handle{display:none}", ""]);
+	exports.push([module.id, "._point_at09i_5{position:absolute;width:10px;height:10px;margin-left:-5px;margin-top:-5px;cursor:move;background:#fff;border-radius:50%;z-index:3;box-shadow:3px 3px 0 rgba(0,0,0,.5);border:2px solid #fff}._point_at09i_5 little-handle{position:absolute;left:50%;top:50%;margin-left:-3px;margin-top:-3px;display:none}._point_at09i_5:after{content:'';position:absolute;left:50%;top:50%;width:20px;height:20px;margin-left:-10px;margin-top:-10px}._point_at09i_5._is-selected_at09i_40,._point_at09i_5:hover{border-color:#8c6d8b}._point_at09i_5._is-selected_at09i_40 little-handle{display:block}._point_at09i_5._is-hide-handles_at09i_50 little-handle{display:none}", ""]);
 
 	// exports
 

app/build/mojs-curve-editor.min.js

@@ -33,7 +33,7 @@ $size: 10;
     top:          50%;
     margin-left:  calc( -($size/2)*$PX );
     margin-top:   calc( -($size/2)*$PX );
-    /*display:      none;*/
+    display:      none;
   }
 
   &:hover,

app/css/blocks/point.postcss.css

@@ -1 +1 @@
-{"point":"_point_eogtk_5","is-selected":"_is-selected_eogtk_40","is-hide-handles":"_is-hide-handles_eogtk_50"}
+{"point":"_point_at09i_5","is-selected":"_is-selected_at09i_40","is-hide-handles":"_is-hide-handles_at09i_50"}