Commit ec5b09255e607d4b758382d547fccc4c4f0c4afa

Authored by isisadmin
1 parent 5e31b047

datalet chaching mechanism

datalets/barchart-datalet/barchart-datalet.html
@@ -50,7 +50,7 @@ Example: @@ -50,7 +50,7 @@ Example:
50 50
51 <dom-module name="barchart-datalet"> 51 <dom-module name="barchart-datalet">
52 <template> 52 <template>
53 - <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}"></highcharts-datalet> 53 + <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></highcharts-datalet>
54 </template> 54 </template>
55 <script> 55 <script>
56 56
datalets/column3Dchart-datalet/column3Dchart-datalet.html
@@ -59,7 +59,7 @@ Example: @@ -59,7 +59,7 @@ Example:
59 <tr><td>Alpha Angle</td><td><input id="R0" type="range" min="0" max="45" value="15"/> <span id="R0-value" class="value"></span></td></tr> 59 <tr><td>Alpha Angle</td><td><input id="R0" type="range" min="0" max="45" value="15"/> <span id="R0-value" class="value"></span></td></tr>
60 <tr><td>Beta Angle</td><td><input id="R1" type="range" min="0" max="45" value="15"/> <span id="R1-value" class="value"></span></td></tr> 60 <tr><td>Beta Angle</td><td><input id="R1" type="range" min="0" max="45" value="15"/> <span id="R1-value" class="value"></span></td></tr>
61 </table> 61 </table>
62 - <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}"></highcharts-datalet> 62 + <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></highcharts-datalet>
63 </template> 63 </template>
64 64
65 <script> 65 <script>
datalets/columnchart-datalet/columnchart-datalet.html
@@ -50,7 +50,7 @@ Example: @@ -50,7 +50,7 @@ Example:
50 50
51 <dom-module id="columnchart-datalet"> 51 <dom-module id="columnchart-datalet">
52 <template> 52 <template>
53 - <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}"></highcharts-datalet> 53 + <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></highcharts-datalet>
54 </template> 54 </template>
55 <script> 55 <script>
56 56
datalets/datatable-datalet/datatable-datalet.html
@@ -54,7 +54,7 @@ Example: @@ -54,7 +54,7 @@ Example:
54 54
55 <table id="datatable" class="table table-striped table-bordered" cellspacing="0" style="height: auto; width: auto;"> 55 <table id="datatable" class="table table-striped table-bordered" cellspacing="0" style="height: auto; width: auto;">
56 </table> 56 </table>
57 - <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}"></base-ajax-json-jsonpath-datalet> 57 + <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></base-ajax-json-jsonpath-datalet>
58 </template> 58 </template>
59 59
60 <script src="js/DataTables-master/media/js/jquery.dataTables.js"></script> 60 <script src="js/DataTables-master/media/js/jquery.dataTables.js"></script>
datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.html
@@ -50,7 +50,7 @@ Example: @@ -50,7 +50,7 @@ Example:
50 --> 50 -->
51 <dom-module id="donutpie3dchart-datalet"> 51 <dom-module id="donutpie3dchart-datalet">
52 <template> 52 <template>
53 - <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}"></highcharts-datalet> 53 + <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></highcharts-datalet>
54 </template> 54 </template>
55 <script> 55 <script>
56 56
datalets/leafletjs-datalet/leafletjs-datalet.html
@@ -56,7 +56,7 @@ Example: @@ -56,7 +56,7 @@ Example:
56 </style> 56 </style>
57 57
58 <div id="leafletjs"></div> 58 <div id="leafletjs"></div>
59 - <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}"></base-ajax-json-jsonpath-datalet> 59 + <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></base-ajax-json-jsonpath-datalet>
60 60
61 </template> 61 </template>
62 62
@@ -86,7 +86,7 @@ Example: @@ -86,7 +86,7 @@ Example:
86 86
87 var marker = L.marker([coordinates[i][0], coordinates[i][1]]).addTo(this._component.map); 87 var marker = L.marker([coordinates[i][0], coordinates[i][1]]).addTo(this._component.map);
88 88
89 - if(this.data.length > 1) 89 + if(this.data.length > 2)
90 { 90 {
91 if(this.data[this.data.length - 1].data[i].match(new RegExp("^(http[s]?:\\/\\/(www\\.)?|ftp:\\/\\/(www\\.)?|www\\.){1}([0-9A-Za-z-\\.@:%_\+~#=]+)+((\\.[a-zA-Z]{2,3})+)(/(.)*)?(\\?(.)*)?"))) 91 if(this.data[this.data.length - 1].data[i].match(new RegExp("^(http[s]?:\\/\\/(www\\.)?|ftp:\\/\\/(www\\.)?|www\\.){1}([0-9A-Za-z-\\.@:%_\+~#=]+)+((\\.[a-zA-Z]{2,3})+)(/(.)*)?(\\?(.)*)?")))
92 var popup = L.popup().setContent('<image height="100" width="100" src="' + this.data[this.data.length - 1].data[i] + '" />'); 92 var popup = L.popup().setContent('<image height="100" width="100" src="' + this.data[this.data.length - 1].data[i] + '" />');
datalets/treemap-datalet/treemap-datalet.html
@@ -105,7 +105,7 @@ Example: @@ -105,7 +105,7 @@ Example:
105 } 105 }
106 </style> 106 </style>
107 <div id="treemap_placeholder"></div> 107 <div id="treemap_placeholder"></div>
108 - <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}"></base-ajax-json-jsonpath-datalet> 108 + <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></base-ajax-json-jsonpath-datalet>
109 </template> 109 </template>
110 110
111 <script src="../shared_js/d3.js"></script> 111 <script src="../shared_js/d3.js"></script>