Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development improvements #441

Merged
merged 12 commits into from
Jun 13, 2022
Merged

Development improvements #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2e11e99
Lint and format tests
apple502j Jun 2, 2022
0e260bd
Use ES6 syntax in snapshot testing
apple502j Jun 2, 2022
99f360a
Lint index.js
apple502j Jun 2, 2022
b0bdc26
Bump dependencies
apple502j Jun 2, 2022
cdf2033
Add tests for escaping
apple502j Jun 2, 2022
dd4f0f6
Format code using Prettier
apple502j Jun 2, 2022
fd7ca4c
Declare variables explicitly
apple502j Jun 2, 2022
c3ed5f1
Merge branch 'dev-improvements' of https://github.com/apple502j/scrat…
apple502j Jun 2, 2022
2ed2343
Merge branch 'scratchblocks:master' into dev-improvements
apple502j Jun 2, 2022
3f212cb
Bump dependencies, once again
apple502j Jun 13, 2022
a6cfca9
Merge branch 'master' of https://github.com/scratchblocks/scratchbloc…
apple502j Jun 13, 2022
e257672
Merge branch 'dev-improvements' of https://github.com/apple502j/scrat…
apple502j Jun 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ <h1>
};
} else {
var newObj = {};
parts = hash.slice(1).split('&');
var parts = hash.slice(1).split('&');
parts.forEach(function(part) {
var match = /^(.*)=(.*)$/.exec(part);
if (!match) return;
Expand Down
39 changes: 20 additions & 19 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import * as scratch2 from "./scratch2/index.js"
import * as scratch3 from "./scratch3/index.js"

export default function (window) {
var document = window.document
const document = window.document

scratch2.init(window)
scratch3.init(window)
Expand All @@ -33,7 +33,7 @@ export default function (window) {
}

function newView(doc, options) {
var options = {
options = {
style: "scratch2",
...options,
}
Expand All @@ -53,8 +53,8 @@ export default function (window) {
if (typeof options === "function") {
throw new Error("render() no longer takes a callback")
}
var view = newView(doc, options)
var svg = view.render()
const view = newView(doc, options)
const svg = view.render()
return svg
}

Expand All @@ -64,15 +64,15 @@ export default function (window) {

// read code from a DOM element
function readCode(el, options) {
var options = {
options = {
inline: false,
...options,
}

var html = el.innerHTML.replace(/<br>\s?|\n|\r\n|\r/gi, "\n")
var pre = document.createElement("pre")
const html = el.innerHTML.replace(/<br>\s?|\n|\r\n|\r/gi, "\n")
const pre = document.createElement("pre")
pre.innerHTML = html
var code = pre.textContent
let code = pre.textContent
if (options.inline) {
code = code.replace("\n", "")
}
Expand All @@ -81,17 +81,18 @@ export default function (window) {

// insert 'svg' into 'el', with appropriate wrapper elements
function replace(el, svg, doc, options) {
let container
if (options.inline) {
var container = document.createElement("span")
var cls = "scratchblocks scratchblocks-inline"
container = document.createElement("span")
let cls = "scratchblocks scratchblocks-inline"
if (doc.scripts[0] && !doc.scripts[0].isEmpty) {
cls += " scratchblocks-inline-" + doc.scripts[0].blocks[0].shape
}
container.className = cls
container.style.display = "inline-block"
container.style.verticalAlign = "middle"
} else {
var container = document.createElement("div")
container = document.createElement("div")
container.className = "scratchblocks"
}
container.appendChild(svg)
Expand All @@ -107,9 +108,9 @@ export default function (window) {
*
* Like the old 'scratchblocks2.parse().
*/
var renderMatching = function (selector, options) {
var selector = selector || "pre.blocks"
var options = {
const renderMatching = function (selector, options) {
selector = selector || "pre.blocks"
options = {
// Default values for the options
style: "scratch2",
inline: false,
Expand All @@ -125,13 +126,13 @@ export default function (window) {
}

// find elements
var results = [].slice.apply(document.querySelectorAll(selector))
results.forEach(function (el) {
var code = options.read(el, options)
const results = [].slice.apply(document.querySelectorAll(selector))
results.forEach(el => {
const code = options.read(el, options)

var doc = options.parse(code, options)
const doc = options.parse(code, options)

var svg = options.render(doc, options)
const svg = options.render(doc, options)

options.replace(el, svg, doc, options)
})
Expand Down
Loading