diff --git a/ui (gen4)/features/app.js b/ui (gen4)/features/app.js index 0e5898be..97bfb95d 100755 --- a/ui (gen4)/features/app.js +++ b/ui (gen4)/features/app.js @@ -362,7 +362,9 @@ var BrowserHostActions = actions.Actions({ set title(value){ $('title').text(value) }, - // XXX add handler to toggle app button view -- or use the propper feature... + // XXX this makes document.body fullscreen as expanding .dom breaks + // aligning -- this might be a sign that we are not placing + // some things relative to .dom... toggleFullScreen: ['Window/Full screen mode', toggler.CSSClassToggler( function(){ return document.body }, @@ -371,7 +373,7 @@ var BrowserHostActions = actions.Actions({ var that = this // get current state... - var state = document.fullscreen ? 'on' : 'off' + var state = document.fullscreenElement ? 'on' : 'off' // change the state only if the target state is not the same // as the current state... @@ -385,6 +387,7 @@ var BrowserHostActions = actions.Actions({ document.exitFullscreen() // XXX id document.body the right scope here??? // ...this.dom[0] seems to break alignment... + //: this.dom[0].requestFullscreen() : document.body.requestFullscreen() setTimeout(function(){ diff --git a/ui (gen4)/features/virtual-blocks.js b/ui (gen4)/features/virtual-blocks.js index e23c4ac1..ac1a4357 100644 --- a/ui (gen4)/features/virtual-blocks.js +++ b/ui (gen4)/features/virtual-blocks.js @@ -36,7 +36,7 @@ var VirtualBlocksActions = actions.Actions({ var that = this return this.data.order .filter(function(gid){ - img = that.images[gid] || {} + var img = that.images[gid] || {} return img.type == 'virtual' }) }, // construction of new "virtual images"... diff --git a/ui (gen4)/package-lock.json b/ui (gen4)/package-lock.json index b7d49438..6a0e3daa 100755 --- a/ui (gen4)/package-lock.json +++ b/ui (gen4)/package-lock.json @@ -956,9 +956,9 @@ } }, "ig-object": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/ig-object/-/ig-object-2.5.0.tgz", - "integrity": "sha512-6A/6dFOusbannm/23cx848Yk1PQpEmcorJ5L+0H1urkMBtL+a3VXyS2q0C6SVAxyeJCoPeMg7KACNnrPPJMP7g==" + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/ig-object/-/ig-object-2.7.2.tgz", + "integrity": "sha512-oDkhxH2mnrC148nNeLuYbgT1c6XNuJbVWm7j6WStIUZPpOQWR7/XnE4uodKmwjP47GbBKWuWtPhjA+F9pUubaA==" }, "image-size": { "version": "0.5.5", @@ -1265,9 +1265,9 @@ "integrity": "sha1-jrbgqZ+HrTT/8YJzMRBJadjFBP4=" }, "moment": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + "version": "2.25.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.1.tgz", + "integrity": "sha512-nRKMf9wDS4Fkyd0C9LXh2FFXinD+iwbJ5p/lh3CHitW9kZbRbJ8hCruiadiIXZVbeAqKZzqcTvHnK3mRhFjb6w==" }, "ms": { "version": "2.1.2", diff --git a/ui (gen4)/package.json b/ui (gen4)/package.json index 7d1fe487..e67f52fe 100755 --- a/ui (gen4)/package.json +++ b/ui (gen4)/package.json @@ -29,8 +29,8 @@ "guarantee-events": "^1.0.0", "ig-actions": "^3.24.10", "ig-features": "^3.4.2", - "ig-object": "^2.5.0", - "moment": "^2.24.0", + "ig-object": "^2.7.2", + "moment": "^2.25.1", "requirejs": "^2.3.6", "requirejs-plugins": "^1.0.2", "sharp": "^0.22.1",