5/14 master -> stable

.gitmodules

@@ -1,9 +1,10 @@
-[submodule "platform"]
-	path = platform
-	url = https://github.com/toolkitchen/platform.git
 [submodule "buildbot"]
 	path = buildbot
-	url = https://github.com/toolkitchen/buildbot.git
+	url = https://github.com/Polymer/buildbot.git
 [submodule "tools"]
 	path = tools
-	url = https://github.com/toolkitchen/tools.git
+	url = https://github.com/Polymer/tools.git
+[submodule "platform"]
+	path = platform
+	url = https://github.com/Polymer/platform.git
+	branch = master

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 [email protected]:username/toolkit.git --recursive
+        git clone [email protected]: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:
 

LICENSE

@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Toolkitchen Authors. All rights reserved.
+// Copyright (c) 2012 The Polymer Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are

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.
 
 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, 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.  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 or any code
+incorporated within this implementation of Polymer 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 shall terminate as of the date
 such litigation is filed.

README.md

@@ -1,15 +1,15 @@
 # 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://polymer-project.appspot.com/](http://polymer-project.appspot.com/).
+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 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://polymer-project.appspot.com/tooling-strategy.html).
+For running tests or building minified files, consult the [tooling information](http://polymer-project.org/tooling-strategy.html).

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},
@@ -84,7 +84,6 @@ preprocessors = {
 
 plugins = [
   'karma-mocha',
-  'karma-browserstack-launcher',
   'karma-chrome-launcher',
   'karma-firefox-launcher',
   'karma-script-launcher',

gruntfile.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 The Toolkitchen Authors. All rights reserved.
+ * 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.
  */
@@ -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,25 +65,25 @@ module.exports = function(grunt) {
         reporters: ['crbot'],
         logLevel: 'OFF'
       },
-      toolkit: {
+      polymer: {
         browsers: browsers
       }
     },
     uglify: {
-      Toolkit: {
+      Polymer: {
         options: {
-          sourceMap: 'toolkit.min.js.map'
+          sourceMap: 'polymer.min.js.map'
         },
         files: {
-          'toolkit.min.js': [].concat(Platform, Toolkit)
+          'polymer.min.js': [].concat(Platform, Polymer)
         }
       },
-      ToolkitNative: {
+      PolymerNative: {
         options: {
-          sourceMap: 'toolkit.native.min.js.map'
+          sourceMap: 'polymer.native.min.js.map'
         },
         files: {
-          'toolkit.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']);
 };
 

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "Toolkit",
+  "name": "Polymer",
   "version": "0.0.1",
   "devDependencies": {
     "mocha": "*",

toolkit.js → polymer.js

@@ -1,19 +1,19 @@
 /*
- * Copyright 2013 The Toolkitchen Authors. All rights reserved.
+ * 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.
  */
 
 /* 
- * Copyright 2013 The Toolkitchen Authors. All rights reserved.
+ * 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 = 'toolkit.js';
-var scopeName = 'Toolkit';
+var thisFile = 'polymer.js';
+var scopeName = 'Polymer';
 var modules = [
   'platform/platform.js',
   'src/lang.js',

smoke/index.html

@@ -1,5 +1,5 @@
 <!--
-Copyright 2013 The Toolkitchen Authors. All rights reserved.
+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.
 -->
@@ -8,7 +8,7 @@
   <head>
     <meta charset="UTF-8">
     <title></title>
-    <script src="../toolkit.js"></script>
+    <script src="../polymer.js"></script>
     <link rel="import" href="x-foo.html">
     <link rel="import" href="x-bar.html">
     <link rel="import" href="x-zot.html">

smoke/x-bar.html

@@ -1,5 +1,5 @@
 <!--
-Copyright 2013 The Toolkitchen Authors. All rights reserved.
+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.
 -->
@@ -8,7 +8,7 @@
     <content></content>
   </template>
   <script>
-    Toolkit.register(this, {
+    Polymer.register(this, {
       label: "tabula rasa",
       ready: function() {
         this.update();

smoke/x-foo.html

@@ -1,5 +1,5 @@
 <!--
-Copyright 2013 The Toolkitchen Authors. All rights reserved.
+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.
 -->
@@ -9,7 +9,7 @@
     <x-bar label="{{label}}"></x-bar>
   </template>
   <script>
-    Toolkit.register(this, {
+    Polymer.register(this, {
       label: '',
       ready: function(root) {
         this.textContent = 'cordon bleu';

smoke/x-zot.html

@@ -1,5 +1,5 @@
 <!--
-Copyright 2013 The Toolkitchen Authors. All rights reserved.
+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.
 -->
@@ -8,7 +8,7 @@
     <shadow></shadow>
   </template>
   <script>
-    Toolkit.register(this, {
+    Polymer.register(this, {
     });
   </script>
 </element>

src/attrs.js

@@ -1,5 +1,5 @@
 /* 
- * Copyright 2013 The Toolkitchen Authors. All rights reserved.
+ * 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.
  */
@@ -8,7 +8,7 @@
 
   // imports
 
-  var bindPattern = Toolkit.bindPattern;
+  var bindPattern = Polymer.bindPattern;
 
   // constants
 
@@ -128,8 +128,8 @@
 
   // exports
 
-  Toolkit.takeAttributes = takeAttributes;
-  Toolkit.publishAttributes = publishAttributes;
-  Toolkit.propertyForAttribute = propertyForAttribute;
+  Polymer.takeAttributes = takeAttributes;
+  Polymer.publishAttributes = publishAttributes;
+  Polymer.propertyForAttribute = propertyForAttribute;
 
 })();

src/base.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 The Toolkitchen Authors. All rights reserved.
+ * 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.
  */
@@ -12,16 +12,16 @@
 
   var base = {
     super: $super,
-    isToolkitElement: true,
+    isPolymerElement: true,
     // MDV binding
     bind: function() {
-      Toolkit.bind.apply(this, arguments);
+      Polymer.bind.apply(this, arguments);
     },
     unbind: function() {
-      Toolkit.unbind.apply(this, arguments);
+      Polymer.unbind.apply(this, arguments);
     },
     job: function() {
-      return Toolkit.job.apply(this, arguments);
+      return Polymer.job.apply(this, arguments);
     },
     asyncMethod: function(inMethod, inArgs, inTimeout) {
       var args = (inArgs && inArgs.length) ? inArgs : [inArgs];
@@ -34,11 +34,12 @@
         this[inMethodName].apply(this, inArguments);
       }
     },
-    send: function(inType, inDetail, inToNode) {
+    fire: function(inType, inDetail, inToNode) {
       var node = inToNode || this;
       log.events && console.log('[%s]: sending [%s]', node.localName, inType);
       node.dispatchEvent(
           new CustomEvent(inType, {bubbles: true, detail: inDetail}));
+      return inDetail;
     },
     asend: function(/*inType, inDetail*/) {
       this.asyncMethod("send", arguments);
@@ -53,9 +54,13 @@
       }
     }
   };
+
+  // TODO(sjmiles): backward-compat for deprecated syntax
+
+  base.send = base.fire;
 
   // exports
 
   scope.base = base;
 
-})(window.Toolkit);
+})(window.Polymer);