Skip to content

Commit

Permalink
committing uncommitted code
Browse files Browse the repository at this point in the history
  • Loading branch information
setpixel committed May 16, 2017
1 parent 8507d47 commit 7365b04
Show file tree
Hide file tree
Showing 13 changed files with 2,136 additions and 46 deletions.
Binary file added assets/fonts/proximanova/ProximaNova-Bold.ttf
Binary file not shown.
Binary file added assets/fonts/proximanova/ProximaNova-Light.ttf
Binary file not shown.
Binary file added assets/fonts/proximanova/ProximaNova-Reg.ttf
Binary file not shown.
Binary file added assets/fonts/proximanova/ProximaNova-Sbold.ttf
Binary file not shown.
Binary file added assets/fonts/proximanova/ProximaNova-Thin.ttf
Binary file not shown.
16 changes: 7 additions & 9 deletions assets/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@
Do beats have a type? Character or Plot?
*/

import "./testPDF";
import "./speech";
import "./contextmenu";
import "./awesomplete";
Expand Down Expand Up @@ -211,14 +210,14 @@ import "./outlinerprint";
attachEventListenersToNode(outlineNodes.get(i).id)
}

reflowScreen();
setTimeout(reflowScreen, 200);
setTimeout(reflowScreen, 600);
// reflowScreen();
// setTimeout(reflowScreen, 200);
// setTimeout(reflowScreen, 600);

selectedItem = 1;
selectItem();

changeScale(1);
//changeScale(1);

attachEventListenersToInspector();
};
Expand All @@ -240,14 +239,13 @@ import "./outlinerprint";
var attachEventListenersToNode = function(nodeID) {
setTimeout(function() {

reflowScreen();

setTimeout(reflowScreen, 100);
// reflowScreen();
// setTimeout(reflowScreen, 100);


$("#" + nodeID + " img").load(function(){
console.log("image loaded!!!");
reflowScreen();
//reflowScreen();
});

$("#" + nodeID + " .title").on("input", function(event) {
Expand Down
Loading

0 comments on commit 7365b04

Please sign in to comment.