Commit 59190a9b61580f4524d6bd5c33f6b0b10a0e136d
1 parent
364c05d3
update
Showing
6 changed files
with
31 additions
and
23 deletions
controllets/animated-button-container-controllet/animated-button-container-controllet.html
| ... | ... | @@ -135,8 +135,9 @@ |
| 135 | 135 | }, |
| 136 | 136 | |
| 137 | 137 | ready: function(){ |
| 138 | - this.$.window.style.height = this.height; | |
| 139 | - this.$.window.style.width = this.width; | |
| 138 | + this.$.window.style.height = this.height + "vh"; | |
| 139 | + this.$.window.style.width = this.width + "vw"; | |
| 140 | + this.$.close.style.left = (this.width - 1) + "vw" | |
| 140 | 141 | }, |
| 141 | 142 | |
| 142 | 143 | _onOpenClick: function() { |
| ... | ... |
controllets/create-card-controllet/create-card-controllet.html
| ... | ... | @@ -268,8 +268,8 @@ |
| 268 | 268 | ' width="300"' + |
| 269 | 269 | ' height="300"' + |
| 270 | 270 | ' type="'+ this.type + '"' + |
| 271 | - ' text="'+ this.comment + '"' + | |
| 272 | - ' legend="'+ this.title + '">'; | |
| 271 | + ' comment="'+ this.comment + '"' + | |
| 272 | + ' title="'+ this.title + '">'; | |
| 273 | 273 | if(this.type == 'link'){ |
| 274 | 274 | card += '<preview-datalet data-url="'+ this.link + '" url="'+ this.link + '"></preview-datalet>'; |
| 275 | 275 | }else{ |
| ... | ... |
controllets/data-sevc-controllet/data-sevc-controllet.html
| ... | ... | @@ -460,7 +460,7 @@ Example: |
| 460 | 460 | </paper-material> |
| 461 | 461 | |
| 462 | 462 | <div id="comment"> |
| 463 | - <paper-textarea class="custom_textarea" id="commentArea" label="Max 100 character comment" maxlength="100"></paper-textarea> | |
| 463 | + <paper-textarea class="custom_textarea" id="commentArea" label="Max 100 characters comment" maxlength="100"></paper-textarea> | |
| 464 | 464 | </div> |
| 465 | 465 | |
| 466 | 466 | </div> |
| ... | ... | @@ -722,9 +722,9 @@ Example: |
| 722 | 722 | if(this.selectedDatalet == undefined) |
| 723 | 723 | /* this.$.visualization_slider_area.innerHTML = '<items-slider-controllet items=\'' + JSON.stringify(this.datalets_list) + '\'' + |
| 724 | 724 | '\'></items-slider-controllet>';*/ |
| 725 | - this.$.visualization_slider_area.innerHTML = '<animated-button-container-controllet height="70vh" width="50vw">' + | |
| 726 | - '<items-list-controllet height="70vh"' + | |
| 727 | - ' width="50vw"' + | |
| 725 | + this.$.visualization_slider_area.innerHTML = '<animated-button-container-controllet height="70" width="50">' + | |
| 726 | + '<items-list-controllet height="70"' + | |
| 727 | + ' width="50"' + | |
| 728 | 728 | ' replace-string="-datalet"' + |
| 729 | 729 | ' items=\'' + JSON.stringify(this.datalets_list) + '\'>' + |
| 730 | 730 | '</items-list-controllet>' + |
| ... | ... | @@ -733,9 +733,9 @@ Example: |
| 733 | 733 | /*this.$.visualization_slider_area.innerHTML = '<items-slider-controllet items=\'' + JSON.stringify(this.datalets_list) + '\'' + |
| 734 | 734 | 'selected-card=\'' + this.selectedDatalet + '\'></items-slider-controllet>';*/ |
| 735 | 735 | |
| 736 | - this.$.visualization_slider_area.innerHTML = '<animated-button-container-controllet height="50vh" width="30vw">' + | |
| 737 | - '<items-list-controllet height="50vh"' + | |
| 738 | - ' width="30vw"' + | |
| 736 | + this.$.visualization_slider_area.innerHTML = '<animated-button-container-controllet height="50" width="30">' + | |
| 737 | + '<items-list-controllet height="50"' + | |
| 738 | + ' width="30"' + | |
| 739 | 739 | ' replace-string="-datalet"' + |
| 740 | 740 | ' selected-card=\'' + this.selectedDatalet + '\'' + |
| 741 | 741 | ' items=\'' + JSON.stringify(this.datalets_list) + '\'>' + |
| ... | ... | @@ -1012,6 +1012,7 @@ Example: |
| 1012 | 1012 | */ |
| 1013 | 1013 | _textElementChanged : function(e){ |
| 1014 | 1014 | if(this.selected == 3) { |
| 1015 | + this.generateDataletPreview(); | |
| 1015 | 1016 | this.injectDatalet(this.$.datalet_placeholder_2); |
| 1016 | 1017 | } |
| 1017 | 1018 | }, |
| ... | ... |
controllets/items-list-controllet/item-list-controllet.html
| ... | ... | @@ -179,8 +179,8 @@ Example: |
| 179 | 179 | }, |
| 180 | 180 | |
| 181 | 181 | ready : function(){ |
| 182 | - this.$.container.style.height = this.height; | |
| 183 | - this.$.container.style.width = this.width; | |
| 182 | + this.$.container.style.height = this.height + "vh"; | |
| 183 | + this.$.container.style.width = this.width + "vw"; | |
| 184 | 184 | |
| 185 | 185 | $(this.$.container).perfectScrollbar(); |
| 186 | 186 | |
| ... | ... |
controllets/paper-card-controllet/paper-card-controllet.html
| ... | ... | @@ -33,7 +33,7 @@ |
| 33 | 33 | height: 21px; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - .legend { | |
| 36 | + .title { | |
| 37 | 37 | position: relative; |
| 38 | 38 | top: -50px; |
| 39 | 39 | background: rgba(0,0,0,0.8); |
| ... | ... | @@ -103,10 +103,10 @@ |
| 103 | 103 | <content></content> |
| 104 | 104 | </div> |
| 105 | 105 | |
| 106 | - <template is="dom-if" if="{{legend}}"> | |
| 106 | + <template is="dom-if" if="{{title}}"> | |
| 107 | 107 | |
| 108 | - <div class="legend horizontal layout center"> | |
| 109 | - <span>{{legend}}</span> | |
| 108 | + <div class="title horizontal layout center"> | |
| 109 | + <span>{{title}}</span> | |
| 110 | 110 | <!-- Adding icon based on card type --> |
| 111 | 111 | |
| 112 | 112 | <template is="dom-if" if="{{checkType(type, 'text')}}"> |
| ... | ... | @@ -138,8 +138,8 @@ |
| 138 | 138 | </template> |
| 139 | 139 | |
| 140 | 140 | <div class="footer"> |
| 141 | - <template is="dom-if" if="{{text}}"> | |
| 142 | - <div id="text">{{text}}</div> | |
| 141 | + <template is="dom-if" if="{{comment}}"> | |
| 142 | + <div id="comment">{{comment}}</div> | |
| 143 | 143 | </template> |
| 144 | 144 | </div> |
| 145 | 145 | |
| ... | ... | @@ -166,11 +166,11 @@ |
| 166 | 166 | type: String, |
| 167 | 167 | value: "text" |
| 168 | 168 | }, |
| 169 | - text:{ | |
| 169 | + comment:{ | |
| 170 | 170 | type: String, |
| 171 | 171 | value: "" |
| 172 | 172 | }, |
| 173 | - legend:{ | |
| 173 | + title:{ | |
| 174 | 174 | type: String, |
| 175 | 175 | value: "" |
| 176 | 176 | }, |
| ... | ... |
controllets/search-panel-controllet/search-panel-controllet.html
| ... | ... | @@ -79,7 +79,7 @@ Example: |
| 79 | 79 | <div class="horizontal layout"> |
| 80 | 80 | <neon-animated-pages selected="[[selected]]" entry-animation="[[entryAnimation]]" exit-animation="[[exitAnimation]]"> |
| 81 | 81 | <neon-animatable></neon-animatable> |
| 82 | - <neon-animatable><paper-input class="search-text" label="search" autosave="search_text" results="5" transition="fade-in-animation"></paper-input></neon-animatable> | |
| 82 | + <neon-animatable><paper-input class="search-text" label="search" autosave="search_text" results="5" transition="fade-in-animation" value="{{searchKey}}"></paper-input></neon-animatable> | |
| 83 | 83 | </neon-animated-pages> |
| 84 | 84 | <paper-icon-button icon="search" class="dropdown-trigger" on-click="_toggleClick"></paper-icon-button> |
| 85 | 85 | </div> |
| ... | ... | @@ -114,6 +114,12 @@ Example: |
| 114 | 114 | exitAnimation : { |
| 115 | 115 | type: String, |
| 116 | 116 | value: "" |
| 117 | + }, | |
| 118 | + searchKey:{ | |
| 119 | + type: String, | |
| 120 | + value: undefined, | |
| 121 | + observer: "_valueChanged" | |
| 122 | + | |
| 117 | 123 | } |
| 118 | 124 | }, |
| 119 | 125 | _toggleClick: function(e){ |
| ... | ... | @@ -136,7 +142,7 @@ Example: |
| 136 | 142 | */ |
| 137 | 143 | _valueChanged : function(oldvalue, newValue){ |
| 138 | 144 | clearTimeout (this.timer); |
| 139 | - this.timer = setTimeout(this.fire('text-element-controllet_content-changed', {newValue: newValue}), 2000); | |
| 145 | + this.timer = setTimeout(this.fire('search-panel-controllet_content-changed', {searchKey: this.searchKey}), 500); | |
| 140 | 146 | }, |
| 141 | 147 | /** |
| 142 | 148 | * It returns the value in text area |
| ... | ... |