Skip to content
This repository has been archived by the owner on Mar 13, 2018. It is now read-only.

Commit

Permalink
Merge pull request #26 from Polymer/update-0.3.5
Browse files Browse the repository at this point in the history
Update components to 0.4.0.
  • Loading branch information
Arthur Evans committed Aug 29, 2014
2 parents 1823ac0 + e666cb3 commit 7bdfa67
Show file tree
Hide file tree
Showing 270 changed files with 3,078 additions and 10,976 deletions.
10 changes: 5 additions & 5 deletions components/core-ajax/.bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"name": "core-ajax",
"private": true,
"dependencies": {
"polymer": "Polymer/polymer#>=0.3.0 <1.0.0"
"polymer": "Polymer/polymer#>=0.4.0 <1.0.0"
},
"homepage": "https://github.com/Polymer/core-ajax",
"version": "0.3.3",
"_release": "0.3.3",
"version": "0.4.0",
"_release": "0.4.0",
"_resolution": {
"type": "version",
"tag": "0.3.3",
"commit": "b9cb6d8e2a5b91cbe752bdb89f5c58cadf92fad6"
"tag": "0.4.0",
"commit": "3b2d12b4d14b0401b3c323bd2d68d025e833b6e0"
},
"_source": "git://github.com/Polymer/core-ajax.git",
"_target": "*",
Expand Down
2 changes: 1 addition & 1 deletion components/core-ajax/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
core-ajax
=========

See the [component page](http://polymer.github.io/core-ajax) for more information.
See the [component page](http://polymer-project.org/docs/elements/core-elements.html#core-ajax) for more information.
2 changes: 1 addition & 1 deletion components/core-ajax/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"name": "core-ajax",
"private": true,
"dependencies": {
"polymer": "Polymer/polymer#>=0.3.0 <1.0.0"
"polymer": "Polymer/polymer#>=0.4.0 <1.0.0"
}
}
12 changes: 9 additions & 3 deletions components/core-ajax/core-ajax.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
@homepage github.io
-->
<link rel="import" href="core-xhr.html">
<polymer-element name="core-ajax" attributes="url handleAs auto params response method headers body contentType withCredentials">
<polymer-element name="core-ajax" hidden attributes="url handleAs auto params response method headers body contentType withCredentials">
<script>

Polymer('core-ajax', {
Expand Down Expand Up @@ -238,6 +238,9 @@
try {
return JSON.parse(r);
} catch (x) {
console.warn('core-ajax caught an exception trying to parse response as JSON:');
console.warn('url:', this.url);
console.warn(x);
return r;
}
},
Expand Down Expand Up @@ -300,8 +303,11 @@
if (args.headers && typeof(args.headers) == 'string') {
args.headers = JSON.parse(args.headers);
}
if (this.contentType) {
args.headers['content-type'] = this.contentType;
var hasContentType = Object.keys(args.headers).some(function (header) {
return header.toLowerCase() === 'content-type';
});
if (!hasContentType && this.contentType) {
args.headers['Content-Type'] = this.contentType;
}
if (this.handleAs === 'arraybuffer' || this.handleAs === 'blob' ||
this.handleAs === 'document') {
Expand Down
1 change: 0 additions & 1 deletion components/core-ajax/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<head>

<script src="../platform/platform.js"></script>
<link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../core-component-page/core-component-page.html">

</head>
Expand Down
23 changes: 23 additions & 0 deletions components/core-ajax/metadata.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!--
@license
Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-->
<x-meta id="core-ajax" label="Ajax" group="Core">

<property name="handleAs" kind="select" options="json,text,xml,arraybuffer,blob,document"></property>
<property name="method" kind="select" options="GET,POST,PUT,DELETE"></property>

<template>
<core-ajax handleAs="json" method="GET"></core-ajax>
</template>

<template id="imports">
<link rel="import" href="core-ajax.html">
</template>

</x-meta>
10 changes: 5 additions & 5 deletions components/core-collapse/.bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"name": "core-collapse",
"private": true,
"dependencies": {
"polymer": "Polymer/polymer#>=0.3.0 <1.0.0"
"polymer": "Polymer/polymer#>=0.4.0 <1.0.0"
},
"homepage": "https://github.com/Polymer/core-collapse",
"version": "0.3.3",
"_release": "0.3.3",
"version": "0.4.0",
"_release": "0.4.0",
"_resolution": {
"type": "version",
"tag": "0.3.3",
"commit": "358ad316615bd7a5bd40fef2f078973d46d4e8ee"
"tag": "0.4.0",
"commit": "dae7a5292bad21245c7c7824ffcebe7c9011dbaa"
},
"_source": "git://github.com/Polymer/core-collapse.git",
"_target": ">=0.3.0 <1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion components/core-collapse/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
core-collapse
=============

See the [component page](http://polymer.github.io/core-collapse) for more information.
See the [component page](http://polymer-project.org/docs/elements/core-elements.html#core-collapse) for more information.
2 changes: 1 addition & 1 deletion components/core-collapse/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"name": "core-collapse",
"private": true,
"dependencies": {
"polymer": "Polymer/polymer#>=0.3.0 <1.0.0"
"polymer": "Polymer/polymer#>=0.4.0 <1.0.0"
}
}
21 changes: 20 additions & 1 deletion components/core-collapse/core-collapse.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<button on-click="{{toggle}}">toggle collapse</button>
<core-collapse id="collapse"></core-collapse>
<core-collapse id="collapse">
...
</core-collapse>
Expand Down Expand Up @@ -41,6 +41,19 @@

Polymer('core-collapse', {

/**
* Fired when the `core-collapse`'s `opened` property changes.
*
* @event core-collapse-open
*/

/**
* Fired when the target element has been resized as a result of the opened
* state changing.
*
* @event core-resize
*/

/**
* The target element.
*
Expand Down Expand Up @@ -140,6 +153,7 @@

openedChanged: function() {
this.update();
this.fire('core-collapse-open', this.opened);
},

/**
Expand All @@ -165,6 +179,7 @@
}
this.setTransitionDuration(null);
this.toggleClosedClass(!this.opened);
this.asyncFire('core-resize', null, this.target);
},

toggleClosedClass: function(closed) {
Expand Down Expand Up @@ -214,6 +229,10 @@
if (!this.fixedSize) {
this.updateSize('auto', null);
var s = this.calcSize();
if (s == '0px') {
this.transitionEnd();
return;
}
this.updateSize(0, null);
}
this.async(function() {
Expand Down
20 changes: 17 additions & 3 deletions components/core-collapse/demo.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
<!--
@license
Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-->
<!doctype html>
<html>
<head>
Expand All @@ -9,7 +18,12 @@
<link rel="import" href="core-collapse.html">

<style>

body {
overflow: auto;
margin: 8px 24px;
}


.box {
background: #eee;
}
Expand All @@ -27,7 +41,7 @@
</head>
<body unresolved>

<section style="background: blue; width: 800px;">
<section style="background: steelblue;">

<button onclick="document.querySelector('#collapse1').toggle()">toggle collapse</button>

Expand All @@ -37,7 +51,7 @@

</section>

<section style="background: green; width: 800px;">
<section style="background: seagreen;">

<button onclick="document.querySelector('#collapse2').toggle()">toggle collapse</button>

Expand Down
1 change: 0 additions & 1 deletion components/core-collapse/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<head>

<script src="../platform/platform.js"></script>
<link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../core-component-page/core-component-page.html">

</head>
Expand Down
14 changes: 7 additions & 7 deletions components/core-component-page/.bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
"name": "core-component-page",
"private": true,
"dependencies": {
"platform": "Polymer/platform#>=0.3.0 <1.0.0",
"polymer": "Polymer/polymer#>=0.3.0 <1.0.0"
"platform": "Polymer/platform#>=0.4.0 <1.0.0",
"polymer": "Polymer/polymer#>=0.4.0 <1.0.0"
},
"homepage": "https://github.com/Polymer/core-component-page",
"version": "0.3.3",
"_release": "0.3.3",
"version": "0.4.0",
"_release": "0.4.0",
"_resolution": {
"type": "version",
"tag": "0.3.3",
"commit": "31ff29fa197310d0d9e7e043c0dab8d0f9a511cf"
"tag": "0.4.0",
"commit": "b105e85252bc3dd521601d2d73b09d150c7c2b53"
},
"_source": "git://github.com/Polymer/core-component-page.git",
"_target": ">=0.3.0 <1.0.0",
"_target": ">=0.4.0 <1.0.0",
"_originalSource": "Polymer/core-component-page"
}
2 changes: 1 addition & 1 deletion components/core-component-page/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
core-component-page
===================

See the [component page](http://polymer.github.io/core-component-page) for more information.
See the [component page](http://polymer-project.org/docs/elements/core-elements.html#core-component-page) for more information.

Note: this is the vulcanized version of [`core-component-page-dev`](https://github.com/Polymer/core-component-page-dev) (the source).
4 changes: 2 additions & 2 deletions components/core-component-page/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "core-component-page",
"private": true,
"dependencies": {
"platform": "Polymer/platform#>=0.3.0 <1.0.0",
"polymer": "Polymer/polymer#>=0.3.0 <1.0.0"
"platform": "Polymer/platform#>=0.4.0 <1.0.0",
"polymer": "Polymer/polymer#>=0.4.0 <1.0.0"
}
}
Loading

0 comments on commit 7bdfa67

Please sign in to comment.