Commit 1708039c9457edfe9f3079bed5db2993e51f5f61
Merge branch 'master' of http://service.routetopa.eu:7480/WebCompDev/COMPONENTS
Showing
2 changed files
with
1 additions
and
31 deletions
controllets/fullsize-page-with-card-controllet/fullsize-page-with-card-controllet.html
| @@ -38,7 +38,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN | @@ -38,7 +38,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN | ||
| 38 | <div id="fixed" class="fixed" style$="background-color:{{color}}"></div> | 38 | <div id="fixed" class="fixed" style$="background-color:{{color}}"></div> |
| 39 | <div id="card" class="card" style$="background-color:{{color}}"> | 39 | <div id="card" class="card" style$="background-color:{{color}}"> |
| 40 | <template is="dom-if" if="{{_checkUndefined(publicRoom)}}"> | 40 | <template is="dom-if" if="{{_checkUndefined(publicRoom)}}"> |
| 41 | - <iframe id="public_room_iframe" src="public-room/{{publicRoom}}" width="100%" height="100%"></iframe> | 41 | + <iframe id="public_room_iframe" src="/public-room/{{publicRoom}}" width="100%" height="100%"></iframe> |
| 42 | </template> | 42 | </template> |
| 43 | </div> | 43 | </div> |
| 44 | 44 |
datalets/scatterchart-datalet/scatterchart-datalet.html
| @@ -119,36 +119,6 @@ Example: | @@ -119,36 +119,6 @@ Example: | ||
| 119 | title: { | 119 | title: { |
| 120 | text: "" + this._component.title | 120 | text: "" + this._component.title |
| 121 | }, | 121 | }, |
| 122 | - subtitle: { | ||
| 123 | - text: "" + this._component.subTitle | ||
| 124 | - }, | ||
| 125 | - /* xAxis: { | ||
| 126 | - categories: this.properties.categories.value, | ||
| 127 | - title: { | ||
| 128 | - enabled: true, | ||
| 129 | - text: this._component.xAxisLabel, | ||
| 130 | - startOnTick: true, | ||
| 131 | - endOnTick: true, | ||
| 132 | - showLastLabel: true | ||
| 133 | - } | ||
| 134 | - },*/ | ||
| 135 | - /* yAxis: { | ||
| 136 | - categories: this.properties.categories.value, | ||
| 137 | - title: { | ||
| 138 | - text: this._component.yAxisLabel | ||
| 139 | - } | ||
| 140 | - },*/ | ||
| 141 | - /*legend: { | ||
| 142 | - layout: 'vertical', | ||
| 143 | - align: 'bottom', | ||
| 144 | - verticalAlign: 'top', | ||
| 145 | - x: -40, | ||
| 146 | - y: 100, | ||
| 147 | - floating: true, | ||
| 148 | - backgroundColor: (Highcharts.theme && Highcharts.theme.legendBackgroundColor) || '#FFFFFF', | ||
| 149 | - borderWidth: 1, | ||
| 150 | - shadow: true | ||
| 151 | - },*/ | ||
| 152 | plotOptions: { | 122 | plotOptions: { |
| 153 | scatter: { | 123 | scatter: { |
| 154 | marker: { | 124 | marker: { |