From 17fb92c95fcb4522e70fcd8c8db2d04efac10b3a Mon Sep 17 00:00:00 2001 From: Daniel Freedman Date: Mon, 13 May 2013 18:07:25 -0700 Subject: [PATCH] toolkit -> polymer --- CONTRIBUTING.md | 10 +++++----- LICENSE | 2 +- PATENTS | 12 ++++++------ README.md | 12 ++++++------ conf/karma.conf.js | 2 +- gruntfile.js | 14 +++++++------- package.json | 2 +- smoke/index.html | 4 ++-- smoke/x-bar.html | 4 ++-- smoke/x-foo.html | 4 ++-- smoke/x-zot.html | 4 ++-- src/attrs.js | 2 +- src/base.js | 2 +- src/bindMDV.js | 2 +- src/bindProperties.js | 2 +- src/boot.js | 2 +- src/events.js | 4 ++-- src/job.js | 2 +- src/lang.js | 2 +- src/marshal.js | 2 +- src/observeProperties.js | 2 +- src/oop.js | 2 +- src/path.js | 2 +- src/register.js | 2 +- src/shimStyling.js | 2 +- src/styling.js | 2 +- test/html/bind-object-repeat.html | 6 +++--- test/html/event-path-getDistributedNodes.html | 6 +++--- test/html/event-path.html | 10 +++++----- test/html/publish-attributes.html | 14 +++++++------- test/html/styling/host.html | 10 +++++----- test/html/styling/pseudo-scoping.html | 6 +++--- test/html/styling/zim.html | 2 +- test/html/take-attributes.html | 10 +++++----- test/html/template-distribute.html | 6 +++--- test/js/attrs.js | 2 +- test/js/bindMDV.js | 6 +++--- test/js/bindProperties.js | 8 ++++---- test/js/events.js | 4 ++-- test/js/lang.js | 2 +- test/js/marshall.js | 6 +++--- test/js/oop.js | 2 +- test/js/register.js | 4 ++-- test/js/styling.js | 2 +- test/lib/htmltest.js | 2 +- test/lib/mocha-htmltest.js | 2 +- test/runner.html | 6 +++--- toolkit.js | 8 ++++---- workbench/events/index.html | 10 +++++----- workbench/oop/class.html | 2 +- workbench/oop/extend.html | 2 +- workbench/oop/node-class.html | 2 +- workbench/oop/plain.html | 2 +- workbench/oop/super.html | 2 +- workbench/register/register.html | 2 +- workbench/register/register_1.html | 2 +- workbench/styling/host.html | 10 +++++----- workbench/styling/zim.html | 2 +- 58 files changed, 131 insertions(+), 131 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0c557fe4..d00032b4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,8 +1,8 @@ # Contributing -Want to contribute to the toolkit? Great! +Want to contribute to the 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/toolkitchen), [bug reports](/toolkitchen/toolkit/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](/polymer-project/polymer/issues), and pull requests. ## Contributor License Agreement @@ -23,7 +23,7 @@ Here's an easy guide that should get you up and running: 1. Fork the project on github and pull down your copy. - git clone git@github.com:username/toolkit.git --recursive + git clone git@github.com:username/polymer.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: @@ -40,8 +40,8 @@ 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 toolkit - git remote add upstream git://github.com/toolkitchen/toolkit.git + cd polymer + git remote add upstream git://github.com/polymer-project/polymer.git Then before making a change, do a pull from the upstream `master` branch: diff --git a/LICENSE b/LICENSE index f8660825..37912c05 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Toolkitchen Authors. All rights reserved. +// Copyright (c) 2012 The Polymer-Project Authors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/PATENTS b/PATENTS index 7acb9427..d91dd9d8 100644 --- a/PATENTS +++ b/PATENTS @@ -1,23 +1,23 @@ Additional IP Rights Grant (Patents) "This implementation" means the copyrightable works distributed by -Google as part of the Toolkitchen project. +Google as part of the Polymer-Project project. Google hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, transfer and otherwise run, modify and propagate the contents of this -implementation of Toolkitchen, where such license applies only to those +implementation of Polymer-Project, where such license applies only to those patent claims, both currently owned or controlled by Google and acquired in the future, licensable by Google that are necessarily infringed by -this implementation of Toolkitchen. This grant does not include claims +this implementation of Polymer-Project. This grant does not include claims that would be infringed only as a consequence of further modification of this implementation. If you or your agent or exclusive licensee institute or order or agree to the institution of patent litigation against any entity (including a cross-claim or counterclaim in a -lawsuit) alleging that this implementation of Toolkitchen or any code -incorporated within this implementation of Toolkitchen constitutes +lawsuit) alleging that this implementation of Polymer-Project or any code +incorporated within this implementation of Polymer-Project constitutes direct or contributory patent infringement, or inducement of patent infringement, then any patent rights granted to you under this License -for this implementation of Toolkitchen shall terminate as of the date +for this implementation of Polymer-Project shall terminate as of the date such litigation is filed. diff --git a/README.md b/README.md index 1f4d67df..47007748 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -# Toolkitchen:Toolkit +# Polymer-Project:Polymer -Build Status: [http://build.chromium.org/p/client.toolkit/waterfall](http://build.chromium.org/p/client.toolkit/waterfall) +Build Status: [http://build.chromium.org/p/client.polymer/waterfall](http://build.chromium.org/p/client.polymer/waterfall) ## Brief Overview -For more detailed info goto [http://toolkitchen.github.io/](http://toolkitchen.github.io/). +For more detailed info goto [http://polymer-project.github.io/](http://polymer-project.github.io/). -The Toolkitchen Toolkit 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. +The Polymer-Project 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. -Toolkitchen Toolkit 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 Toolkit evacipates, leaving only the value-adds. +Polymer-Project 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. ## Tools & Testing -For running tests or building minified files, consult the [tooling information](http://toolkitchen.github.com/tooling-strategy.html). +For running tests or building minified files, consult the [tooling information](http://polymer-project.github.com/tooling-strategy.html). diff --git a/conf/karma.conf.js b/conf/karma.conf.js index d3a481e1..dcaaad0e 100644 --- a/conf/karma.conf.js +++ b/conf/karma.conf.js @@ -14,7 +14,7 @@ files = [ 'tools/test/mocha-htmltest.js', 'conf/mocha.conf.js', 'node_modules/chai/chai.js', - 'toolkit.js', + 'polymer.js', 'test/js/*.js', {pattern: 'tools/**/*.js', included: false}, {pattern: 'platform/**/*', included: false}, diff --git a/gruntfile.js b/gruntfile.js index f4f66482..9942c0af 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ @@ -12,7 +12,7 @@ module.exports = function(grunt) { 'platform/platform.native.min.js' ]; - Toolkit = [ + Polymer = [ 'src/lang.js', 'src/oop.js', 'src/register.js', @@ -65,17 +65,17 @@ module.exports = function(grunt) { reporters: ['crbot'], logLevel: 'OFF' }, - toolkit: { + polymer: { browsers: browsers } }, uglify: { - Toolkit: { + Polymer: { options: { sourceMap: 'polymer.min.js.map' }, files: { - 'polymer.min.js': [].concat(Platform, Toolkit) + 'polymer.min.js': [].concat(Platform, Polymer) } }, ToolkitNative: { @@ -83,7 +83,7 @@ module.exports = function(grunt) { sourceMap: 'polymer.native.min.js.map' }, files: { - 'polymer.native.min.js': [].concat(PlatformNative, Toolkit) + 'polymer.native.min.js': [].concat(PlatformNative, Polymer) } } }, @@ -116,7 +116,7 @@ module.exports = function(grunt) { grunt.registerTask('default', ['uglify']); grunt.registerTask('minify', ['uglify']); grunt.registerTask('docs', ['yuidoc']); - grunt.registerTask('test', ['karma:toolkit']); + grunt.registerTask('test', ['karma:polymer']); grunt.registerTask('test-buildbot', ['karma:buildbot']); }; diff --git a/package.json b/package.json index 5d4734ac..4a6a5e51 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "Toolkit", + "name": "Polymer", "version": "0.0.1", "devDependencies": { "mocha": "*", diff --git a/smoke/index.html b/smoke/index.html index b581fcae..1d261964 100644 --- a/smoke/index.html +++ b/smoke/index.html @@ -1,5 +1,5 @@ @@ -8,7 +8,7 @@ license that can be found in the LICENSE file. - + diff --git a/smoke/x-bar.html b/smoke/x-bar.html index 7373fef3..da8030cb 100644 --- a/smoke/x-bar.html +++ b/smoke/x-bar.html @@ -1,5 +1,5 @@ @@ -8,7 +8,7 @@ license that can be found in the LICENSE file. diff --git a/src/attrs.js b/src/attrs.js index 6c289b88..5d1a902b 100644 --- a/src/attrs.js +++ b/src/attrs.js @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ diff --git a/src/base.js b/src/base.js index a47b4f8a..466bb123 100644 --- a/src/base.js +++ b/src/base.js @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ diff --git a/src/bindMDV.js b/src/bindMDV.js index ba841791..ca4252b4 100644 --- a/src/bindMDV.js +++ b/src/bindMDV.js @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ diff --git a/src/bindProperties.js b/src/bindProperties.js index 99faca66..d4077013 100644 --- a/src/bindProperties.js +++ b/src/bindProperties.js @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ diff --git a/src/boot.js b/src/boot.js index 9b7269de..92e6eaf7 100644 --- a/src/boot.js +++ b/src/boot.js @@ -1,5 +1,5 @@ /* - * Copyright 2012 The Toolkitchen Authors. All rights reserved. + * Copyright 2012 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ diff --git a/src/events.js b/src/events.js index b229284c..5f93759a 100644 --- a/src/events.js +++ b/src/events.js @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ @@ -90,7 +90,7 @@ // effective content. A template can have a ref property // that points to the template from which this one has been cloned. // Remove this when the MDV api is improved - // (https://github.com/toolkitchen/mdv/issues/15). + // (https://github.com/polymer-project/mdv/issues/15). var getTemplateContent = function(inTemplate) { return inTemplate.ref ? inTemplate.ref.content : inTemplate.content; } diff --git a/src/job.js b/src/job.js index cd00ca69..c7e2a729 100644 --- a/src/job.js +++ b/src/job.js @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ diff --git a/src/lang.js b/src/lang.js index 67aae023..9c191e78 100644 --- a/src/lang.js +++ b/src/lang.js @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ diff --git a/src/marshal.js b/src/marshal.js index 83835e78..f4f7d91d 100644 --- a/src/marshal.js +++ b/src/marshal.js @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ diff --git a/src/observeProperties.js b/src/observeProperties.js index 8f5691b9..5eb30c73 100644 --- a/src/observeProperties.js +++ b/src/observeProperties.js @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ diff --git a/src/oop.js b/src/oop.js index 15772223..75f8951d 100644 --- a/src/oop.js +++ b/src/oop.js @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ diff --git a/src/path.js b/src/path.js index 873f8be1..ba0583c4 100644 --- a/src/path.js +++ b/src/path.js @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ diff --git a/src/register.js b/src/register.js index 0e817ada..762a73f5 100644 --- a/src/register.js +++ b/src/register.js @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ diff --git a/src/shimStyling.js b/src/shimStyling.js index 4abe3459..7017e513 100644 --- a/src/shimStyling.js +++ b/src/shimStyling.js @@ -1,5 +1,5 @@ /* - * Copyright 2012 The Toolkitchen Authors. All rights reserved. + * Copyright 2012 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ diff --git a/src/styling.js b/src/styling.js index 30ef6724..487f72b6 100644 --- a/src/styling.js +++ b/src/styling.js @@ -1,5 +1,5 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ diff --git a/test/html/bind-object-repeat.html b/test/html/bind-object-repeat.html index edcdd517..289cf792 100644 --- a/test/html/bind-object-repeat.html +++ b/test/html/bind-object-repeat.html @@ -2,7 +2,7 @@ bind object + repeat - + @@ -13,7 +13,7 @@

obj.foo is {{obj.foo}}

+ @@ -17,7 +17,7 @@ diff --git a/test/html/event-path.html b/test/html/event-path.html index 142667da..e8c2bfc7 100644 --- a/test/html/event-path.html +++ b/test/html/event-path.html @@ -2,7 +2,7 @@ event path - + @@ -20,7 +20,7 @@ @@ -31,7 +31,7 @@ @@ -40,7 +40,7 @@ @@ -55,7 +55,7 @@ diff --git a/test/html/publish-attributes.html b/test/html/publish-attributes.html index c1c39f0f..17217421 100644 --- a/test/html/publish-attributes.html +++ b/test/html/publish-attributes.html @@ -2,7 +2,7 @@ publish attributes - + @@ -10,19 +10,19 @@ + @@ -77,7 +77,7 @@ license that can be found in the LICENSE file.
red background
- + @@ -92,7 +92,7 @@ license that can be found in the LICENSE file.
white text
- + @@ -107,7 +107,7 @@ license that can be found in the LICENSE file.
orange border & gray background
- + diff --git a/test/html/styling/pseudo-scoping.html b/test/html/styling/pseudo-scoping.html index e8d6b288..2ef19b04 100644 --- a/test/html/styling/pseudo-scoping.html +++ b/test/html/styling/pseudo-scoping.html @@ -1,6 +1,6 @@ @@ -8,7 +8,7 @@ license that can be found in the LICENSE file. Psuedo scoped styling - +
20px / 50px
- + + diff --git a/test/html/take-attributes.html b/test/html/take-attributes.html index 465131a3..f037a9d8 100644 --- a/test/html/take-attributes.html +++ b/test/html/take-attributes.html @@ -2,7 +2,7 @@ take attributes - + @@ -10,7 +10,7 @@ @@ -61,7 +61,7 @@ diff --git a/test/html/template-distribute.html b/test/html/template-distribute.html index b44e3de5..25ffbad6 100644 --- a/test/html/template-distribute.html +++ b/test/html/template-distribute.html @@ -2,7 +2,7 @@ template distribute - + @@ -16,7 +16,7 @@ @@ -29,7 +29,7 @@ - +
diff --git a/toolkit.js b/toolkit.js index 7a330c00..724c6cef 100644 --- a/toolkit.js +++ b/toolkit.js @@ -1,19 +1,19 @@ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project Authors. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ /* - * Copyright 2013 The Toolkitchen Authors. All rights reserved. + * Copyright 2013 The Polymer-Project 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 = 'toolkit.js'; -var scopeName = 'Toolkit'; +var thisFile = 'polymer.js'; +var scopeName = 'Polymer'; var modules = [ 'platform/platform.js', 'src/lang.js', diff --git a/workbench/events/index.html b/workbench/events/index.html index 771e0082..55f9ae54 100644 --- a/workbench/events/index.html +++ b/workbench/events/index.html @@ -1,14 +1,14 @@ - toolkit::events + polymer::events - + @@ -43,7 +43,7 @@ license that can be found in the LICENSE file. +

Expected: red background

@@ -35,7 +35,7 @@ license that can be found in the LICENSE file.
red background
- + @@ -50,7 +50,7 @@ license that can be found in the LICENSE file.
white text
- + @@ -65,7 +65,7 @@ license that can be found in the LICENSE file.
orange border & gray background
- + diff --git a/workbench/styling/zim.html b/workbench/styling/zim.html index 930da7ce..24753ffe 100644 --- a/workbench/styling/zim.html +++ b/workbench/styling/zim.html @@ -4,5 +4,5 @@
padding: 20px
- +