@xviewer.js/debug 1.0.0-alpha.21 → 1.0.0-alpha.23

package/dist/main.js

@@ -931,67 +931,34 @@ class ColorController extends Controller {
     }
 }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-    try {
-        var info = gen[key](arg);
-        var value = info.value;
-    } catch (error) {
-        reject(error);
-        return;
-    }
-    if (info.done) resolve(value);
-    else Promise.resolve(value).then(_next, _throw);
-}
-function _async_to_generator(fn) {
-    return function() {
-        var self = this, args = arguments;
-
-        return new Promise(function(resolve, reject) {
-            var gen = fn.apply(self, args);
-
-            function _next(value) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-            }
-
-            function _throw(err) {
-                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-            }
-
-            _next(undefined);
-        });
-    };
-}
-
 class ImageController extends Controller {
-    static toDataURL(img) {
-        return _async_to_generator(function*() {
-            if (img instanceof HTMLImageElement) {
-                return img.src;
-            } else {
-                if (img) {
-                    let url = ImageController._imageMap.get(img);
-                    if (url) return url;
-                    const w = Math.min(img.width, 256);
-                    const h = Math.min(img.height, 256);
-                    if (ImageController._context == null) {
-                        ImageController._context = document.createElement('canvas').getContext("2d");
-                    }
-                    ImageController._context.canvas.width = w;
-                    ImageController._context.canvas.height = h;
-                    if (img.data) {
-                        let imageData = ImageController._context.createImageData(img.width, img.height);
-                        imageData.data.set(img.data);
-                        img = yield createImageBitmap(imageData);
-                    }
-                    if (img instanceof ImageBitmap) {
-                        ImageController._context.drawImage(img, 0, 0, img.width, img.height, 0, 0, w, h);
-                        ImageController._imageMap.set(img, url = ImageController._context.canvas.toDataURL());
-                        return url;
-                    }
+    static async toDataURL(img) {
+        if (img instanceof HTMLImageElement) {
+            return img.src;
+        } else {
+            if (img) {
+                let url = ImageController._imageMap.get(img);
+                if (url) return url;
+                const w = Math.min(img.width, 256);
+                const h = Math.min(img.height, 256);
+                if (ImageController._context == null) {
+                    ImageController._context = document.createElement('canvas').getContext("2d");
+                }
+                ImageController._context.canvas.width = w;
+                ImageController._context.canvas.height = h;
+                if (img.data) {
+                    let imageData = ImageController._context.createImageData(img.width, img.height);
+                    imageData.data.set(img.data);
+                    img = await createImageBitmap(imageData);
+                }
+                if (img instanceof ImageBitmap) {
+                    ImageController._context.drawImage(img, 0, 0, img.width, img.height, 0, 0, w, h);
+                    ImageController._imageMap.set(img, url = ImageController._context.canvas.toDataURL());
+                    return url;
                 }
-                return "";
             }
-        })();
+            return "";
+        }
     }
     updateDisplay() {
         ImageController.toDataURL(this.getValue()).then((url)=>this.$img.src = url);
@@ -2324,7 +2291,10 @@ class InspectorPlugin extends core.Plugin {
     }
     _updateFolders() {
         const statesMap = this._statesMap;
-        const setState = (v)=>statesMap.set(v, statesMap.has(v) ? 0 : 1);
+        const setState = (v)=>{
+            if (statesMap.get(v) === -1) statesMap.set(v, 0);
+            if (statesMap.get(v) === undefined) statesMap.set(v, 1);
+        };
         statesMap.forEach((_, k, map)=>map.set(k, -1));
         this.viewer.traversePlugins(setState);
         this.viewer.traverseComponents(setState);