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 #22 from Polymer/master
Browse files Browse the repository at this point in the history
8/15 master -> stable
  • Loading branch information
dfreedm committed Aug 15, 2013
2 parents 80d892b + 5da2d7e commit 895c1f8
Show file tree
Hide file tree
Showing 24 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion Gallery/elements/ga-app.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
Polymer('ga-app', {
selectedPanel: 'main',
searchSlideOpened: false,
inserted: function() {
enteredDocument: function() {
this.selectedPanelChanged();
this.search();
},
Expand Down
2 changes: 1 addition & 1 deletion MemoryGame/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</template>
<script>
Polymer('match-game', {
ready: function() {
created: function() {
this.game = new Game(['8-ball', 'kronos', 'baked-potato',
'dinosaur', 'rocket', 'skinny-unicorn',
'that-guy', 'zeppelin']);
Expand Down
2 changes: 1 addition & 1 deletion Playground/src/pg-app.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<script>
Polymer('pg-app', {
selectedElement: null,
ready: function() {
created: function() {
this.href = location.href.substring(0, location.href.lastIndexOf('/'));
},
generateImport: function() {
Expand Down
2 changes: 1 addition & 1 deletion Playground/src/pg-sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</template>
<script>
Polymer('pg-sidebar', {
ready: function() {
created: function() {
this.asyncMethod(function() {
this.$.sampleMenu.selected = 0;
});
Expand Down
2 changes: 1 addition & 1 deletion Playground/src/pg-view-gridlayout.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
[4],
[5]
]],
ready: function() {
created: function() {
this.nodes = [this.$.toolbar, this.$.ace, this.$.splitter, this.$.outputToolbar, this.$.output];
this.verticalChanged();
this.editor = this.$.ace;
Expand Down
2 changes: 1 addition & 1 deletion Playground/src/pg-view.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
queryMatches: false,
maximized: false,
autoRun: false,
ready: function() {
created: function() {
this.editor = this.$.ace;
this.maximizedChanged();
var meta = this.querySelector('polymer-meta');
Expand Down
2 changes: 1 addition & 1 deletion Sandbox/lib/tk-app.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
selectedMode: '',
maximized: false,
startMode: '',
ready: function() {
created: function() {
this.selectedMode = 'designer';
this.fontSize = this.normalFontSize;
if (!this.startMode) {
Expand Down
2 changes: 1 addition & 1 deletion Sandbox/lib/tk-designer.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
selected: null,
selectedTab: 'design',
maximized: false,
ready: function() {
created: function() {
this.designElement = this.$.canvas;
this.$.meta.ensureMeta(this.$.designElement);
this.selected = this.$.designElement;
Expand Down
2 changes: 1 addition & 1 deletion Sandbox/lib/tk-dumper.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
Polymer('tk-element-dumper', {
elementBlackList: ['style'],
propertyBlackList: null,
ready: function() {
created: function() {
var node = document.createElement('tk-dumper-blacklist');
this.propertyBlackList = Object.keys(node.__proto__);
},
Expand Down
4 changes: 2 additions & 2 deletions Sandbox/lib/tk-editors.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<script>
Polymer('tk-color-editor', {
type: 'color',
ready: function() {
created: function() {
// TODO(sjmiles): box-sizing: border-box doesn't play nice with color inputs
// TODO(sjmiles): is there a way to effect these styles via stylesheet?
this.$.input.style.boxSizing = 'content-box';
Expand Down Expand Up @@ -271,7 +271,7 @@
<polymer-element name="tk-speech-editor" extends="tk-string-editor">
<script>
Polymer('tk-speech-editor', {
ready: function() {
created: function() {
this.$.input.setAttribute('x-webkit-speech');
}
});
Expand Down
4 changes: 2 additions & 2 deletions Sandbox/lib/tk-meta.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
properties: null,
shouldPrepend: false,
hideSubtree: false,
ready: function() {
created: function() {
this.observeProperty('id');
this.idChanged();
this.updateProperties();
},
inserted: function() {
enteredDocument: function() {
this.updateProperties();
},
idChanged: function(inOld) {
Expand Down
2 changes: 1 addition & 1 deletion arrange-game/src/arrange-game-tile.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
(function() {
Polymer('arrange-game-tile', {
tile: null,
inserted: function() {
enteredDocument: function() {
var i = {};
this.fire('request-tile-metrics', i);
var m = this.metrics = i.metrics;
Expand Down
4 changes: 2 additions & 2 deletions arrange-game/src/arrange-game.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
tiles: null,
rows: 4,
cols: 4,
ready: function() {
created: function() {
this.setAttribute('touch-action', 'none');
},
inserted: function() {
enteredDocument: function() {
this.metrics = {
left: this.$.board.clientWidth / this.cols,
top: this.$.board.clientHeight / this.rows,
Expand Down
2 changes: 1 addition & 1 deletion pica/components/pi-accounts-model.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
var ACCOUNTS_STORAGE_NAME = 'pica-accounts-model-1';

Polymer('pi-accounts-model', {
ready: function() {
created: function() {
this.load();
},
addTopic: function(topic) {
Expand Down
2 changes: 1 addition & 1 deletion pica/components/pi-accounts.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
var ENTER_KEY = 13;

Polymer('pi-accounts', {
ready: function() {
created: function() {
this.setAttribute('touch-action', 'scroll');
this.asyncFire('ready');
},
Expand Down
2 changes: 1 addition & 1 deletion pica/components/pi-app.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
selectedPanel: 'main',
selectedViewPanel: '',
selectedLayout: null,
ready: function() {
created: function() {
this.super();
// hydrate
if (location.search.indexOf('hydrate') >= 0) {
Expand Down
2 changes: 1 addition & 1 deletion pica/components/pi-explore.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<script>
Polymer('pi-explore', {
layout: 'list',
ready: function() {
created: function() {
this.contentNode = document.createElement('div');
},
get canPrevious() {
Expand Down
2 changes: 1 addition & 1 deletion pica/components/pi-feed-aggregator.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
count: 24,
useCache: true,
feedResults: null,
ready: function() {
created: function() {
this.resetCache();
this.contentNode = document.createElement('div');
},
Expand Down
2 changes: 1 addition & 1 deletion pica/components/pi-feed-tracker.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
var FEED_TRACKER_STORAGE_NAME = 'pica-feed-tracker-1';

Polymer('pi-feed-tracker', {
ready: function() {
created: function() {
this.feeds = {};
this.load();
},
Expand Down
2 changes: 1 addition & 1 deletion pica/components/pi-feed-viewer.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
loading: true,
disableTracking: false,
feedCount: 200,
ready: function() {
created: function() {
var mq = window.matchMedia('(max-width: 800px)');
mq.addListener(this.layoutChange.bind(this));
this.layoutChange(mq);
Expand Down
2 changes: 1 addition & 1 deletion pica/components/pi-home.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</template>
<script>
Polymer('pi-home', {
ready: function() {
created: function() {
this.asyncFire('ready');
}
});
Expand Down
2 changes: 1 addition & 1 deletion pica/components/pi-items-view.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
layout: 'grid',
loaded: true,
pageSize: 24,
ready: function() {
created: function() {
this.setAttribute('touch-action', 'scroll');
this.updateMoreShowing();
},
Expand Down
2 changes: 1 addition & 1 deletion pica/components/pi-story.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<script>
Polymer('pi-story', {
content: '',
ready: function() {
created: function() {
if (!this.hasAttribute('tabindex')) {
this.tabIndex = -1;
}
Expand Down
2 changes: 1 addition & 1 deletion pica/components/pi-toolbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<script>
Polymer('pi-toolbar', {
nav: 'menu',
ready: function() {
created: function() {
this.navChanged();
},
navAction: function(event) {
Expand Down

0 comments on commit 895c1f8

Please sign in to comment.