github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-08-06 12:58:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse Source
This commit is contained in:
Andrey Antukh 2026-08-06 09:05:48 +02:00
commit 31c9ab4701
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/packages/draft-js/index.js
View File

@ -22,7 +22,8 @@ export const {
} = pkg;
import DraftPasteProcessor from 'draft-js/lib/DraftPasteProcessor.js';
import {Map, OrderedSet} from "immutable";
import Immutable from "immutable";
const {Map, OrderedSet} = Immutable;
function isDefined(v) {
return v !== undefined && v !== null;

4
frontend/src/app/main/data/workspace/clipboard.cljs
View File

@ -1217,7 +1217,7 @@
(rx/mapcat (fn [blob]
;; Resolve the deferred with the fetched blob; the browser
;; will now complete the clipboard write it started earlier.
(p/resolve! deferred blob)
(p/resolve deferred blob)
(rx/from write-promise)))
(rx/map (fn [_]
(ntf/success (tr "workspace.clipboard.image-copied"))))
@ -1225,5 +1225,5 @@
(js/console.error "clipboard error:" e)
;; Reject the deferred in case the error occurred before the
;; blob was fetched, so the pending clipboard write is cancelled.
(p/reject! deferred e)
(p/reject deferred e)
(rx/of (ntf/error (tr "workspace.clipboard.image-copy-failed")))))))))))

2
frontend/src/app/plugins/register.cljs
View File

@ -35,7 +35,7 @@
"Signals that plugins runtime has been initialized. Called by app.plugins/init-plugins-runtime."
[]
(when (p/pending? runtime-ready-promise)
(p/resolve! runtime-ready-promise true)))
(p/resolve runtime-ready-promise true)))
;; Stores the installed plugins information
(defonce ^:private registry (atom {}))