Skip to content

Commit 724fdcd

Browse files
puckeypuckey
committed
Merge remote branch 'origin/master'
2 parents d726cef + 287e91b commit 724fdcd

122 files changed

Lines changed: 4141 additions & 1713 deletions

File tree

Some content is hidden

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

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Also, in your first contribution, add yourself to the end of `AUTHORS.md` (which
100100

101101
As mentioned earlier in this article, we prefer that you send a [*pull request*](http://help.github.com/pull-requests/) on GitHub.
102102

103-
1. Create a fork of the upstream repository by visiting <https://github.com/paperjs/paper.js/fork>. If you feel insecure, here's a great guide: <http://help.github.com/forking/>
103+
1. Create a fork of the upstream repository by visiting <https://github.com/paperjs/paper.js/fork>. If you feel insecure, here's a great guide: <http://help.github.com/forking/>
104104

105105
2. Clone of your repository: `git clone https://yourusername@github.com/yourusername/paper.js.git`
106106

@@ -117,7 +117,7 @@ If you are fixing a ticket, a convenient way to name the branch is to use the UR
117117

118118
Before we can accept any contributions to Paper.js, you need to sign this [CLA](http://en.wikipedia.org/wiki/Contributor_License_Agreement):
119119

120-
[http://paperjs.org/cla.html](http://paperjs.org/cla.html)
120+
[Contributor License Agreement](https://spreadsheets.google.com/a/paperjs.org/spreadsheet/embeddedform?formkey=dENxd0JBVDY2REo3THVuRmh4YjdWRlE6MQ)
121121

122122
> The purpose of this agreement is to clearly define the terms under which intellectual property has been contributed to Paper.js and thereby allow us to defend the project should there be a legal dispute regarding the software at some future time.
123123

‎build/build.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
# Copyright (c) 2011, Juerg Lehni & Jonathan Puckey
1010
# http://lehni.org/ & http://jonathanpuckey.com/
1111
#
12-
# All rights reserved. See LICENSE file for details.
12+
# Distributed under the MIT license. See LICENSE file for details.
13+
#
14+
# All rights reserved.
1315

1416
# Usage:
1517
# build.sh MODE

‎build/dist.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
# Copyright (c) 2011, Juerg Lehni & Jonathan Puckey
1010
# http://lehni.org/ & http://jonathanpuckey.com/
1111
#
12-
# All rights reserved. See LICENSE file for details.
12+
# Distributed under the MIT license. See LICENSE file for details.
13+
#
14+
# All rights reserved.
1315

1416
echo "Building paper.js"
1517
./build.sh

‎build/docs.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
# Copyright (c) 2011, Juerg Lehni & Jonathan Puckey
1010
# http://lehni.org/ & http://jonathanpuckey.com/
1111
#
12-
# All rights reserved. See LICENSE file for details.
12+
# Distributed under the MIT license. See LICENSE file for details.
13+
#
14+
# All rights reserved.
1315

1416
# Generate documentation
1517
#

‎build/jsdoc-toolkit‎

Submodule jsdoc-toolkit updated from 122c762 to 87368e6

‎build/load.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
# Copyright (c) 2011, Juerg Lehni & Jonathan Puckey
1010
# http://lehni.org/ & http://jonathanpuckey.com/
1111
#
12-
# All rights reserved. See LICENSE file for details.
12+
# Distributed under the MIT license. See LICENSE file for details.
13+
#
14+
# All rights reserved.
1315

1416
# Generate a paper.js file that uses load.js to directly load the library
1517
# through the seperate source files in the src directory. Very useful during

‎build/parse-js.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
# Copyright (c) 2011, Juerg Lehni & Jonathan Puckey
1010
# http://lehni.org/ & http://jonathanpuckey.com/
1111
#
12-
# All rights reserved. See LICENSE file for details.
12+
# Distributed under the MIT license. See LICENSE file for details.
13+
#
14+
# All rights reserved.
1315

1416
# Generate a paper.js file that uses load.js to directly load the library
1517
# through the seperate source files in the src directory. Very useful during

‎build/preprocess.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
# Copyright (c) 2011, Juerg Lehni & Jonathan Puckey
1010
# http://lehni.org/ & http://jonathanpuckey.com/
1111
#
12-
# All rights reserved. See LICENSE file for details.
12+
# Distributed under the MIT license. See LICENSE file for details.
13+
#
14+
# All rights reserved.
1315

1416
# preprocess.sh
1517
#

‎build/zip.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
# Copyright (c) 2011, Juerg Lehni & Jonathan Puckey
1010
# http://lehni.org/ & http://jonathanpuckey.com/
1111
#
12-
# All rights reserved. See LICENSE file for details.
12+
# Distributed under the MIT license. See LICENSE file for details.
13+
#
14+
# All rights reserved.
1315

1416
if [ -f paperjs.zip ]
1517
then

‎dist/docs/resources/js/paper.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5010,7 +5010,7 @@ var TextItem = this.TextItem = Item.extend({
50105010

50115011
setContent: function(content) {
50125012
this._changed(Change.CONTENT);
5013-
this._content = content;
5013+
this._content = '' + content;
50145014
},
50155015

50165016
getCharacterStyle: function() {

0 commit comments

Comments
 (0)