Skip to content

Commit 94aa417

Browse files
committed
Merge pull request #337 from LLK/develop
Release 0.1.0
2 parents dc1f03a + c8abdcf commit 94aa417

File tree

492 files changed

+20515
-54564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

492 files changed

+20515
-54564
lines changed

.editorconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# editorconfig.org
2+
root = true
3+
4+
[*]
5+
indent_style = space
6+
indent_size = 2
7+
end_of_line = lf
8+
charset = utf-8
9+
trim_trailing_whitespace = true
10+
insert_final_newline = true

.eslintignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
*_compressed_*.js
2+
*_uncompressed_*.js
3+
/msg/*
4+
/tests/jsunit/*

.eslintrc

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"rules": {
3+
"curly": [2, "multi-line"],
4+
"eol-last": [2],
5+
"indent": [2, 2, {"SwitchCase": 1}], # Blockly/Google use 2-space indents
6+
"linebreak-style": [2, "unix"],
7+
"max-len": [2, 120, 4],
8+
"no-trailing-spaces": [2, { "skipBlankLines": true }],
9+
"no-unused-vars": [2, {"args": "after-used", "varsIgnorePattern": "^_"}],
10+
"quotes": [0], # Blockly mixes single and double quotes
11+
"semi": [2, "always"],
12+
"space-before-function-paren": [2, "never"], # Blockly doesn't have space before function paren
13+
"strict": [0], # Blockly uses 'use strict' in files
14+
"no-cond-assign": [0], # Blockly often uses cond-assignment in loops
15+
"valid-jsdoc": [2, {"requireReturn": false}],
16+
"no-redeclare": [0] # Preference from Blockly/Google
17+
},
18+
"env": {
19+
"browser": true
20+
},
21+
"globals": {
22+
"Blockly": true, # Blockly global
23+
"goog": true # goog closure libraries/includes
24+
},
25+
"extends": "eslint:recommended"
26+
}

.gitignore

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1-
node_modules
2-
npm-debug.log
1+
# OSX
32
.DS_Store
3+
4+
# NPM
5+
/node_modules
6+
npm-*
7+
8+
# Localization / I18N
9+
common.pyc
410
.settings
511
.project
612
*.pyc
713
*.komodoproject
14+
/nbproject/private/

.jshintignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

COPYING renamed to LICENSE

File renamed without changes.

README.md

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
1-
# Blockly
1+
# scratch-blocks
2+
#### Scratch Blocks is a library for building creative computing interfaces.
23

3-
Google's Blockly is a web-based, visual programming editor. Users can drag
4-
blocks together to build programs. All code is free and open source.
4+
![](https://cloud.githubusercontent.com/assets/747641/15227351/c37c09da-1854-11e6-8dc7-9a298f2b1f01.jpg)
55

6-
**The project page is https://developers.google.com/blockly/**
6+
## Introduction
7+
Scratch Blocks is a fork of Google's [Blockly](https://github.com/google/blockly) project that provides a design specification and codebase for building creative computing interfaces. Together with the [Scratch Virtual Machine (VM)](https://github.com/LLK/scratch-vm) this codebase allows for the rapid design and development of visual programming interfaces.
78

8-
![](https://developers.google.com/blockly/sample.png)
9+
*This project is in active development and should be considered a "developer preview" at this time.*
10+
11+
## Two Types of Blocks
12+
13+
![](https://cloud.githubusercontent.com/assets/747641/15255731/dad4d028-190b-11e6-9c16-8df7445adc96.png)
14+
15+
Scratch Blocks brings together two different programming "grammars" that the Scratch Team has designed and continued to refine over the past decade. The standard [Scratch](https://scratch.mit.edu) grammar uses blocks that snap together vertically, much like LEGO bricks. For our [ScratchJr](https://scratchjr.org) software, intended for younger children, we developed blocks that are labelled with icons rather than words, and snap together horizontally rather than vertically. We have found that the horizontal grammar is not only friendlier for beginning programmers but also better suited for devices with small screens.
16+
17+
*Only the horizontal grammar is available for preview at this time. The vertical grammar is in the design phase and will be added to the project over the next several months.*
18+
19+
## Documentation
20+
The "getting started" guide including [FAQ](https://github.com/LLK/scratch-blocks/wiki/FAQ) and [design documentation](https://github.com/LLK/scratch-blocks/wiki/Design) can be found in the [wiki](https://github.com/LLK/scratch-blocks/wiki).
21+
22+
## Donate
23+
We provide [Scratch](https://scratch.mit.edu) free of charge, and want to keep it that way! Please consider making a [donation](https://secure.donationpay.org/scratchfoundation/) to support our continued engineering, design, community, and resource development efforts. Donations of any size are appreciated. Thank you!

TRADEMARK

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
The Scratch trademarks, including the Scratch name, logo, the Scratch Cat, Gobo, Pico, Nano, Tera and Giga graphics (the "Marks"), are property of the Massachusetts Institute of Technology (MIT), and the use of the Marks is governed by this policy.
2+
3+
You may use the Marks to refer to Scratch in Substantially Unmodified form.
4+
5+
"Substantially Unmodified" means the source code provided by MIT, possibly with minor modifications including but not limited to: bug fixes (including security), changing the locations of files for better integration with the host operating system, adding documentation, and changes to the dynamic linking of libraries.
6+
7+
A version is not "Substantially Unmodified" if it incorporates features not present in a release of Scratch by MIT. If you do make a substantial modification, to avoid confusion with versions of Scratch produced by MIT you must remove all Marks from your version of the software and refrain from using any of the Marks to refer to your version.

appengine/README.txt

Lines changed: 0 additions & 43 deletions
This file was deleted.

appengine/app.yaml

Lines changed: 0 additions & 82 deletions
This file was deleted.

appengine/apple-touch-icon.png

-3.93 KB
Binary file not shown.

appengine/favicon.ico

-5.3 KB
Binary file not shown.

appengine/index.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

appengine/index_redirect.py

Lines changed: 0 additions & 2 deletions
This file was deleted.

appengine/redirect.html

Lines changed: 0 additions & 68 deletions
This file was deleted.

appengine/robots.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)