From d27c003f835d9ba92fdb5a8ace081d0440ea7c69 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 3 May 2018 19:57:34 +0200 Subject: [PATCH] Node Dependencies updated --- .vs/AAWeb/v15/.suo | Bin 62976 -> 69120 bytes Ball.js => FloatingObject.js | 2 +- Project.njsproj | 2 +- Spaces/FloatingSpace.js | 36 +++++++++++++++++-- TimelineChart.js | 11 +++++- index.html | 2 +- node_modules/atob/README.md | 20 +++++++---- node_modules/atob/browser-atob.js | 56 +++++++++++++++++------------- node_modules/atob/node-atob.js | 2 +- node_modules/atob/package.json | 30 ++++++++-------- node_modules/atob/test.js | 8 ++--- package-lock.json | 6 ++-- package.json | 2 +- server.js | 2 +- 14 files changed, 115 insertions(+), 64 deletions(-) rename Ball.js => FloatingObject.js (99%) diff --git a/.vs/AAWeb/v15/.suo b/.vs/AAWeb/v15/.suo index d69fdfb982989eb1a4377ccb2be2e6d9659a0f8c..77d9f4853f19ba8a69601e7c6125f15b723054a5 100644 GIT binary patch delta 4949 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 OA^(qPmv;TLnEN+ls?}}) delta 4271 zcmd^>dr(x@9mnsvEV!!+EU=K}A+CV964b>iH3$N7m&JG~1_ zf6?iK%?5{9s|r{^E_c21Gp4 z?}he5%!)*91f#%Iz!y$IJq!$Xw1=XW9CjFL12BP5@C@K1Yg()+(O|w7y~2cfi{mE_rkNN`6lC04~*Od zw4=d9$9Mqh7%&OMgE%l5WP=2dh5*ElhQT*;mUKru19jFTW3gyE!;lM`vRor;a`o;D z9rG6Rn%;5^q%ikXt5z+mg6}h{E>*>^MP50h;Qi&gS6Cl?s;gpOQKc6-rX*?X$@kbi zKg^RWy~>$t3&!MI-s72U%m`%~#=XHMhkZ>{F+G##BK1y>+-{5zWuu{oS@lVDM2wOv z^wrE3ki_@|xgxMytT&1@HQP_t1%JqFx!aj8-g@BuC2WWK*Ka=@aehhZJ}NZo>G-VY zYz2Q|DjqWa4J|TDr~zVh-6;trl5dPKBII@JMs`vxI zM>O1nu+e%rHbuo1Mu`cLZaZO2(9&vinuhV$M9l~I-FnSg%GNwV?VsCNZOxgjyBuBJ zwo$eA!o2i9mwq&A`X7kp_{)|Y3$so!%EobUK)9ryk41y}7lwDLxsdqw_MJvn*GG$1 z@0(8V>X}uWui_`90&RxA850}8KClPu1=OmI)E$Cx5b&8Nc;}beNa-YuQ{Xgc2OXdj zoB?OSyWku+58easgA3py=mOUOmAMH^D!^hu|Y{3;Yw@2LA$g zz{lVda2ND~Pr*I#8MqHV2VZ~(;7jlj@LM>6DZ9iD70IX%?UxVjJLyaF<8<k?RQy-qF_qw`eTsbS zD#_Fcewg;POro;X{B3sOYcWO3!!80|>X(Z3St7MH;{3}Sm`PXyVGP4m2~Ybx)XjKV zYS70&!VCXlL7}L%25U?zKMPgFbgHw^r#uDt0NYKKlQ!DIB&Oo8h<(n8OjpM5##`DN z7?psR`iY`#juELk!^BihvAZ6}$S;Y#kWO(4v9@VPnTkK9e6cIPM=pKtpRU}>jd$~l zR|Iq@sgKOA&l6bzwZ$gW&AS0|VexNWZS|X6*eTk)U@0YZ&ZUyK=enB(GnU$mSw2!4 z$LfDBQchWr98`AQ#cFFEJOSSK!2~yf5)MaOWeY2&w&*PSq)$&b$^)s)sG-GYLwpe+ z29&ZmVH1;L%rRy;A+?ps4aaASR8>8m(%#T&yf6cv6eMEJwRG>se%|Xk4?WMyEww9| zXHrc5tn!j&<@p(kb11VpgkGu*Q0H~a$Lh`9DG?bD;;;hzhc^DL5D^49*{r~&xwh5O(X|EkFkdsN+yrS8B_4i}f)7Sfvn54tJ)FRvO5xU{ z3FL9mUk|4&llmG_cA`(VBGSen<;{<+?* z8(_QAnOBM(2RcW$&v@Gt=l3@moxLJaPq&)V7kT53_#?cdgyqq;j;XXc+Q8<}wmnJY zu``HNJ0$tk&J0FJnmNppZdc%)dnWINbnXd(5vt-KLy@KlY*gvo( z%@4n5aX8H~WqV_jmgY2uQ{CM~vZc|&YCO zjHTG!e*ck7J?L!LB3jv{cj&37+epD(eyqsxWi8cR@}u!x62)B7vt{%XI9b~rqJ+6~ zmx;L8=U@I>tC0}G9GbqEizJ?+x>A%JY`?5UJ{BV^7VI&6e>O#42_K+u&y@j9bwk+e zOv7D29ypUwOBkcNs|Bo_5}SOO3%zysCE3!u)#dx83f#z#I - + Code diff --git a/Spaces/FloatingSpace.js b/Spaces/FloatingSpace.js index 68170c126..2801cf899 100644 --- a/Spaces/FloatingSpace.js +++ b/Spaces/FloatingSpace.js @@ -9,13 +9,16 @@ function newFloatingSpace() { balls: undefined, // This is the array of balls being displayed createNewBall: createNewBall, destroyBall: destroyBall, + createBubbleSet: createBubbleSet, + destroyBubbleSet: destroyBubbleSet, physicsLoop: physicsLoop, isInside: isInside, isInsideBall: isInsideBall, initialize: initialize }; - let createdBalls = []; + let createdBalls = []; + let bubbleSets = []; return thisObject; @@ -28,9 +31,9 @@ function newFloatingSpace() { function createNewBall(pInput, pContainer) { - /* This function is used to create new balls, representing labels of each point on the chart. */ + /* This function is used to create new balls */ - var ball = newBall(); + var ball = newFloatingObject(); ball.input = pInput; @@ -75,6 +78,33 @@ function newFloatingSpace() { } } + + function createBubbleSet(pPlotterBubbles) { + + let bubbleSet = { + floatingBubbles: [], + plotterBubbles: pPlotterBubbles, + handle: Math.floor((Math.random() * 10000000) + 1) + }; + + bubbleSets.push(bubbleSet); + + return bubbleSet.handle; + } + + function destroyBubbleSet(pHandle) { + + for (let i = 0; i < bubbleSets.length; i++) { + + let bubbleSet = bubbleSets[i]; + + if (bubbleSet.handle === pHandle) { + bubbleSets.splice(i, 1); // Delete item from array. + return; + } + } + } + /******************************************/ /* */ /* Physics Engine Follows */ diff --git a/TimelineChart.js b/TimelineChart.js index fd7c27c4c..f366b4afc 100644 --- a/TimelineChart.js +++ b/TimelineChart.js @@ -268,7 +268,8 @@ productCard: pProductCard, plotter: plotter, storage: storage, - profile: undefined + profile: undefined, + bubbles: undefined }; /* Let the Plotter listen to the event of Cursor Files loaded, so that it can reack recalculating if needed. */ @@ -318,6 +319,10 @@ } + /* Create the Text Bubbles */ + + productPlotter.bubbleSet = canvas.floatingSpace.createBubbleSet(productPlotter.plotter.bubbles); + /* Add the new Active Protter to the Array */ productPlotters.push(productPlotter); @@ -368,6 +373,10 @@ } + /* Destroyd the Bubble Set */ + + canvas.floatingSpace.destroyBubbleSet(productPlotters[i].bubbleSet); + /* Finally the panels. */ for (let j = 0; j < productPlotters[i].panels.length; j++) { diff --git a/index.html b/index.html index 1fee9aea2..6c02b864e 100644 --- a/index.html +++ b/index.html @@ -27,7 +27,7 @@ - + diff --git a/node_modules/atob/README.md b/node_modules/atob/README.md index b8cffda6a..e15ef86b0 100644 --- a/node_modules/atob/README.md +++ b/node_modules/atob/README.md @@ -1,6 +1,11 @@ atob === +| **atob** +| [btoa](https://git.coolaj86.com/coolaj86/btoa.js) +| [unibabel.js](https://git.coolaj86.com/coolaj86/unibabel.js) +| Sponsored by [ppl](https://ppl.family) + Uses `Buffer` to emulate the exact functionality of the browser's atob. Note: Unicode may be handled incorrectly (like the browser). @@ -12,32 +17,33 @@ It turns base64-encoded ascii data back **to** b= 0.4.0" + "node": ">= 4.5.0" }, - "homepage": "https://github.com/coolaj86/node-browser-compat", + "homepage": "https://git.coolaj86.com/coolaj86/atob.js.git", "keywords": [ "atob", "browser" @@ -48,7 +48,7 @@ "name": "atob", "repository": { "type": "git", - "url": "git://github.com/coolaj86/node-browser-compat/atob.git" + "url": "git://git.coolaj86.com/coolaj86/atob.js.git" }, - "version": "2.0.3" + "version": "2.1.1" } diff --git a/node_modules/atob/test.js b/node_modules/atob/test.js index e499dd574..bd80a4ea1 100644 --- a/node_modules/atob/test.js +++ b/node_modules/atob/test.js @@ -1,15 +1,13 @@ -/*jshint strict:true node:true es5:true onevar:true laxcomma:true laxbreak:true eqeqeq:true immed:true latedef:true*/ (function () { "use strict"; - var atob = require('.') - , encoded = "SGVsbG8gV29ybGQ=" - , unencoded = "Hello World" + var atob = require('.'); + var encoded = "SGVsbG8sIFdvcmxkIQ==" + var unencoded = "Hello, World!"; /* , encoded = "SGVsbG8sIBZM" , unencoded = "Hello, 世界" */ - ; if (unencoded !== atob(encoded)) { console.log('[FAIL]', unencoded, atob(encoded)); diff --git a/package-lock.json b/package-lock.json index 58212bc32..f30739d79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,9 +18,9 @@ } }, "atob": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz", - "integrity": "sha1-GcenYEc3dEaPILLS0DNyrX1Mv10=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz", + "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=" }, "before-after-hook": { "version": "1.1.0", diff --git a/package.json b/package.json index 3d86cfd48..8b9cd455a 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@octokit/rest": "^14.0.9", - "atob": "^2.0.3", + "atob": "^2.1.1", "octokit": "^0.10.4" } } diff --git a/server.js b/server.js index 1cf8bb361..330817bd6 100644 --- a/server.js +++ b/server.js @@ -6,7 +6,7 @@ if (CONSOLE_LOG === true) { } -const DEBUG_MODE = false; // This forces the server to read Plotters from the local drive. +const DEBUG_MODE = true; // This forces the server to read Plotters from the local drive. if (CONSOLE_LOG === true && DEBUG_MODE === true) {