goblin-desktop 4.0.8 → 4.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goblin-desktop",
-  "version": "4.0.8",
+  "version": "4.0.12",
   "description": "Goblin Desktop",
   "main": "./builders/builders.js",
   "scripts": {

package/password-wizard.js

@@ -1,13 +1,24 @@
 'use strict';
 
-/**
- * Retrieve the list of available commands.
- *
- * @returns {Object} The list and definitions of commands.
- */
-exports.xcraftCommands = function () {
-  return require(`./widgets/${require('path').basename(
-    __filename,
-    '.js'
-  )}/service.js`);
-};
+try {
+  require('goblin-workshop');
+
+  /**
+   * Retrieve the list of available commands.
+   *
+   * @returns {Object} The list and definitions of commands.
+   */
+  exports.xcraftCommands = function () {
+    return require(`./widgets/${require('path').basename(
+      __filename,
+      '.js'
+    )}/service.js`);
+  };
+} catch (ex) {
+  if (ex.code !== 'MODULE_NOT_FOUND') {
+    throw ex;
+  }
+  console.log(
+    `Skip ${__filename} initialization, goblin-workshop not available`
+  );
+}

package/quest-run-wizard.js

@@ -1,13 +1,24 @@
 'use strict';
 
-/**
- * Retrieve the list of available commands.
- *
- * @returns {Object} The list and definitions of commands.
- */
-exports.xcraftCommands = function () {
-  return require(`./widgets/${require('path').basename(
-    __filename,
-    '.js'
-  )}/service.js`);
-};
+try {
+  require('goblin-workshop');
+
+  /**
+   * Retrieve the list of available commands.
+   *
+   * @returns {Object} The list and definitions of commands.
+   */
+  exports.xcraftCommands = function () {
+    return require(`./widgets/${require('path').basename(
+      __filename,
+      '.js'
+    )}/service.js`);
+  };
+} catch (ex) {
+  if (ex.code !== 'MODULE_NOT_FOUND') {
+    throw ex;
+  }
+  console.log(
+    `Skip ${__filename} initialization, goblin-workshop not available`
+  );
+}

package/widgets/desktop/logic-handlers.js

@@ -66,6 +66,8 @@ module.exports = {
       total: action.get('total'),
       externalUrl: action.get('externalUrl'),
       isDownload: action.get('isDownload'),
+      temporary: action.get('temporary'),
+      duration: action.get('duration'),
     };
     return state.set(`notifications.${notificationId}`, notification);
   },

package/widgets/desktop/service.js

@@ -538,7 +538,9 @@ Goblin.registerQuest(goblinName, 'add-notification', function (
   command,
   externalUrl,
   isDownload,
-  broadcast
+  broadcast,
+  temporary,
+  duration
 ) {
   if (!notificationId) {
     notificationId = quest.uuidV4();
@@ -557,6 +559,8 @@ Goblin.registerQuest(goblinName, 'add-notification', function (
         command,
         externalUrl,
         isDownload,
+        temporary,
+        duration,
       }
     );
     return;
@@ -570,6 +574,8 @@ Goblin.registerQuest(goblinName, 'add-notification', function (
     command,
     externalUrl,
     isDownload,
+    temporary,
+    duration,
   });
   const dnd = quest.goblin.getState().get('dnd');
   if (!dnd) {

package/widgets/desktop-scale/widget.js

@@ -127,13 +127,13 @@ class DesktopScale extends Widget {
     );
   }
 
-  renderButton() {
+  renderButton({onClick}) {
     return (
       <Button
         glyph="solid/binoculars"
         kind="main-tab-right"
         tooltip={T('Choix du zoom')}
-        onClick={this.onToggleDialog}
+        onClick={onClick}
       />
     );
   }
@@ -142,10 +142,10 @@ class DesktopScale extends Widget {
     if (!window.zoomable) {
       return null;
     }
-
+    const renderButton = this.props.renderButton || this.renderButton;
     return (
       <div className={this.styles.classNames.desktopScale}>
-        {this.renderButton()}
+        {renderButton({onClick: this.onToggleDialog})}
         {this.renderDialog()}
       </div>
     );