simon/scittle
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Bookmarklet improvements (#3)

Browse source 
* Remove unused function

* Improve serialisation + loading of bookmarlets

- Drop bookmark link on textarea to edit

* Move serialisation to correct place
This commit is contained in:
Jeroen van Dijk 2021-05-27 12:12:26 +02:00 committed by GitHub
parent d673a5f947
commit 169c9b8717
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
resources/public/cljs/bookmarklet.cljs
View file

@ -13,46 +13,65 @@
(str ";s.onerror=" onerror))
";document.body.appendChild(s);"))
(defn append-script-tag [url]
(append-tag :script {:type "application/javascript" :src url}))
(defn pr-code [code-str]
(let [s (pr-str (str "#_CODE_" code-str "#_CODE_"))]
(str "\"" (subs s 1 (dec (count s))) "\"")))
(defn bookmarklet-href [code]
(defn read-code [code]
(read-string (str "\"" code "\"")))
(defn extract-code [code-str]
(second (re-find #"#_CODE_(.+)#_CODE_" code-str)))
(defn bookmarklet-href [code-str]
(str "javascript:(function(){"
"var runCode = function() {
try {
scittle.core.eval_string('" code "')
scittle.core.eval_string(" (pr-code code-str) ")
} catch (error) {
console.log('Error in code', error);
alert('Error running code, see console')
alert('Error running code, see console')
}
};"
};"
"if(typeof scittle === 'undefined'){"
(append-tag :script {:src "https://borkdude.github.io/scittle/js/scittle.js"
:onerror "function(){alert('Error loading ' + this.src)}"
:onload (str "runCode")
})
"} else {
"} else {
runCode() }"
"})();"))
(defn workspace []
(let [value (str "; This is the code of your bookmarklet\n"
(pr-str '(js/alert "Hello")))
*code (r/atom value)
bookmark-name "Bookmark"
*bookmark-name (r/atom bookmark-name)]
[:div
[:input {:type "text"
:placeholder bookmark-name
:on-change (fn [e]
[:div
[:input {:type "text"
:placeholder bookmark-name
:on-change (fn [e]
(let [v (.. e -target -value)]
(reset! *bookmark-name
(reset! *bookmark-name
(if (clojure.string/blank? v)
bookmark-name
v))))}]
[:br]
[:br]
[:textarea {:rows 10 :cols 80
:on-drop (fn [e]
(let [bookmarklet (js/decodeURIComponent (.. e -dataTransfer (getData "text")))
cljs-snippet (some-> (extract-code bookmarklet)
read-code)
new-code (if cljs-snippet
(str "; Extracted snippet\n" cljs-snippet)
(str "; Failed to extract snippet\n" bookmarklet))]
(js/console.log "Dropped" bookmarklet)
(set! (.. e -target -value) new-code)
(reset! *code new-code)
(.preventDefault e)))
:on-change (fn [e] (reset! *code (.. e -target -value)))}
value]
[:br]
@ -61,10 +80,8 @@
"or"[:br]
"Drag the link to the bookmarks bar" [:br]
[(fn []
(let [sanitized (->> (clojure.string/split-lines @*code) (remove #(re-find #"\s*;"%)) (clojure.string/join "\n"))]
(js/console.log "Loaded", sanitized)
[(fn [] [:a {:href (bookmarklet-href sanitized)} @*bookmark-name])]
)) *code]]))
(js/console.log "Loaded", @*code)
[(fn [] [:a {:href (bookmarklet-href @*code)} @*bookmark-name])])
*code]]))
(rdom/render [workspace] (.getElementById js/document "app"))
(rdom/render [workspace] (.getElementById js/document "app"))