git.iko.soy/unity8
on xenial help sign in
more javascript semi-colons.
9d4a117Nick Dedekind
Panel/IndicatorItem.qml+2−2
compare with xenial
unifiedsplit
@@ -36,11 +36,11 @@ Item {
36 id: loader
36 id: loader
37
37
38 onLoaded: {
38 onLoaded: {
39− item.height = Qt.binding(function() { return indicatorItem.height; })
39+ item.height = Qt.binding(function() { return indicatorItem.height; });
40
40
41 for(var pName in indicatorProperties) {
41 for(var pName in indicatorProperties) {
42 if (item.hasOwnProperty(pName)) {
42 if (item.hasOwnProperty(pName)) {
43− item[pName] = indicatorProperties[pName]
43+ item[pName] = indicatorProperties[pName];
44 }
44 }
45 }
45 }
46 }
46 }
Panel/Indicators/NetworkIndicatorPage.qml+1−1
@@ -57,7 +57,7 @@ PageStack {
57 id: networkAgent
57 id: networkAgent
58
58
59 onSecretRequested: {
59 onSecretRequested: {
60− _network.push(passwordPageComponent)
60+ _network.push(passwordPageComponent);
61 }
61 }
62 }
62 }
63
63
modules/Unity/Indicators/qml/SliderMenu.qml+1−1
@@ -54,7 +54,7 @@ Menu {
54
54
55 // Use this to disable the label, since there is not way to do it on the component.
55 // Use this to disable the label, since there is not way to do it on the component.
56 function formatValue(v) {
56 function formatValue(v) {
57− return ""
57+ return "";
58 }
58 }
59 }
59 }
60
60
modules/Unity/Indicators/qml/messaging/HeroMessage.qml+5−5
@@ -51,17 +51,17 @@ Indicators.BasicMenu {
51
51
52 onAppIconClicked: {
52 onAppIconClicked: {
53 if (action && action.valid) {
53 if (action && action.valid) {
54− deactivateMenu()
54+ deactivateMenu();
55− action.activate(true)
55+ action.activate(true);
56 }
56 }
57 }
57 }
58 }
58 }
59
59
60 onClicked: {
60 onClicked: {
61 if (menuActivated) {
61 if (menuActivated) {
62− deactivateMenu()
62+ deactivateMenu();
63 } else {
63 } else {
64− activateMenu()
64+ activateMenu();
65 }
65 }
66 }
66 }
67
67
@@ -109,7 +109,7 @@ Indicators.BasicMenu {
109
109
110 onItemRemoved: {
110 onItemRemoved: {
111 if (action && action.valid) {
111 if (action && action.valid) {
112− action.activate(false)
112+ action.activate(false);
113 }
113 }
114 }
114 }
115}
115}
modules/Unity/Indicators/qml/messaging/MessageItem.qml+7−7
@@ -77,22 +77,22 @@ Indicators.BasicMenu {
77 {
77 {
78 var parameterType = ""
78 var parameterType = ""
79 for (var actIndex in actionsDescription) {
79 for (var actIndex in actionsDescription) {
80− var desc = actionsDescription[actIndex]
80+ var desc = actionsDescription[actIndex];
81 if (desc["parameter-type"] !== undefined) {
81 if (desc["parameter-type"] !== undefined) {
82− parameterType += desc["parameter-type"]
82+ parameterType += desc["parameter-type"];
83 } else {
83 } else {
84− parameterType += "_"
84+ parameterType += "_";
85 }
85 }
86 }
86 }
87
87
88 if (parameterType === "") {
88 if (parameterType === "") {
89− __contents.source = "SimpleTextMessage.qml"
89+ __contents.source = "SimpleTextMessage.qml";
90 } else if (parameterType === "s") {
90 } else if (parameterType === "s") {
91− __contents.source = "TextMessage.qml"
91+ __contents.source = "TextMessage.qml";
92 } else if (parameterType === "_s") {
92 } else if (parameterType === "_s") {
93− __contents.source = "SnapDecision.qml"
93+ __contents.source = "SnapDecision.qml";
94 } else {
94 } else {
95− console.debug("Unknown paramater type: " + parameterType)
95+ console.debug("Unknown paramater type: " + parameterType);
96 }
96 }
97 }
97 }
98}
98}
modules/Unity/Indicators/qml/messaging/QuickReply.qml+1−1
@@ -109,7 +109,7 @@ Item {
109
109
110 anchors.fill: parent
110 anchors.fill: parent
111 onClicked: {
111 onClicked: {
112− __actionTextField.text = modelData
112+ __actionTextField.text = modelData;
113 }
113 }
114 }
114 }
115
115
modules/Unity/Indicators/qml/messaging/SnapDecision.qml+3−3
@@ -54,9 +54,9 @@ HeroMessage {
54
54
55 onClicked: {
55 onClicked: {
56 if (__quickreply.state === "") {
56 if (__quickreply.state === "") {
57− __quickreply.state = "expanded"
57+ __quickreply.state = "expanded";
58 } else {
58 } else {
59− __quickreply.state = ""
59+ __quickreply.state = "";
60 }
60 }
61 }
61 }
62 }
62 }
@@ -129,7 +129,7 @@ HeroMessage {
129
129
130 onStateChanged: {
130 onStateChanged: {
131 if (state === "") {
131 if (state === "") {
132− __quickreply.state = ""
132+ __quickreply.state = "";
133 }
133 }
134 }
134 }
135}
135}
modules/Unity/Indicators/qml/messaging/utils.js+1−1
@@ -23,5 +23,5 @@
23function formatDate(timestamp) {
23function formatDate(timestamp) {
24 // timestamp is in microseconds since epoch
24 // timestamp is in microseconds since epoch
25 var date = new Date(timestamp / 1000);
25 var date = new Date(timestamp / 1000);
26− return Qt.formatDateTime(date, "hh:mm - MMM dd")
26+ return Qt.formatDateTime(date, "hh:mm - MMM dd");
27}
27}
modules/Unity/Indicators/qml/network/AccessPoint.qml+6−6
@@ -33,19 +33,19 @@ Indicators.Menu {
33 var signalStrength = parseInt(wifiApStrength)
33 var signalStrength = parseInt(wifiApStrength)
34
34
35 if (data.extra.canonical_wifi_ap_is_adhoc) {
35 if (data.extra.canonical_wifi_ap_is_adhoc) {
36− imageName = "nm-adhoc"
36+ imageName = "nm-adhoc";
37 } else if (signalStrength == 0) {
37 } else if (signalStrength == 0) {
38− imageName = "nm-signal-00"
38+ imageName = "nm-signal-00";
39 } else if (signalStrength <= 25) {
39 } else if (signalStrength <= 25) {
40− imageName = "nm-signal-25"
40+ imageName = "nm-signal-25";
41 } else if (signalStrength <= 50) {
41 } else if (signalStrength <= 50) {
42− imageName = "nm-signal-50"
42+ imageName = "nm-signal-50";
43 } else if (signalStrength <= 75) {
43 } else if (signalStrength <= 75) {
44− imageName = "nm-signal-75"
44+ imageName = "nm-signal-75";
45 }
45 }
46
46
47 if (data.extra.canonical_wifi_ap_is_secure) {
47 if (data.extra.canonical_wifi_ap_is_secure) {
48− imageName += "-secure"
48+ imageName += "-secure";
49 }
49 }
50
50
51 return "image://gicon/" + imageName;
51 return "image://gicon/" + imageName;
modules/Unity/Indicators/qml/network/PasswordPage.qml+3−3
@@ -62,7 +62,7 @@ Page {
62 width: units.gu(10)
62 width: units.gu(10)
63 onClicked: {
63 onClicked: {
64 agent.cancel(token);
64 agent.cancel(token);
65− pageStack.pop()
65+ pageStack.pop();
66 }
66 }
67 }
67 }
68
68
@@ -70,8 +70,8 @@ Page {
70 text: "Ok"
70 text: "Ok"
71 width: units.gu(10)
71 width: units.gu(10)
72 onClicked: {
72 onClicked: {
73− agent.authenticate(token, _password.text)
73+ agent.authenticate(token, _password.text);
74− pageStack.pop()
74+ pageStack.pop();
75 }
75 }
76 }
76 }
77 }
77 }