reduce code

frejs · Apr 21, 2020 · eb06229 · eb06229
1 parent 02c5b15
commit eb06229
Show file tree

Hide file tree

Showing 5 changed files with 790 additions and 577 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -10,7 +10,7 @@
 
 <body>
   <div id="root"></div>
-  <script src="./src/use-context.js"></script>
+  <script src="./src/concurrent.js"></script>
 </body>
 
 </html>
diff --git a/demo/src/concurrent.js b/demo/src/concurrent.js
@@ -199,7 +199,6 @@ ul.solarsystem li.asteroids_meteorids {
   top: 155px;
   left: 315px;
   z-index: 1;
-  background: url(http://neography.com/experiment/circles/solarsystem/asteroids_meteorids.png) no-repeat 0 0;
   width: 330px;
   height: 330px;
   border-radius: 165px;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fre",
-  "version": "1.13.4",
+  "version": "1.13.5",
   "description": "",
   "main": "dist/fre.js",
   "unpkg": "dist/fre.js",
@@ -22,11 +22,11 @@
   "license": "MIT",
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
-    "@babel/plugin-transform-react-jsx": "^7.3.0",
+    "@babel/plugin-transform-react-jsx": "^7.9.4",
     "@babel/plugin-transform-runtime": "^7.6.2",
-    "@babel/preset-env": "^7.6.3",
-    "@babel/preset-react": "^7.6.3",
-    "@babel/preset-typescript": "^7.6.0",
+    "@babel/preset-env": "^7.9.5",
+    "@babel/preset-react": "^7.9.4",
+    "@babel/preset-typescript": "^7.9.0",
     "@types/jest": "^24.0.15",
     "babel-jest": "^24.8.0",
     "codecov": "^3.6.1",

diff --git a/src/scheduler.js b/src/scheduler.js
@@ -27,12 +27,11 @@ function flush(iniTime) {
   let currentTask = peek(taskQueue)
 
   while (currentTask) {
-    if (currentTask.dueTime > currentTime && shouldYeild()) {
-      break
-    }
+    const didout = currentTask.dueTime <= currentTime
+    if (!didout && shouldYeild()) break
+
     let callback = currentTask.callback
     currentTask.callback = null
-    const didout = currentTask.dueTime <= currentTime
 
     let next = callback(didout)
     next ? (currentTask.callback = next) : pop(taskQueue)
@@ -66,4 +65,4 @@ export function shouldYeild() {
   return getTime() >= frameDeadline
 }
 
-export const getTime = () => performance.now()
+export const getTime = () => performance.now()