Skip to content

Commit

Permalink
Merge pull request #337 from LLK/develop
Browse files Browse the repository at this point in the history
Release 0.1.0
  • Loading branch information
thisandagain committed May 17, 2016
2 parents dc1f03a + c8abdcf commit 94aa417
Show file tree
Hide file tree
Showing 492 changed files with 20,515 additions and 54,564 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# editorconfig.org
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*_compressed_*.js
*_uncompressed_*.js
/msg/*
/tests/jsunit/*
26 changes: 26 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"rules": {
"curly": [2, "multi-line"],
"eol-last": [2],
"indent": [2, 2, {"SwitchCase": 1}], # Blockly/Google use 2-space indents
"linebreak-style": [2, "unix"],
"max-len": [2, 120, 4],
"no-trailing-spaces": [2, { "skipBlankLines": true }],
"no-unused-vars": [2, {"args": "after-used", "varsIgnorePattern": "^_"}],
"quotes": [0], # Blockly mixes single and double quotes
"semi": [2, "always"],
"space-before-function-paren": [2, "never"], # Blockly doesn't have space before function paren
"strict": [0], # Blockly uses 'use strict' in files
"no-cond-assign": [0], # Blockly often uses cond-assignment in loops
"valid-jsdoc": [2, {"requireReturn": false}],
"no-redeclare": [0] # Preference from Blockly/Google
},
"env": {
"browser": true
},
"globals": {
"Blockly": true, # Blockly global
"goog": true # goog closure libraries/includes
},
"extends": "eslint:recommended"
}
11 changes: 9 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
node_modules
npm-debug.log
# OSX
.DS_Store

# NPM
/node_modules
npm-*

# Localization / I18N
common.pyc
.settings
.project
*.pyc
*.komodoproject
/nbproject/private/
6 changes: 0 additions & 6 deletions .jshintignore

This file was deleted.

File renamed without changes.
25 changes: 20 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
# Blockly
# scratch-blocks
#### Scratch Blocks is a library for building creative computing interfaces.

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

**The project page is https://developers.google.com/blockly/**
## Introduction
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.

![](https://developers.google.com/blockly/sample.png)
*This project is in active development and should be considered a "developer preview" at this time.*

## Two Types of Blocks

![](https://cloud.githubusercontent.com/assets/747641/15255731/dad4d028-190b-11e6-9c16-8df7445adc96.png)

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.

*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.*

## Documentation
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).

## Donate
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!
7 changes: 7 additions & 0 deletions TRADEMARK
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
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.

You may use the Marks to refer to Scratch in Substantially Unmodified form.

"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.

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.
43 changes: 0 additions & 43 deletions appengine/README.txt

This file was deleted.

82 changes: 0 additions & 82 deletions appengine/app.yaml

This file was deleted.

Binary file removed appengine/apple-touch-icon.png
Binary file not shown.
Binary file removed appengine/favicon.ico
Binary file not shown.
11 changes: 0 additions & 11 deletions appengine/index.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions appengine/index_redirect.py

This file was deleted.

68 changes: 0 additions & 68 deletions appengine/redirect.html

This file was deleted.

2 changes: 0 additions & 2 deletions appengine/robots.txt

This file was deleted.

Loading

0 comments on commit 94aa417

Please sign in to comment.