Skip to content

Changes to make it work for Toronto #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
houshuang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changes to make it work for Toronto #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/elements/elements-toronto.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,4 @@
<link rel="import" href="../styles/app-theme.html">
<link rel="import" href="../styles/shared-styles.html">
<link rel="import" href="population-app.html">
<script src="../../../async/dist/async.js"></script>
14 changes: 11 additions & 3 deletions app/elements/population-app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
<nutella-connector connected={{connected}} id="nutellaConn" hostname="ltg.evl.uic.edu" appid="wallcology"
runid="default"
componentid="wallcology_admin" roomcast></nutella-connector>
<template is="dom-if" if="{{!hideMenuBar}}">
<paper-toolbar>

<div class="start">
Expand Down Expand Up @@ -137,7 +138,7 @@
</div>
</div>
</paper-toolbar>

</template>
<div class="vertical-section-container">
<template is="dom-repeat" items="{{graphs}}">
<section>
Expand Down Expand Up @@ -391,6 +392,11 @@
}
]
},
hideMenuBar: {
type: Boolean,
notify: true,
value: false
},
graphs: {
type: Array,
notify: true,
Expand Down Expand Up @@ -518,7 +524,8 @@
console.log('graphsChanged', changeRecord);
}

var maxSelect = this.$.ws.maxSelections;
<!-- var maxSelect = this.$.ws.maxSelections; -->
var maxSelect = 4;


//console.log('THIS SELECTED ITEMS: ' + this.graphs + ' max ' + maxSelect);
Expand All @@ -531,7 +538,8 @@
},
selectedItemsChanged: function (changeRecord) {

var maxSelect = this.$.ws.maxSelections;
<!-- var maxSelect = this.$.ws.maxSelections; -->
var maxSelect = 4;


//console.log('THIS SELECTED ITEMS: ' + this.selectedItems + ' max ' + maxSelect);
Expand Down
1 change: 1 addition & 0 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "population-app",
"private": true,
"dependencies": {
"async": "caolan/async",
"polymer": "Polymer/polymer",
"iron-elements": "PolymerElements/iron-elements",
"paper-elements": "PolymerElements/paper-elements",
Expand Down