Skip to content

Commit 061e68a

Browse files
GermanBluefoxGermanBluefox
committed
Fix #476 
1 parent ff586bb commit 061e68a

10 files changed

+27
-24
lines changed

‎admin/asset-manifest.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
22
"files": {
33
"main.css": "/static/css/main.ec63fb86.chunk.css",
4-
"main.js": "/static/js/main.56b2d9ed.chunk.js",
5-
"main.js.map": "/static/js/main.56b2d9ed.chunk.js.map",
4+
"main.js": "/static/js/main.b40a2068.chunk.js",
5+
"main.js.map": "/static/js/main.b40a2068.chunk.js.map",
66
"runtime-main.js": "/static/js/runtime-main.503500fc.js",
77
"runtime-main.js.map": "/static/js/runtime-main.503500fc.js.map",
88
"static/css/2.35ed4a38.chunk.css": "/static/css/2.35ed4a38.chunk.css",
99
"static/js/2.4d2b686d.chunk.js": "/static/js/2.4d2b686d.chunk.js",
1010
"static/js/2.4d2b686d.chunk.js.map": "/static/js/2.4d2b686d.chunk.js.map",
1111
"index.html": "/index.html",
12-
"precache-manifest.6518ac530a8cca6892d870a8dfc7e1cd.js": "/precache-manifest.6518ac530a8cca6892d870a8dfc7e1cd.js",
12+
"precache-manifest.833a910b2f1e415bb41ec5f312bcae03.js": "/precache-manifest.833a910b2f1e415bb41ec5f312bcae03.js",
1313
"service-worker.js": "/service-worker.js",
1414
"static/css/2.35ed4a38.chunk.css.map": "/static/css/2.35ed4a38.chunk.css.map",
1515
"static/css/main.ec63fb86.chunk.css.map": "/static/css/main.ec63fb86.chunk.css.map",
1616
"static/js/2.4d2b686d.chunk.js.LICENSE.txt": "/static/js/2.4d2b686d.chunk.js.LICENSE.txt",
17-
"static/js/main.56b2d9ed.chunk.js.LICENSE.txt": "/static/js/main.56b2d9ed.chunk.js.LICENSE.txt",
17+
"static/js/main.b40a2068.chunk.js.LICENSE.txt": "/static/js/main.b40a2068.chunk.js.LICENSE.txt",
1818
"static/media/copy-content.svg": "/static/media/copy-content.6fe0b363.svg"
1919
},
2020
"entrypoints": [
2121
"static/js/runtime-main.503500fc.js",
2222
"static/css/2.35ed4a38.chunk.css",
2323
"static/js/2.4d2b686d.chunk.js",
2424
"static/css/main.ec63fb86.chunk.css",
25-
"static/js/main.56b2d9ed.chunk.js"
25+
"static/js/main.b40a2068.chunk.js"
2626
]
2727
}

‎admin/precache-manifest.6518ac530a8cca6892d870a8dfc7e1cd.js renamed to ‎admin/precache-manifest.833a910b2f1e415bb41ec5f312bcae03.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
self.__precacheManifest = (self.__precacheManifest || []).concat([
22
{
3-
"revision": "4dbdeb510159b3a596b7f2337ccacad5",
3+
"revision": "8f09aaec455be32268730493f0f298cf",
44
"url": "/index.html"
55
},
66
{
77
"revision": "e6abdff7c8114037aece",
88
"url": "/static/css/2.35ed4a38.chunk.css"
99
},
1010
{
11-
"revision": "76d7048e198ad5a31ac0",
11+
"revision": "97f11a5124c8ecfebca5",
1212
"url": "/static/css/main.ec63fb86.chunk.css"
1313
},
1414
{
@@ -20,12 +20,12 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
2020
"url": "/static/js/2.4d2b686d.chunk.js.LICENSE.txt"
2121
},
2222
{
23-
"revision": "76d7048e198ad5a31ac0",
24-
"url": "/static/js/main.56b2d9ed.chunk.js"
23+
"revision": "97f11a5124c8ecfebca5",
24+
"url": "/static/js/main.b40a2068.chunk.js"
2525
},
2626
{
2727
"revision": "578fa69920ac4a551e6d340a37256bed",
28-
"url": "/static/js/main.56b2d9ed.chunk.js.LICENSE.txt"
28+
"url": "/static/js/main.b40a2068.chunk.js.LICENSE.txt"
2929
},
3030
{
3131
"revision": "a0f011b34eb2f352d77b",

‎admin/service-worker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
1515

1616
importScripts(
17-
"/precache-manifest.6518ac530a8cca6892d870a8dfc7e1cd.js"
17+
"/precache-manifest.833a910b2f1e415bb41ec5f312bcae03.js"
1818
);
1919

2020
self.addEventListener('message', (event) => {

‎admin/static/js/main.56b2d9ed.chunk.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎admin/static/js/main.56b2d9ed.chunk.js renamed to ‎admin/static/js/main.b40a2068.chunk.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎admin/static/js/main.56b2d9ed.chunk.js.LICENSE.txt renamed to ‎admin/static/js/main.b40a2068.chunk.js.LICENSE.txt

File renamed without changes.

‎admin/static/js/main.b40a2068.chunk.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎admin/tab.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎lib/sandbox.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1902,7 +1902,7 @@ function sandBox(script, name, verbose, debug, context) {
19021902
native: native,
19031903
type: 'state'
19041904
}, function (err) {
1905-
if (err) adapter.log.warn('Cannot set object "' + name + '": ' + err);
1905+
err && adapter.log.warn('Cannot set object "' + name + '": ' + err);
19061906

19071907
if (initValue !== undefined) {
19081908
if (isObject(initValue) && initValue.ack !== undefined) {
@@ -1931,10 +1931,9 @@ function sandBox(script, name, verbose, debug, context) {
19311931
native: native,
19321932
type: 'state'
19331933
}, function (err) {
1934-
if (err) adapter.log.warn('Cannot set object "' + name + '": ' + err);
1934+
err && adapter.log.warn('Cannot set object "' + name + '": ' + err);
19351935

19361936
if (initValue !== undefined) {
1937-
adapter.setForeignState(name, initValue, callback);
19381937
if (isObject(initValue) && initValue.ack !== undefined) {
19391938
adapter.setForeignState(name, initValue, callback);
19401939
} else {
@@ -1950,7 +1949,7 @@ function sandBox(script, name, verbose, debug, context) {
19501949
native: native,
19511950
type: 'state'
19521951
}, function (err) {
1953-
if (err) adapter.log.warn('Cannot set object "' + name + '": ' + err);
1952+
err && adapter.log.warn('Cannot set object "' + name + '": ' + err);
19541953

19551954
if (initValue !== undefined) {
19561955
if (isObject(initValue) && initValue.ack !== undefined) {
@@ -1962,7 +1961,6 @@ function sandBox(script, name, verbose, debug, context) {
19621961
adapter.setState(name, null, true, callback);
19631962
}
19641963
});
1965-
19661964
}
19671965
} else {
19681966
if (!adapter.config.subscribe && !states[name] && !states[adapter.namespace + '.' + name]) {
@@ -2000,10 +1998,10 @@ function sandBox(script, name, verbose, debug, context) {
20001998

20011999
sandbox.verbose && sandbox.log('deleteState(id=' + id + ')', 'debug');
20022000
adapter.delObject(id, function (err) {
2003-
if (err) adapter.log.warn('Object for state "' + id + '" does not exist: ' + err);
2001+
err && adapter.log.warn('Object for state "' + id + '" does not exist: ' + err);
20042002

20052003
adapter.delState(id, function (err) {
2006-
if (err) adapter.log.error('Cannot delete state "' + id + '": ' + err);
2004+
err && adapter.log.error('Cannot delete state "' + id + '": ' + err);
20072005
if (typeof callback === 'function') {
20082006
if (typeof callback === 'function') {
20092007
try {

‎src/src/Components/BlocklyEditor.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ class BlocklyEditor extends React.Component {
444444

445445
window.addEventListener('resize', this.onResizeBind, false);
446446
toolboxText = toolboxText || this.getToolbox();
447-
toolboxXml = toolboxXml || this.Blockly.Xml.textToDom(toolboxText);
447+
toolboxXml = toolboxXml || this.Blockly.Xml.textToDom(toolboxText);
448448

449449
this.blocklyWorkspace = this.Blockly.inject(
450450
this.blockly,
@@ -459,6 +459,11 @@ class BlocklyEditor extends React.Component {
459459
minScale: 0.3,
460460
scaleSpeed: 1.2
461461
},
462+
move: {
463+
scrollbars: true,
464+
drag: true,
465+
wheel: true
466+
},
462467
trashcan: true,
463468
grid: {
464469
spacing: 25,

0 commit comments

Comments
 (0)