Merge branch 'master' into new-build

badges/licenses-badge-dev.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="839" height="236"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="navy" d="M0 0h88v236H0z"/><path fill="#006400" d="M88 0h131v236H88z"/><path fill="green" d="M219 0h266v236H219z"/><path fill="#cc0" d="M485 0h79v236h-79z"/><path fill="#a9a9a9" d="M564 0h106v236H564z"/><path fill="#d3d3d3" d="M670 0h169v236H670z"/><path fill="url(#smooth)" d="M0 0h839v236H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">License types</text><text class="high" x="5" y="14">License types</text><text class="shadow" x="5.5" y="27">(all devDeps)</text><text class="high" x="5" y="26">(all devDeps)</text><text class="shadow" x="93.5" y="15">Public</text><text class="high" x="93" y="14">Public</text><text class="shadow" x="93.5" y="27">domain</text><text class="high" x="93" y="26">domain</text><text class="shadow" x="93.5" y="51">1. (MIT OR CC0-1.0)</text><text class="high" x="93" y="50">1. (MIT OR CC0-1.0)</text><text class="shadow" x="93.5" y="63">2. CC0-1.0</text><text class="high" x="93" y="62">2. CC0-1.0</text><text class="shadow" x="93.5" y="75">3. Unlicense</text><text class="high" x="93" y="74">3. Unlicense</text><text class="shadow" x="224.5" y="15">Permissive</text><text class="high" x="224" y="14">Permissive</text><text class="shadow" x="224.5" y="39">1. (AFL-2.1 OR BSD-3-Clause)</text><text class="high" x="224" y="38">1. (AFL-2.1 OR BSD-3-Clause)</text><text class="shadow" x="224.5" y="51">2. (BSD-2-Clause OR (MIT OR Apache-2.0))</text><text class="high" x="224" y="50">2. (BSD-2-Clause OR (MIT OR Apache-2.0))</text><text class="shadow" x="224.5" y="63">3. (GPL-3.0-or-later OR MIT)</text><text class="high" x="224" y="62">3. (GPL-3.0-or-later OR MIT)</text><text class="shadow" x="224.5" y="75">4. (MIT OR Apache-2.0)</text><text class="high" x="224" y="74">4. (MIT OR Apache-2.0)</text><text class="shadow" x="224.5" y="87">5. (MPL-2.0 OR Apache-2.0)</text><text class="high" x="224" y="86">5. (MPL-2.0 OR Apache-2.0)</text><text class="shadow" x="224.5" y="99">6. (WTFPL OR MIT)</text><text class="high" x="224" y="98">6. (WTFPL OR MIT)</text><text class="shadow" x="224.5" y="111">7. 0BSD</text><text class="high" x="224" y="110">7. 0BSD</text><text class="shadow" x="224.5" y="123">8. Apache-2.0</text><text class="high" x="224" y="122">8. Apache-2.0</text><text class="shadow" x="224.5" y="135">9. Artistic-2.0</text><text class="high" x="224" y="134">9. Artistic-2.0</text><text class="shadow" x="224.5" y="147">10. BSD</text><text class="high" x="224" y="146">10. BSD</text><text class="shadow" x="224.5" y="159">11. BSD-2-Clause</text><text class="high" x="224" y="158">11. BSD-2-Clause</text><text class="shadow" x="224.5" y="171">12. BSD-3-Clause</text><text class="high" x="224" y="170">12. BSD-3-Clause</text><text class="shadow" x="224.5" y="183">13. CC-BY-3.0</text><text class="high" x="224" y="182">13. CC-BY-3.0</text><text class="shadow" x="224.5" y="195">14. CC-BY-4.0</text><text class="high" x="224" y="194">14. CC-BY-4.0</text><text class="shadow" x="224.5" y="207">15. ISC</text><text class="high" x="224" y="206">15. ISC</text><text class="shadow" x="224.5" y="219">16. MIT</text><text class="high" x="224" y="218">16. MIT</text><text class="shadow" x="224.5" y="231">17. Zlib</text><text class="high" x="224" y="230">17. Zlib</text><text class="shadow" x="490.5" y="15">Weakly</text><text class="high" x="490" y="14">Weakly</text><text class="shadow" x="490.5" y="27">protective</text><text class="high" x="490" y="26">protective</text><text class="shadow" x="490.5" y="51">1. LGPL-3.0</text><text class="high" x="490" y="50">1. LGPL-3.0</text><text class="shadow" x="490.5" y="63">2. MPL-2.0</text><text class="high" x="490" y="62">2. MPL-2.0</text><text class="shadow" x="569.5" y="15">Uncategorized</text><text class="high" x="569" y="14">Uncategorized</text><text class="shadow" x="569.5" y="39">1. jsonify (0.0.0)</text><text class="high" x="569" y="38">1. jsonify (0.0.0)</text><text class="shadow" x="675.5" y="15">Missing</text><text class="high" x="675" y="14">Missing</text><text class="shadow" x="675.5" y="39">1. boundary (1.0.1)</text><text class="high" x="675" y="38">1. boundary (1.0.1)</text><text class="shadow" x="675.5" y="51">2. structured-source (3.0.2)</text><text class="high" x="675" y="50">2. structured-source (3.0.2)</text><text class="shadow" x="675.5" y="63">3. taffydb (2.6.2)</text><text class="high" x="675" y="62">3. taffydb (2.6.2)</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="161" height="56"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="navy" d="M0 0h88v56H0z"/><path fill="green" d="M88 0h73v56H88z"/><path fill="url(#smooth)" d="M0 0h161v56H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">License types</text><text class="high" x="5" y="14">License types</text><text class="shadow" x="5.5" y="27">(all devDeps)</text><text class="high" x="5" y="26">(all devDeps)</text><text class="shadow" x="93.5" y="15">Permissive</text><text class="high" x="93" y="14">Permissive</text><text class="shadow" x="93.5" y="39">1. ISC</text><text class="high" x="93" y="38">1. ISC</text><text class="shadow" x="93.5" y="51">2. MIT</text><text class="high" x="93" y="50">2. MIT</text></g></svg>

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) {