Commit 6a138ebb9c620981399d31df404e4ffadf99bb75
1 parent
172c4387
animated button container controllet fix
Showing
1 changed file
with
9 additions
and
6 deletions
controllets/animated-button-container-controllet/animated-button-container-controllet.html
@@ -27,6 +27,7 @@ | @@ -27,6 +27,7 @@ | ||
27 | } | 27 | } |
28 | 28 | ||
29 | .window { | 29 | .window { |
30 | + display: none; | ||
30 | position: fixed; | 31 | position: fixed; |
31 | right: 0; | 32 | right: 0; |
32 | left: 0; | 33 | left: 0; |
@@ -144,9 +145,9 @@ | @@ -144,9 +145,9 @@ | ||
144 | </style> | 145 | </style> |
145 | 146 | ||
146 | <template> | 147 | <template> |
147 | - <neon-animated-pages id="pages" selected="[[selected]]" entry-animation="[[entryAnimation]]" exit-animation="[[exitAnimation]]"> | 148 | + <!--<neon-animated-pages id="pages" selected="[[selected]]" entry-animation="[[entryAnimation]]" exit-animation="[[exitAnimation]]"> |
148 | <neon-animatable><div id="hidden"></div></neon-animatable> | 149 | <neon-animatable><div id="hidden"></div></neon-animatable> |
149 | - <neon-animatable> | 150 | + <neon-animatable>--> |
150 | <paper-material elevation="5" id="window" class="window"> | 151 | <paper-material elevation="5" id="window" class="window"> |
151 | <div class="transparent"></div> | 152 | <div class="transparent"></div> |
152 | <paper-toolbar id="toolbar"> | 153 | <paper-toolbar id="toolbar"> |
@@ -155,8 +156,8 @@ | @@ -155,8 +156,8 @@ | ||
155 | </paper-toolbar> | 156 | </paper-toolbar> |
156 | <div id="container_content"><content></content></div> | 157 | <div id="container_content"><content></content></div> |
157 | </paper-material> | 158 | </paper-material> |
158 | - </neon-animatable> | ||
159 | - </neon-animated-pages> | 159 | + <!--</neon-animatable> |
160 | + </neon-animated-pages>--> | ||
160 | 161 | ||
161 | <div id="button_container" class="horizontal layout"> | 162 | <div id="button_container" class="horizontal layout"> |
162 | <span class="button-container" id="open" on-click="_onOpenClick"> | 163 | <span class="button-container" id="open" on-click="_onOpenClick"> |
@@ -249,13 +250,15 @@ | @@ -249,13 +250,15 @@ | ||
249 | _onOpenClick: function() { | 250 | _onOpenClick: function() { |
250 | /*this.entryAnimation = 'fade-in-animation'; | 251 | /*this.entryAnimation = 'fade-in-animation'; |
251 | this.exitAnimation = 'fade-out-animation';*/ | 252 | this.exitAnimation = 'fade-out-animation';*/ |
252 | - this.selected = 1; | 253 | + //this.selected = 1; |
254 | + $(this.$.window).show(); | ||
253 | }, | 255 | }, |
254 | 256 | ||
255 | _onCloseClick: function(){ | 257 | _onCloseClick: function(){ |
256 | /*this.entryAnimation = 'fade-out-animation'; | 258 | /*this.entryAnimation = 'fade-out-animation'; |
257 | this.exitAnimation = 'fade-in-animation';*/ | 259 | this.exitAnimation = 'fade-in-animation';*/ |
258 | - this.selected = 0; | 260 | + //this.selected = 0; |
261 | + $(this.$.window).hide(); | ||
259 | }, | 262 | }, |
260 | 263 | ||
261 | _elementSelected: function(e){ | 264 | _elementSelected: function(e){ |