Skip to content

Commit

Permalink
Removed mo.js deps, and moved explore code to playground. Fixed scss …
Browse files Browse the repository at this point in the history
…package reference
  • Loading branch information
lifeinchords committed Feb 28, 2019
1 parent a89763c commit 41fac9d
Show file tree
Hide file tree
Showing 19 changed files with 6,700 additions and 382 deletions.
Binary file added dump/admin/system.version.bson
Binary file not shown.
1 change: 1 addition & 0 deletions dump/admin/system.version.metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_","ns":"admin.system.version"}],"uuid":"5bc4bf7e16d84870825d17b3313b5ce9"}
2 changes: 1 addition & 1 deletion meteor-app/.meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ parallels-animation
angelcabo:meteor-gsap
parallels-canvas-manager
practicalmeteor:loglevel
fourseven:scss
momentjs:moment
raix:ui-dropped-event
cwaring:modernizr
Expand All @@ -55,3 +54,4 @@ meteor-tool
angelcabo:infinite-undo
dynamic-import
underscore
fourseven:scss
2 changes: 1 addition & 1 deletion meteor-app/.meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ email@1.2.3
es5-shim@4.8.0
fetch@0.1.0
fortawesome:fontawesome@4.7.0
fourseven:scss@3.13.0
fourseven:scss@4.10.0
geojson-utils@1.0.10
hot-code-push@1.0.4
html-tools@1.0.11
Expand Down
9 changes: 1 addition & 8 deletions meteor-app/client/components/bits/base/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,7 @@ Template.bit.events({
direction: "forward"
}

// skip a beat, then display the delete animation
// not just stylistic, added benefit of not overlapping with Greensock fade to decrease CPU use

Meteor.setTimeout(function(){
Parallels.Animation.General.poof(options);
},
325
);

}

});
17 changes: 0 additions & 17 deletions meteor-app/client/components/bits/base/rendered.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,23 +100,6 @@ Template.bit.onRendered(function (){

var $bit = Utilities.getSetBitElement(bit._id);

// Is this bit autorun a result of a bit redo after a delete?
// if so, play the poof animation backwards.
// TODO: janky, need a better way of pinpointing this scenario
// TODO: also, overlapping animations are cut off on redo.
var bitRect = $bit[0].getClientRects()[0];
if (bitRect){
// Use bit center point as spark point for animation
var coords = Utilities.getElementCenter(bitRect);
var options = {
seedPoint: coords,
direction: "backward",
speed: 1.5
}

Parallels.Animation.General.poof(options);
}

// move the bit to it's new position on all other sessions/clients
timeline.to($bitElement, 0, { x: bit.position.x, y: bit.position.y });

Expand Down
2 changes: 0 additions & 2 deletions meteor-app/client/components/maps/rendered.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Template.map.onRendered(function () {

wireMojsExplore1();

var template = this;
var mapElement = template.find('.map');
mapElement.style.minHeight = Session.get("mapHeight") + "px";
Expand Down
9 changes: 0 additions & 9 deletions meteor-app/client/layout/layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,3 @@ hr{
overflow: hidden;
}

[data-name="mojs-shape"] {
pointer-events: none;
}

// for debugging
#js-mojs-player {
z-index: 100000
};

80 changes: 0 additions & 80 deletions meteor-app/client/playground/mojs--1/mojs--1.js

This file was deleted.

13 changes: 0 additions & 13 deletions meteor-app/client/playground/mojs--1/mojs--1.scss

This file was deleted.

Empty file added meteor-app/output.json
Empty file.
Loading

0 comments on commit 41fac9d

Please sign in to comment.