Skip to content

Commit

Permalink
Merge pull request #172 from Polymer/master
Browse files Browse the repository at this point in the history
6/5 master -> stable
  • Loading branch information
dfreedm committed Jun 5, 2013
2 parents d14278c + 5fdfb68 commit f82a595
Show file tree
Hide file tree
Showing 39 changed files with 6,760 additions and 186 deletions.
9 changes: 9 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Names should be added to this file with this pattern:
#
# For individuals:
# Name <email address>
#
# For organizations:
# Organization <fnmatch pattern>
#
Google Inc. <*@google.com>
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Contributing

Want to contribute to polymer? Great!
Want to contribute to Polymer? Great!

We are more than happy to accept external contributions to the project in the form of [feedback](https://groups.google.com/forum/?fromgroups=#!forum/polymer-dev), [bug reports](https://github.com/Polymer/polymer/issues), and pull requests.
We are more than happy to accept external contributions to the project in the form of [feedback](https://groups.google.com/forum/?fromgroups=#!forum/polymer-dev), [bug reports](../../issues), and pull requests.

## Contributor License Agreement

Expand All @@ -22,8 +22,9 @@ Other projects require a similar agreement: jQuery, Firefox, Apache, Node, and m
Here's an easy guide that should get you up and running:

1. Fork the project on github and pull down your copy.
> replace the {{ username }} with your username and {{ repository }} with the repository name
git clone [email protected]:username/polymer.git --recursive
git clone [email protected]:{{ username }}/{{ repository }}.git --recursive

Note the `--recursive`. This is necessary for submodules to initialize properly. If you don't do a recursive clone, you'll have to init them manually:

Expand All @@ -40,8 +41,7 @@ That's it for the one time setup. Now you're ready to make a change.

We iterate fast! To avoid potential merge conflicts, it's a good idea to pull from the main project before making a change and submitting a pull request. The easiest way to do this is setup a remote called `upstream` and do a pull before working on a change:

cd polymer
git remote add upstream git://github.com/Polymer/polymer.git
git remote add upstream git://github.com/Polymer/{{ repository }}.git

Then before making a change, do a pull from the upstream `master` branch:

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Build Status: [http://build.chromium.org/p/client.polymer/waterfall](http://buil

For more detailed info goto [http://polymer-project.org/](http://polymer-project.org/).

The Polymer is a new type of library for the web, designed to leverage the existing browser infrastructure to provide the encapsulation and extendability currently only available in JS libraries.
Polymer is a new type of library for the web, designed to leverage the existing browser infrastructure to provide the encapsulation and extendability currently only available in JS libraries.

Polymer is based on a set of future technologies, including [Shadow DOM](https://dvcs.w3.org/hg/webcomponents/raw-file/tip/spec/shadow/index.html), [Custom Elements](https://dvcs.w3.org/hg/webcomponents/raw-file/tip/spec/custom/index.html) and Model Driven Views. Currently these technologies are implemented as polyfills or shims, but as browsers adopt these features natively, the platform code that drives Polymer evacipates, leaving only the value-adds.

Expand Down
20 changes: 20 additions & 0 deletions gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,20 @@ module.exports = function(grunt) {
PlatformNative = [
'platform/platform.native.min.js'
];

PlatformSandbox = [
'platform/platform.sandbox.min.js'
];

Polymer = [
'src/lang.js',
'src/oop.js',
'src/register.js',
'src/base.js',
'src/trackObservers.js',
'src/bindProperties.js',
'src/bindMDV.js',
'src/polymerSyntaxMDV.js',
'src/attrs.js',
'src/marshal.js',
'src/events.js',
Expand Down Expand Up @@ -70,6 +76,9 @@ module.exports = function(grunt) {
}
},
uglify: {
options: {
banner: '/* Copyright 2013 The Polymer Authors. All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. */\n'
},
Polymer: {
options: {
sourceMap: 'polymer.min.js.map'
Expand All @@ -85,6 +94,17 @@ module.exports = function(grunt) {
files: {
'polymer.native.min.js': [].concat(PlatformNative, Polymer)
}
},
PolymerSandbox: {
options: {
sourceMap: 'polymer.sandbox.min.js.map',
mangle: false,
beautify: true,
compress: false
},
files: {
'polymer.sandbox.min.js': [].concat(PlatformSandbox, Polymer)
}
}
},
yuidoc: {
Expand Down
2 changes: 1 addition & 1 deletion platform
8 changes: 2 additions & 6 deletions polymer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
* license that can be found in the LICENSE file.
*/

/*
* Copyright 2013 The Polymer Authors. All rights reserved.
* Use of this source code is governed by a BSD-style
* license that can be found in the LICENSE file.
*/

(function() {

var thisFile = 'polymer.js';
Expand All @@ -20,8 +14,10 @@ var modules = [
'src/oop.js',
'src/register.js',
'src/base.js',
'src/trackObservers.js',
'src/bindProperties.js',
'src/bindMDV.js',
'src/polymerSyntaxMDV.js',
'src/attrs.js',
'src/marshal.js',
'src/events.js',
Expand Down
14 changes: 9 additions & 5 deletions polymer.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion polymer.min.js.map

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions polymer.native.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion polymer.native.min.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit f82a595

Please sign in to comment.