diff --git a/ui (gen4)/features/core.js b/ui (gen4)/features/core.js index 9efbdd22..07cbfd8f 100755 --- a/ui (gen4)/features/core.js +++ b/ui (gen4)/features/core.js @@ -146,7 +146,7 @@ ImageGridMetaActions.__proto__ = actions.MetaActions var ImageGrid = module.ImageGrid = - object.makeConstructor('ImageGrid', ImageGridMetaActions) + object.Constructor('ImageGrid', ImageGridMetaActions) // Root ImageGrid feature set.... var ImageGridFeatures = diff --git a/ui (gen4)/features/location.js b/ui (gen4)/features/location.js index a6c9e3a1..70cc554a 100755 --- a/ui (gen4)/features/location.js +++ b/ui (gen4)/features/location.js @@ -41,7 +41,7 @@ var LocationProto = { }, } -var Location = object.makeConstructor('Location', LocationProto) +var Location = object.Constructor('Location', LocationProto) diff --git a/ui (gen4)/features/peer.js b/ui (gen4)/features/peer.js index 718de547..f6545301 100755 --- a/ui (gen4)/features/peer.js +++ b/ui (gen4)/features/peer.js @@ -120,7 +120,7 @@ var CooperativePromisePrototype = { var CooperativePromise = module.CooperativePromise = -object.makeConstructor('CooperativePromise', +object.Constructor('CooperativePromise', Promise, CooperativePromisePrototype) diff --git a/ui (gen4)/features/ui-blank-render.js b/ui (gen4)/features/ui-blank-render.js index f75398e3..87194cad 100755 --- a/ui (gen4)/features/ui-blank-render.js +++ b/ui (gen4)/features/ui-blank-render.js @@ -52,7 +52,7 @@ RibbonsPrototype.__proto__ = ribbons.BaseRibbons.prototype var Ribbons = module.Ribbons = -object.makeConstructor('Ribbons', +object.Constructor('Ribbons', RibbonsClassPrototype, RibbonsPrototype) diff --git a/ui (gen4)/features/ui-partial-ribbons-vdom.js b/ui (gen4)/features/ui-partial-ribbons-vdom.js index 957b467b..d36e1c30 100755 --- a/ui (gen4)/features/ui-partial-ribbons-vdom.js +++ b/ui (gen4)/features/ui-partial-ribbons-vdom.js @@ -477,7 +477,7 @@ var VirtualDOMRibbonsPrototype = { var VirtualDOMRibbons = module.VirtualDOMRibbons = -object.makeConstructor('VirtualDOMRibbons', +object.Constructor('VirtualDOMRibbons', VirtualDOMRibbonsClassPrototype, VirtualDOMRibbonsPrototype) diff --git a/ui (gen4)/features/ui-preact-render.js b/ui (gen4)/features/ui-preact-render.js index beac76e3..f593c0be 100755 --- a/ui (gen4)/features/ui-preact-render.js +++ b/ui (gen4)/features/ui-preact-render.js @@ -194,7 +194,7 @@ RibbonsPrototype.__proto__ = ribbons.BaseRibbons.prototype var Ribbons = module.Ribbons = -object.makeConstructor('Ribbons', +object.Constructor('Ribbons', RibbonsClassPrototype, RibbonsPrototype) diff --git a/ui (gen4)/features/ui-virtual-dom.js b/ui (gen4)/features/ui-virtual-dom.js index 9d2e8fac..2cec5f47 100755 --- a/ui (gen4)/features/ui-virtual-dom.js +++ b/ui (gen4)/features/ui-virtual-dom.js @@ -362,7 +362,7 @@ VirtualDOMRibbonsPrototype.__proto__ = ribbons.BaseRibbons.prototype var VirtualDOMRibbons = module.VirtualDOMRibbons = -object.makeConstructor('VirtualDOMRibbons', +object.Constructor('VirtualDOMRibbons', VirtualDOMRibbonsClassPrototype, VirtualDOMRibbonsPrototype) diff --git a/ui (gen4)/package-lock.json b/ui (gen4)/package-lock.json index 53ed283b..9f0627fc 100755 --- a/ui (gen4)/package-lock.json +++ b/ui (gen4)/package-lock.json @@ -330,9 +330,9 @@ } }, "electron": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/electron/-/electron-5.0.6.tgz", - "integrity": "sha512-0L53lv26eDhaaNxL6DqXGQrQOEAYbrQg40stRSb2pzrY06kwPbABzXEiaCvEsBuKUQ+9OQBbVyyvXRbLJlun/A==", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/electron/-/electron-5.0.7.tgz", + "integrity": "sha512-OMMz8DhatxLuBFbnW7KYcAUjflGYFn0IQEtKR0iZhMAm89FgNOd9SVbxXWAGNxvRR6C0gORXwhTh6BCqqqcR6Q==", "requires": { "@types/node": "^10.12.18", "electron-download": "^4.1.0", @@ -1162,26 +1162,26 @@ "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" }, "ig-actions": { - "version": "3.22.2", - "resolved": "https://registry.npmjs.org/ig-actions/-/ig-actions-3.22.2.tgz", - "integrity": "sha512-q0CPAS6SgkYMFIIVVwzbsgRsDSA7bD1kstWHC1SaWXI4szrvaAlVPV1QX9MtMmH4Ju+Ar1ilh1a3Ooe5wngYUg==", + "version": "3.23.0", + "resolved": "https://registry.npmjs.org/ig-actions/-/ig-actions-3.23.0.tgz", + "integrity": "sha512-afgaPVscDe8n1vurzFl2cpwBtulDTCUzP4LKLrr87dN+nZY7zAshxiPeljxfz2pzMcqJMPtDhbWICm2Gpc9VJQ==", "requires": { - "ig-object": "^1.0.7" + "ig-object": "^2.0.0" } }, "ig-features": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/ig-features/-/ig-features-3.3.4.tgz", - "integrity": "sha512-nJmMDfY6JiyQ2mQj31oMOmw/HOY4zbN6yyPEFu61ySXU/f3+CC/GZjdaYFemVbnZThC7hcxYfmj62eSjt7oT+Q==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/ig-features/-/ig-features-3.4.0.tgz", + "integrity": "sha512-AtIy2OS+o4BtMvyuoj0UGcvVRTPXKeIwKcilhwfINIdhF8v6Gfe0Izz9JT4cYq3U0WhO50IT6N0XK/ZY4+gvJw==", "requires": { - "ig-actions": "^3.2.5", - "ig-object": "^1.0.0" + "ig-actions": "^3.21.1", + "ig-object": "^2.0.0" } }, "ig-object": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/ig-object/-/ig-object-1.5.0.tgz", - "integrity": "sha512-LJKJh7GlrFqSmtwLJmK+EpBhwHUkud2uwLD6/0JJ68+qzxDhGMPjtUWqY6E7dAAFMMDEZ7l4Ez0Egy1ch1uKGg==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ig-object/-/ig-object-2.0.0.tgz", + "integrity": "sha512-vYt/WKiBhE5jH7R3RtEXLh8lvY+0aH+WUvW0eB2/KkOKPZgkLqE8XkwIDwdWkvHsSpEqNGybU1kVlSwd+omung==" }, "image-size": { "version": "0.5.5", @@ -2037,9 +2037,9 @@ } }, "spdx-license-ids": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz", - "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==" + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", + "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==" }, "speedometer": { "version": "0.1.4", diff --git a/ui (gen4)/package.json b/ui (gen4)/package.json index 58641c25..689cbc23 100755 --- a/ui (gen4)/package.json +++ b/ui (gen4)/package.json @@ -21,16 +21,16 @@ "app-module-path": "^1.0.6", "async-json": "0.0.2", "commander": "^2.20.0", - "electron": "^5.0.6", + "electron": "^5.0.7", "exiftool": "^0.0.3", "fs-extra": "^7.0.1", "fs-walk": "^0.0.1", "generic-walk": "^1.4.0", "glob": "^7.1.4", "guarantee-events": "^1.0.0", - "ig-actions": "^3.22.2", - "ig-features": "^3.3.4", - "ig-object": "^1.5.0", + "ig-actions": "^3.23.0", + "ig-features": "^3.4.0", + "ig-object": "^2.0.0", "moment": "^2.24.0", "openseadragon": "^2.4.1", "requirejs": "^2.3.6",