Merge branch 'master' into new-build

2020-08-21 12:42:36 +02:00
parent 2e2e86641d c76aad8b6e
commit 082e8bf6f2
9 changed files with 7004 additions and 57513 deletions
--- a/src/editor/svgedit.js
+++ b/src/editor/svgedit.js
@@ -6008,7 +6008,6 @@ editor.init = function () {
      $.process_cancel(uiStrings.notification.loadingImage);
      e.stopPropagation();
      e.preventDefault();
-      $('#workarea').removeAttr('style');
      $('#main_menu').hide();
      const file = (e.type === 'drop') ? e.dataTransfer.files[0] : this.files[0];
      if (!file) {