Skip to content

Commit e72c47f

Browse files
legomushroomlegomushroom
committed
point: change type issue fix
1 parent c8db973 commit e72c47f

File tree

9 files changed

+142
-106
lines changed

9 files changed

+142
-106
lines changed

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

Lines changed: 90 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ return /******/ (function(modules) { // webpackBootstrap
9999

100100
var _constants2 = _interopRequireDefault(_constants);
101101

102-
var _hash = __webpack_require__(200);
102+
var _hash = __webpack_require__(202);
103103

104104
var _hash2 = _interopRequireDefault(_hash);
105105

106-
var _fallbackTo = __webpack_require__(201);
106+
var _fallbackTo = __webpack_require__(203);
107107

108108
var _fallbackTo2 = _interopRequireDefault(_fallbackTo);
109109

110-
var _defer = __webpack_require__(202);
110+
var _defer = __webpack_require__(204);
111111

112112
var _defer2 = _interopRequireDefault(_defer);
113113

@@ -163,7 +163,7 @@ return /******/ (function(modules) { // webpackBootstrap
163163
}, {
164164
key: '_vars',
165165
value: function _vars() {
166-
this.revision = '1.0.0';
166+
this.revision = '1.0.1';
167167
this.store = (0, _store2.default)();
168168

169169
this._easings = [];
@@ -10249,19 +10249,19 @@ return /******/ (function(modules) { // webpackBootstrap
1024910249

1025010250
var _pointsReducer2 = _interopRequireDefault(_pointsReducer);
1025110251

10252-
var _controlsReducer = __webpack_require__(195);
10252+
var _controlsReducer = __webpack_require__(197);
1025310253

1025410254
var _controlsReducer2 = _interopRequireDefault(_controlsReducer);
1025510255

10256-
var _pointControlsReducer = __webpack_require__(197);
10256+
var _pointControlsReducer = __webpack_require__(199);
1025710257

1025810258
var _pointControlsReducer2 = _interopRequireDefault(_pointControlsReducer);
1025910259

10260-
var _progressesReducer = __webpack_require__(198);
10260+
var _progressesReducer = __webpack_require__(200);
1026110261

1026210262
var _progressesReducer2 = _interopRequireDefault(_progressesReducer);
1026310263

10264-
var _reduxRecycle = __webpack_require__(199);
10264+
var _reduxRecycle = __webpack_require__(201);
1026510265

1026610266
var _reduxRecycle2 = _interopRequireDefault(_reduxRecycle);
1026710267

@@ -10459,6 +10459,14 @@ return /******/ (function(modules) { // webpackBootstrap
1045910459

1046010460
var _calculatePath2 = _interopRequireDefault(_calculatePath);
1046110461

10462+
var _deselectAll = __webpack_require__(195);
10463+
10464+
var _deselectAll2 = _interopRequireDefault(_deselectAll);
10465+
10466+
var _findSelectedIndecies = __webpack_require__(196);
10467+
10468+
var _findSelectedIndecies2 = _interopRequireDefault(_findSelectedIndecies);
10469+
1046210470
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
1046310471

1046410472
var INITIAL_STATE = {
@@ -10473,25 +10481,6 @@ return /******/ (function(modules) { // webpackBootstrap
1047310481
// ])
1047410482
};
1047510483

10476-
var deselectAll = function deselectAll(state) {
10477-
var newState = (0, _extends3.default)({}, state, { points: [] }),
10478-
points = state.points;
10479-
10480-
for (var i = 0; i < points.length; i++) {
10481-
newState.points.push((0, _extends3.default)({}, points[i], { isSelected: false }));
10482-
}
10483-
return newState;
10484-
};
10485-
10486-
var findSelectedIndecies = function findSelectedIndecies(points) {
10487-
var indecies = [];
10488-
10489-
for (var i = 0; i < points.length; i++) {
10490-
points[i].isSelected && indecies.push(i);
10491-
}
10492-
return indecies;
10493-
};
10494-
1049510484
var pointsReducer = function pointsReducer() {
1049610485
var state = arguments.length <= 0 || arguments[0] === undefined ? INITIAL_STATE : arguments[0];
1049710486
var action = arguments[1];
@@ -10535,7 +10524,7 @@ return /******/ (function(modules) { // webpackBootstrap
1053510524
var _data = action.data;
1053610525
var _index2 = _data.index;
1053710526
var isDeselect = _data.isDeselect;
10538-
var newState = isDeselect ? deselectAll(state) : (0, _extends3.default)({}, state);
10527+
var newState = isDeselect ? (0, _deselectAll2.default)(state) : (0, _extends3.default)({}, state);
1053910528
var _points2 = newState.points;
1054010529

1054110530

@@ -10549,7 +10538,7 @@ return /******/ (function(modules) { // webpackBootstrap
1054910538
var _data2 = action.data;
1055010539
var _index3 = _data2.index;
1055110540
var _point = _data2.point;
10552-
var deselected = deselectAll(state);
10541+
var deselected = (0, _deselectAll2.default)(state);
1055310542

1055410543
var _newPoints2 = [].concat((0, _toConsumableArray3.default)(deselected.points.slice(0, _index3)), [(0, _makePoint2.default)((0, _extends3.default)({}, _point))], (0, _toConsumableArray3.default)(deselected.points.slice(_index3)));
1055510544

@@ -10563,7 +10552,7 @@ return /******/ (function(modules) { // webpackBootstrap
1056310552
case 'POINT_DELETE':
1056410553
{
1056510554
var _points4 = state.points;
10566-
var selected = findSelectedIndecies(_points4);
10555+
var selected = (0, _findSelectedIndecies2.default)(_points4);
1056710556

1056810557
var _newPoints3 = [];
1056910558
for (var i = 0; i < _points4.length; i++) {
@@ -10577,45 +10566,41 @@ return /******/ (function(modules) { // webpackBootstrap
1057710566
case 'POINT_CHANGE_TYPE':
1057810567
{
1057910568
var _points5 = state.points;
10580-
var _selected = findSelectedIndecies(_points5);
10581-
10582-
var _newPoints4 = [];
10583-
for (var i = 0; i < _points5.length; i++) {
10584-
var _item = _points5[i],
10585-
type = action.data;
10586-
// copy all items from previous points
10587-
_newPoints4.push((0, _extends3.default)({}, _item));
10588-
// if item was selected - set the new `type`
10589-
_selected.indexOf(i) !== -1 && (_newPoints4[i].type = type);
10590-
10591-
var _index4 = i,
10592-
_point2 = _newPoints4[_index4],
10593-
sibPoint = _index4 === _newPoints4.length - 1 ? _newPoints4[_index4 - 1] : _newPoints4[_index4 + 1];
10594-
10595-
var handleIndex = _index4 === _newPoints4.length - 1 ? 1 : 2,
10569+
var type = action.data;
10570+
var _selected = (0, _findSelectedIndecies2.default)(_points5);
10571+
10572+
// change type on all selected items
10573+
var _newPoints4 = [].concat((0, _toConsumableArray3.default)(_points5));
10574+
for (var i = 0; i < _selected.length; i++) {
10575+
var _index4 = _selected[i],
10576+
_point2 = (0, _extends3.default)({}, _newPoints4[_index4], { type: type }),
10577+
handleIndex = _index4 === _newPoints4.length - 1 ? 1 : 2,
1059610578
sibHandleIndex = handleIndex === 1 ? 2 : 1,
1059710579
handleName = 'handle' + handleIndex,
1059810580
sibHandleName = 'handle' + sibHandleIndex,
1059910581
handle = (0, _extends3.default)({}, _point2[handleName]),
1060010582
sibHandle = (0, _extends3.default)({}, _point2[sibHandleName]);
1060110583

10602-
_point2[handleName] = handle;
10603-
_point2[sibHandleName] = sibHandle;
10604-
10584+
// move the opposite little handle with certain types
1060510585
if (type === 'mirrored' || type === 'asymmetric') {
1060610586
sibHandle.angle = handle.angle - 180;
1060710587
if (type === 'mirrored') {
1060810588
sibHandle.radius = handle.radius;
1060910589
}
1061010590
}
10591+
10592+
// save new point and handles
10593+
_newPoints4[_index4] = _point2;
10594+
_point2[handleName] = handle;
10595+
_point2[sibHandleName] = sibHandle;
1061110596
}
1061210597

1061310598
return (0, _extends3.default)({}, state, { points: _newPoints4 }, (0, _calculatePath2.default)(_newPoints4));
1061410599
}
1061510600

1061610601
case 'POINT_DESELECT_ALL':
1061710602
{
10618-
return (0, _extends3.default)({}, deselectAll(state));
10603+
return (0, _extends3.default)({}, (0, _deselectAll2.default)(state));
1061910604
}
1062010605

1062110606
// HANDLES
@@ -11159,6 +11144,53 @@ return /******/ (function(modules) { // webpackBootstrap
1115911144

1116011145
/***/ },
1116111146
/* 195 */
11147+
/***/ function(module, exports, __webpack_require__) {
11148+
11149+
"use strict";
11150+
11151+
Object.defineProperty(exports, "__esModule", {
11152+
value: true
11153+
});
11154+
11155+
var _extends2 = __webpack_require__(5);
11156+
11157+
var _extends3 = _interopRequireDefault(_extends2);
11158+
11159+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11160+
11161+
exports.default = function (state) {
11162+
var newState = (0, _extends3.default)({}, state, { points: [] }),
11163+
points = state.points;
11164+
11165+
for (var i = 0; i < points.length; i++) {
11166+
newState.points.push((0, _extends3.default)({}, points[i], { isSelected: false }));
11167+
}
11168+
11169+
return newState;
11170+
};
11171+
11172+
/***/ },
11173+
/* 196 */
11174+
/***/ function(module, exports) {
11175+
11176+
"use strict";
11177+
11178+
Object.defineProperty(exports, "__esModule", {
11179+
value: true
11180+
});
11181+
11182+
exports.default = function (points) {
11183+
var indecies = [];
11184+
11185+
for (var i = 0; i < points.length; i++) {
11186+
points[i].isSelected && indecies.push(i);
11187+
}
11188+
11189+
return indecies;
11190+
};
11191+
11192+
/***/ },
11193+
/* 197 */
1116211194
/***/ function(module, exports, __webpack_require__) {
1116311195

1116411196
'use strict';
@@ -11175,7 +11207,7 @@ return /******/ (function(modules) { // webpackBootstrap
1117511207

1117611208
var _calculatePath2 = _interopRequireDefault(_calculatePath);
1117711209

11178-
var _pool = __webpack_require__(196);
11210+
var _pool = __webpack_require__(198);
1117911211

1118011212
var _pool2 = _interopRequireDefault(_pool);
1118111213

@@ -11200,7 +11232,7 @@ return /******/ (function(modules) { // webpackBootstrap
1120011232
exports.default = controls;
1120111233

1120211234
/***/ },
11203-
/* 196 */
11235+
/* 198 */
1120411236
/***/ function(module, exports) {
1120511237

1120611238
"use strict";
@@ -11211,7 +11243,7 @@ return /******/ (function(modules) { // webpackBootstrap
1121111243
exports.default = [];
1121211244

1121311245
/***/ },
11214-
/* 197 */
11246+
/* 199 */
1121511247
/***/ function(module, exports, __webpack_require__) {
1121611248

1121711249
'use strict';
@@ -11260,7 +11292,7 @@ return /******/ (function(modules) { // webpackBootstrap
1126011292
exports.default = pointControls;
1126111293

1126211294
/***/ },
11263-
/* 198 */
11295+
/* 200 */
1126411296
/***/ function(module, exports, __webpack_require__) {
1126511297

1126611298
'use strict';
@@ -11342,7 +11374,7 @@ return /******/ (function(modules) { // webpackBootstrap
1134211374
exports.default = progresses;
1134311375

1134411376
/***/ },
11345-
/* 199 */
11377+
/* 201 */
1134611378
/***/ function(module, exports) {
1134711379

1134811380
'use strict';
@@ -11370,7 +11402,7 @@ return /******/ (function(modules) { // webpackBootstrap
1137011402
// /redux-recycle
1137111403

1137211404
/***/ },
11373-
/* 200 */
11405+
/* 202 */
1137411406
/***/ function(module, exports) {
1137511407

1137611408
"use strict";
@@ -11400,7 +11432,7 @@ return /******/ (function(modules) { // webpackBootstrap
1140011432
};
1140111433

1140211434
/***/ },
11403-
/* 201 */
11435+
/* 203 */
1140411436
/***/ function(module, exports) {
1140511437

1140611438
"use strict";
@@ -11421,7 +11453,7 @@ return /******/ (function(modules) { // webpackBootstrap
1142111453
};
1142211454

1142311455
/***/ },
11424-
/* 202 */
11456+
/* 204 */
1142511457
/***/ function(module, exports) {
1142611458

1142711459
"use strict";

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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/index.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
background: #FFF5E4;
1515
/*background: $c-purple;*/
1616
}
17-
17+
1818
.el {
1919
position: absolute;
2020
left: 10%;
@@ -45,13 +45,13 @@
4545

4646

4747
var duration = 500,
48-
shift = 75;
48+
shift = 150;
4949

5050
var html = new mojs.Html({
5151
el: '#js-el',
52-
y: { [-shift]: shift, easing: 'cubic.in', duration },
53-
rotateZ: { 0: 90, easing: 'linear.none', duration }
54-
// transformOrigin: '50% 100%',
52+
y: { [-shift]: 0, easing: 'cubic.in', duration },
53+
rotateZ: { 0: 90, easing: 'linear.none', duration },
54+
transformOrigin: '50% 50%'
5555
})
5656
.then({
5757
scaleX: {
@@ -64,7 +64,7 @@
6464
curve: curveEditor.getEasing({ transform: (k) => { return 1 + ( 1-k )/1.5; } }),
6565
duration: duration
6666
},
67-
// transformOrigin: { '50% 50%': '50% 50%', curve: curveEditor2.getEasing() },
67+
transformOrigin: { '50% 50%': '50% 50%', curve: curveEditor2.getEasing(), duration },
6868
y: { to: -shift, easing: 'cubic.out', delay: .75*duration, duration },
6969
rotateZ: { 0: 90, delay: .75*duration, easing: 'linear.none', duration }
7070
})

‎app/js/app.babel.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class API {
4848
}
4949

5050
_vars () {
51-
this.revision = '1.0.0';
51+
this.revision = '1.0.1';
5252
this.store = initStore();
5353

5454
this._easings = [];

‎app/js/helpers/deselect-all.babel.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
export default (state) => {
2+
const newState = { ...state, points: [] },
3+
points = state.points;
4+
5+
for (var i = 0; i < points.length; i++) {
6+
newState.points.push({ ...points[i], isSelected: false });
7+
}
8+
9+
return newState;
10+
}

‎app/js/helpers/find-selected-indecies.babel.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
export default (points) => {
2+
const indecies = [];
3+
4+
for (var i = 0; i < points.length; i++) {
5+
points[i].isSelected && indecies.push( i );
6+
}
7+
8+
return indecies;
9+
}

‎app/js/pool.babel.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1+
// class Pool {
2+
// constructor () {
3+
// this._states = []
4+
// }
5+
// }
6+
7+
18
export default [];

0 commit comments

Comments
 (0)