Commit 7c7222274177f865ceaa2a24adf85c3f24adde4e
Merge branch 'master' of http://service.routetopa.eu:7480/WebCompDev/COMPONENTS
Showing
2 changed files
with
9 additions
and
10 deletions
controllets/create-card-controllet/create-card-controllet.html
| @@ -121,8 +121,6 @@ | @@ -121,8 +121,6 @@ | ||
| 121 | id="create_card_link" | 121 | id="create_card_link" |
| 122 | value="{{link}}" | 122 | value="{{link}}" |
| 123 | label="link" | 123 | label="link" |
| 124 | - auto-validate | ||
| 125 | - pattern="^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$" | ||
| 126 | error-message="Invalid link"> | 124 | error-message="Invalid link"> |
| 127 | </paper-input> | 125 | </paper-input> |
| 128 | 126 | ||
| @@ -219,7 +217,7 @@ | @@ -219,7 +217,7 @@ | ||
| 219 | if (value.indexOf("http") != 0) | 217 | if (value.indexOf("http") != 0) |
| 220 | value = "http://" + value; | 218 | value = "http://" + value; |
| 221 | 219 | ||
| 222 | - if(!link.invalid && value.length > 16) { | 220 | + if(/*!link.invalid &&*/ value.length > 16) { |
| 223 | iframe.setAttribute("src", value); | 221 | iframe.setAttribute("src", value); |
| 224 | this.link = value; | 222 | this.link = value; |
| 225 | this._resize(); | 223 | this._resize(); |
controllets/datalet-selection-controllet/datalet-selection-controllet.html
| @@ -543,16 +543,17 @@ | @@ -543,16 +543,17 @@ | ||
| 543 | }, | 543 | }, |
| 544 | 544 | ||
| 545 | _updateParams : function(){ | 545 | _updateParams : function(){ |
| 546 | + var textarea = this.$.datalet_selection_labels.querySelectorAll("paper-textarea"); | ||
| 547 | + this.params["description"] = textarea[0].value; | ||
| 546 | 548 | ||
| 547 | - var labels = this.$.datalet_selection_labels.querySelectorAll("paper-textarea"); | ||
| 548 | - this.params[labels[0].label] = labels[0].value; | 549 | + if(!textarea[0].value) |
| 550 | + this.params[textarea[0].label] = ""; | ||
| 549 | 551 | ||
| 550 | - if(!labels[0].value) | ||
| 551 | - this.params[labels[0].label] = ""; | 552 | + var inputs = this.$.datalet_selection_labels.querySelectorAll("paper-input"); |
| 553 | + this.params["title"] = inputs[0].value; | ||
| 552 | 554 | ||
| 553 | - var labels = this.$.datalet_selection_labels.querySelectorAll("paper-input"); | ||
| 554 | - for (var i = 0; i < labels.length; i++) | ||
| 555 | - this.params[labels[i].label] = labels[i].value; | 555 | + for (var i = 1; i < inputs.length; i++) |
| 556 | + this.params[this.labels[i-1].name] = inputs[i].value; | ||
| 556 | }, | 557 | }, |
| 557 | 558 | ||
| 558 | _paramsChanged : function(){ | 559 | _paramsChanged : function(){ |