jenkins-bot has submitted this change and it was merged.
Change subject: Don't immediately request data when not saved
......................................................................
Don't immediately request data when not saved
Change-Id: Ie50bd52f2c3bfa4071f44a64af7e884b01239a15
---
M src/app/widgetBase.js
M src/components/widgets/x-by-y/x-by-y.js
2 files changed, 13 insertions(+), 19 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 0e0dff8..2fdf2fd 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -10,12 +10,12 @@
self.retrievedResults = ko.observable();
self.queryStringSQL = ko.observable('This widget hasn\'t
been set up yet!');
- self.config = params.configuration;
+ self.config = params.configuration || {};
self.instanceID = params.widgetInstance;
self.widgetCode = params.widgetCode;
self.preDataLoading = ko.observable(true);
- self.dataLoading = ko.observable(!!self.config);
- self.chartSaved = ko.observable(!!self.config);
+ self.dataLoading =
ko.observable(!!params.configuration);
+ self.chartSaved =
ko.observable(!!params.configuration);
self.optionStateChanged = ko.observable(false);
self.chartWidth = ko.observable('900');
self.chartHeight = ko.observable('550');
diff --git a/src/components/widgets/x-by-y/x-by-y.js
b/src/components/widgets/x-by-y/x-by-y.js
index e12e694..7a42f96 100644
--- a/src/components/widgets/x-by-y/x-by-y.js
+++ b/src/components/widgets/x-by-y/x-by-y.js
@@ -13,17 +13,19 @@
WidgetBase.call( this, params );
var self = this;
- var chartDataCall =
self.getChartData(params.configuration.queryString);
+ if ( self.chartSaved() ) {
+ var chartDataCall =
self.getChartData(self.config.queryString);
- $.when( chartDataCall ).then( function( dataArray ){
- self.retrievedResults(dataArray.results);
- self.dataLoading(false);
- self.preDataLoading(false);
+ $.when( chartDataCall ).then( function( dataArray ){
+ self.retrievedResults(dataArray.results);
+ self.dataLoading(false);
+ self.preDataLoading(false);
- self.chartData =
self.processData(self.retrievedResults(), params.configuration.timeBreakout);
+ self.chartData =
self.processData(self.retrievedResults(), params.configuration.timeBreakout);
- self.makeChart(self.chartData);
- });
+ self.makeChart(self.chartData);
+ });
+ }
self.showSlice = ko.observable();
self.bySlice = ko.observable();
@@ -271,14 +273,6 @@
break;
}
};
-
- if(params.configuration){
- self.chartSaved(true);
- //self.makeChart(self.retrievedResults());
-
- } else {
- self.chartSaved(false);
- }
self.showPanelBody = function(area){
$('#'+area+'body').toggleClass('hide');
--
To view, visit https://gerrit.wikimedia.org/r/195766
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie50bd52f2c3bfa4071f44a64af7e884b01239a15
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
