git.iko.soy/unity8
on xenial help sign in
Don't signal for "purchaseCancelled" to avoid preview refreshing.
commitc7a8e4bb25554c929c3857a5f180f7d05e5ef9a7 authorRodney Dawes <rodney.dawes@canonical.com> dateThu 18 Sep 2014, 09:43 (12 years ago) parente3946ee
2 files changed+12−6
compare with xenial
unifiedsplit
qml/Dash/Previews/PreviewPayments.qml+3−1 tests/qmltests/Dash/Previews/tst_PreviewPayments.qml+9−5
qml/Dash/Previews/PreviewPayments.qml+3−1
@@ -65,7 +65,9 @@ PreviewWidget {
6565 }
6666 onPurchaseCancelled: {
6767 paymentButton.opacity = 1;
68− root.triggered(widgetId, "purchaseCancelled", source);
68+ // DO NOT emit the signal right now, as it causes a new
69+ // preview to be requested, when that is not what we want.
70+ //root.triggered(widgetId, "purchaseCancelled", source);
6971 }
7072 }
7173 }
tests/qmltests/Dash/Previews/tst_PreviewPayments.qml+9−5
@@ -183,12 +183,16 @@ Rectangle {
183183 tryCompare(button, "opacity", 0);
184184
185185 paymentClient.process();
186− spy.wait();
187186
188− var args = spy.signalArguments[0];
189− compare(args[0], "previewPayments");
190− compare(args[1], "purchaseCancelled");
191− compare(args[2], jsonPurchaseCancel["source"]);
187+ // Signal is not used at the moment, to avoid preview refresh.
188+ /*
189+ *spy.wait();
190+ *
191+ * var args = spy.signalArguments[0];
192+ * compare(args[0], "previewPayments");
193+ * compare(args[1], "purchaseCancelled");
194+ * compare(args[2], jsonPurchaseCancel["source"]);
195+ */
192196
193197 tryCompare(progress, "visible", false);
194198 tryCompare(progress, "opacity", 0);