git.iko.soy/unity8
on xenial help sign in
changes to the way the rating is stored
commited4397dc2109483febdfba7ce45272110393939e authorAndrea Cimitan <andrea.cimitan@gmail.com> dateFri 12 Aug 2016, 14:03 (10 years ago) parent48520a7
2 files changed+18−9
compare with xenial
unifiedsplit
qml/Dash/Previews/PreviewCommentInput.qml+2−3 qml/Dash/Previews/PreviewRatingInput.qml+16−6
qml/Dash/Previews/PreviewCommentInput.qml+2−3
@@ -41,12 +41,11 @@ PreviewWidget {
4141 onWidgetIdChanged: restoreCommentState()
4242
4343 function storeCommentState() {
44− PreviewSingleton.widgetExtraData[widgetId] = [ commentText, commentTextArea.focus ];
44+ PreviewSingleton.widgetExtraData[widgetId] = commentText;
4545 }
4646
4747 function restoreCommentState() {
48− if (PreviewSingleton.widgetExtraData[widgetId][0] != "") commentText = PreviewSingleton.widgetExtraData[widgetId][0];
49− if (PreviewSingleton.widgetExtraData[widgetId][1]) root.makeSureVisible(commentTextArea);
48+ if (PreviewSingleton.widgetExtraData[widgetId] != "") commentText = PreviewSingleton.widgetExtraData[widgetId];
5049 }
5150
5251 TextArea {
qml/Dash/Previews/PreviewRatingInput.qml+16−6
@@ -54,18 +54,28 @@ PreviewWidget {
5454 property alias ratingValue: rating.value
5555 property alias reviewText: reviewTextArea.text
5656
57− onRatingValueChanged: storeReviewState()
58− onReviewTextChanged: storeReviewState()
57+ onRatingValueChanged: storeRatingState()
58+ onReviewTextChanged: storeTextState()
5959 onWidgetIdChanged: restoreReviewState()
6060
61− function storeReviewState() {
62− PreviewSingleton.widgetExtraData[widgetId] = [ ratingValue, reviewText, reviewTextArea.focus ];
61+ function initializeWidgetExtraData() {
62+ if (typeof(PreviewSingleton.widgetExtraData[widgetId]) == "undefined") PreviewSingleton.widgetExtraData[widgetId] = [];
63+ }
64+
65+ function storeRatingState() {
66+ initializeWidgetExtraData();
67+ PreviewSingleton.widgetExtraData[widgetId][0] = ratingValue;
68+ }
69+
70+ function storeTextState() {
71+ initializeWidgetExtraData();
72+ PreviewSingleton.widgetExtraData[widgetId][1] = reviewText;
6373 }
6474
6575 function restoreReviewState() {
76+ if (!PreviewSingleton.widgetExtraData[widgetId]) return;
6677 if (PreviewSingleton.widgetExtraData[widgetId][0] > 0) ratingValue = PreviewSingleton.widgetExtraData[widgetId][0];
6778 if (PreviewSingleton.widgetExtraData[widgetId][1] != "") reviewText = PreviewSingleton.widgetExtraData[widgetId][1];
68− if (PreviewSingleton.widgetExtraData[widgetId][2]) root.makeSureVisible(reviewTextArea);
6979 }
7080
7181 function submit() {
@@ -104,7 +114,7 @@ PreviewWidget {
104114 size: 5
105115 height: units.gu(4)
106116 onValueChanged: {
107− if (widgetData["visible"] === "rating") root.submit();
117+ if (widgetData && widgetData["visible"] === "rating") root.submit();
108118 }
109119
110120 property var urlIconEmpty: widgetData["rating-icon-empty"] || "image://theme/non-starred"