[gnome-shell] cleanup: Don't add linebreak before operators
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] cleanup: Don't add linebreak before operators
- Date: Mon, 16 Sep 2019 20:41:19 +0000 (UTC)
commit efed695eca2b7339410bed0fe789e8aa515d3618
Author: Florian Müllner <fmuellner gnome org>
Date: Mon Aug 19 21:33:15 2019 +0200
cleanup: Don't add linebreak before operators
When breaking overly long conditions into multiple lines, the operator
should end the previous line instead of starting the new one.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/731
js/ui/boxpointer.js | 4 ++--
js/ui/components/networkAgent.js | 16 ++++++++--------
js/ui/popupMenu.js | 8 ++++----
js/ui/status/network.js | 4 ++--
4 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
index 7da11e1331..285454e642 100644
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -172,8 +172,8 @@ var BoxPointer = GObject.registerClass({
let borderWidth = themeNode.get_length('-arrow-border-width');
minSize += borderWidth * 2;
natSize += borderWidth * 2;
- if ((!isWidth && (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM))
- || (isWidth && (this._arrowSide == St.Side.LEFT || this._arrowSide == St.Side.RIGHT))) {
+ if ((!isWidth && (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM)) ||
+ (isWidth && (this._arrowSide == St.Side.LEFT || this._arrowSide == St.Side.RIGHT))) {
let rise = themeNode.get_length('-arrow-rise');
minSize += rise;
natSize += rise;
diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js
index 9e1063d2b3..2de5128439 100644
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -164,9 +164,9 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
if (value.length == 64) {
// must be composed of hexadecimal digits only
for (let i = 0; i < 64; i++) {
- if (!((value[i] >= 'a' && value[i] <= 'f')
- || (value[i] >= 'A' && value[i] <= 'F')
- || (value[i] >= '0' && value[i] <= '9')))
+ if (!((value[i] >= 'a' && value[i] <= 'f') ||
+ (value[i] >= 'A' && value[i] <= 'F') ||
+ (value[i] >= '0' && value[i] <= '9')))
return false;
}
return true;
@@ -180,15 +180,15 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
if (secret.wep_key_type == NM.WepKeyType.KEY) {
if (value.length == 10 || value.length == 26) {
for (let i = 0; i < value.length; i++) {
- if (!((value[i] >= 'a' && value[i] <= 'f')
- || (value[i] >= 'A' && value[i] <= 'F')
- || (value[i] >= '0' && value[i] <= '9')))
+ if (!((value[i] >= 'a' && value[i] <= 'f') ||
+ (value[i] >= 'A' && value[i] <= 'F') ||
+ (value[i] >= '0' && value[i] <= '9')))
return false;
}
} else if (value.length == 5 || value.length == 13) {
for (let i = 0; i < value.length; i++) {
- if (!((value[i] >= 'a' && value[i] <= 'z')
- || (value[i] >= 'A' && value[i] <= 'Z')))
+ if (!((value[i] >= 'a' && value[i] <= 'z') ||
+ (value[i] >= 'A' && value[i] <= 'Z')))
return false;
}
} else {
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index eb06167068..e26771555b 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -613,8 +613,8 @@ var PopupMenuBase = class {
while (childBeforeIndex >= 0 && !isPopupMenuItemVisible(children[childBeforeIndex]))
childBeforeIndex--;
- if (childBeforeIndex < 0
- || children[childBeforeIndex]._delegate instanceof PopupSeparatorMenuItem) {
+ if (childBeforeIndex < 0 ||
+ children[childBeforeIndex]._delegate instanceof PopupSeparatorMenuItem) {
menuItem.actor.hide();
return;
}
@@ -624,8 +624,8 @@ var PopupMenuBase = class {
while (childAfterIndex < children.length && !isPopupMenuItemVisible(children[childAfterIndex]))
childAfterIndex++;
- if (childAfterIndex >= children.length
- || children[childAfterIndex]._delegate instanceof PopupSeparatorMenuItem) {
+ if (childAfterIndex >= children.length ||
+ children[childAfterIndex]._delegate instanceof PopupSeparatorMenuItem) {
menuItem.actor.hide();
return;
}
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index e7512122a7..575b534c70 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -909,8 +909,8 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
this._client.activate_connection_async(connection, this._device, null, null, null);
} else {
let accessPoints = network.accessPoints;
- if ((accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT)
- || (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) {
+ if ((accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT) ||
+ (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) {
// 802.1x-enabled APs require further configuration, so they're
// handled in gnome-control-center
Util.spawn(['gnome-control-center', 'wifi', 'connect-8021x-wifi',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]