Skip to content

Commit

Permalink
#2 Fit for developing tools updated polymer 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Chad Liu committed Jun 15, 2015
1 parent 8935f38 commit ce3991d
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 14 deletions.
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bower_components/

5 changes: 5 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,10 @@
],
"dependencies": {
"polymer": "#^1.0.0"
},
"devDependencies": {
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
"web-component-tester": "*"
}

}
4 changes: 1 addition & 3 deletions demo.html → demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
<head>
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<title>event-infinite-scroll Demo</title>

<script src="../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../../bower_components/web-animations-js/web-animations-next-lite.min.js"></script>
<script src="../../webcomponentsjs/webcomponents.min.js"></script>
<link rel="import" href="integer-demo.html">

</head>
Expand Down
6 changes: 3 additions & 3 deletions integer-demo.html → demo/integer-demo.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<link rel="import" href="event-infinite-scroll.html">
<link rel="import" href="../event-infinite-scroll.html">

<dom-module id="integer-demo">
<template>
<style>
.sizedFrame {
overflow-y: auto;
height: 300px;
height: 250px;
}
</style>
<h1>Scroll down </h1>
Expand Down Expand Up @@ -73,4 +73,4 @@ <h1>Scroll Up</h1>
}
});
</script>
</dom-module>
</dom-module>
4 changes: 2 additions & 2 deletions event-infinite-scroll.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<link rel="import" href="../../bower_components/polymer/polymer.html">

<!--
Element providing infinite scroll to track the parentNode on reaching bottom and end.
It will raise event when it reaches.
Expand All @@ -11,7 +9,9 @@
@blurb Element providing infinite scroll to track the parentNode on reaching bottom and end.
@status alpha
@homepage http://chadliu23.github.io/event-infinite-scroll
@demo demo/index.html
-->
<link rel="import" href="../polymer/polymer.html">
<dom-module id="event-infinite-scroll">

<template></template>
Expand Down
5 changes: 2 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
<html>
<head>
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<script src="../../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../../bower_components/web-animations-js/web-animations-next-lite.min.js"></script>
<link rel="import" href="../../bower_components/iron-component-page/iron-component-page.html">
<script src="../webcomponentsjs/webcomponents-lite.min.js"></script>
<link rel="import" href="../iron-component-page/iron-component-page.html">

</head>
<body unresolved>
Expand Down

0 comments on commit ce3991d

Please sign in to comment.