Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172938
Change subject: Reset form when modal is reopened
......................................................................
Reset form when modal is reopened
Change-Id: Ibf3e28ce978a3010920576a17a14a35d11daab4d
---
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
2 files changed, 13 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/38/172938/1
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index 777aacd..3839ade 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -40,7 +40,7 @@
</div>
<div class="modal-body">
- <form role="form">
+ <form role="form" class="fraudForm">
<div class="form-group">
<div class="well">
<label
for="fraudPercentSlider">Fraud Percent Ranges</label>
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index fe2a07e..995a690 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -153,7 +153,7 @@
} else {
qs += filterObj[el];
}
- //qs += ' and ';
+ qs += ' and ';
});
//convert time constraints
@@ -190,7 +190,7 @@
postQS = ds;
}
- return qs;
+ return postQS;
};
self.showSubfilters = function(stuff){
@@ -198,10 +198,19 @@
};
self.resetGaugeSettings = function(){
+
+ //reset gauge settings to defaults
self.greenRange({low: 0, high: 33});
self.yellowRange({low: 33, high: 66});
self.redRange({low: 66, high: 100});
- $('#timePeriodSelection').reset();
+
+ //reset datepicker
+ $("#timePeriodDropdown option:eq(0)").prop("selected", true);
+
+ //reset filters
+ $('.subfilterSubnav').addClass('hide');
+ $('input:checkbox').removeAttr('checked');
+
};
self.submitGaugeModifications = function(){
@@ -267,7 +276,6 @@
});
});
}
-
};
--
To view, visit https://gerrit.wikimedia.org/r/172938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf3e28ce978a3010920576a17a14a35d11daab4d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
