From d38625ce2af28703e67eb9c806c75e45f50ef03b Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Thu, 8 Sep 2016 18:16:32 -0700 Subject: [PATCH] Coding standard fix for JS portions of QML. Semicolons at end of line. --- interface/resources/qml/controls/Key.qml | 36 +++++++++---------- interface/resources/qml/controls/Keyboard.qml | 8 ++--- interface/resources/qml/controls/WebView.qml | 4 +-- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/interface/resources/qml/controls/Key.qml b/interface/resources/qml/controls/Key.qml index 1cd6105b66..2218474936 100644 --- a/interface/resources/qml/controls/Key.qml +++ b/interface/resources/qml/controls/Key.qml @@ -10,11 +10,11 @@ Item { property alias mouseArea: mouseArea1 function resetToggledMode(mode) { - toggled = mode + toggled = mode; if (toggled) { - state = "mouseDepressed" + state = "mouseDepressed"; } else { - state = "" + state = ""; } } @@ -26,52 +26,52 @@ Item { onCanceled: { if (toggled) { - keyItem.state = "mouseDepressed" + keyItem.state = "mouseDepressed"; } else { - keyItem.state = "" + keyItem.state = ""; } } onClicked: { - mouse.accepted = true - webEntity.synthesizeKeyPress(glyph) + mouse.accepted = true; + webEntity.synthesizeKeyPress(glyph); if (toggle) { - toggled = !toggled + toggled = !toggled; } } onDoubleClicked: { - mouse.accepted = true + mouse.accepted = true; } onEntered: { - keyItem.state = "mouseOver" + keyItem.state = "mouseOver"; } onExited: { if (toggled) { - keyItem.state = "mouseDepressed" + keyItem.state = "mouseDepressed"; } else { - keyItem.state = "" + keyItem.state = ""; } } onPressed: { - keyItem.state = "mouseClicked" - mouse.accepted = true + keyItem.state = "mouseClicked"; + mouse.accepted = true; } onReleased: { if (containsMouse) { - keyItem.state = "mouseOver" + keyItem.state = "mouseOver"; } else { if (toggled) { - keyItem.state = "mouseDepressed" + keyItem.state = "mouseDepressed"; } else { - keyItem.state = "" + keyItem.state = ""; } } - mouse.accepted = true + mouse.accepted = true; } } diff --git a/interface/resources/qml/controls/Keyboard.qml b/interface/resources/qml/controls/Keyboard.qml index a6d57393a6..eb34740402 100644 --- a/interface/resources/qml/controls/Keyboard.qml +++ b/interface/resources/qml/controls/Keyboard.qml @@ -7,8 +7,8 @@ Item { property bool shiftMode: false function resetShiftMode(mode) { - shiftMode = mode - shiftKey.resetToggledMode(mode) + shiftMode = mode; + shiftKey.resetToggledMode(mode); } function toUpper(str) { @@ -59,7 +59,7 @@ Item { function alphaKeyClickedHandler(mouseArea) { // reset shift mode to false after first keypress if (shiftMode) { - resetShiftMode(false) + resetShiftMode(false); } } @@ -333,7 +333,7 @@ Item { width: 89 glyph: "&123" mouseArea.onClicked: { - keyboardBase.parent.punctuationMode = true + keyboardBase.parent.punctuationMode = true; } } diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml index 35a4e1f7e4..2f7a668d65 100644 --- a/interface/resources/qml/controls/WebView.qml +++ b/interface/resources/qml/controls/WebView.qml @@ -44,13 +44,13 @@ Item { webChannel.registeredObjects: [eventBridgeWrapper] Component.onCompleted: { - console.log("Connecting JS messaging to Hifi Logging") + console.log("Connecting JS messaging to Hifi Logging"); // Ensure the JS from the web-engine makes it to our logging root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) { console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " + message); }); - root.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)" + root.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)"; } // FIXME hack to get the URL with the auth token included. Remove when we move to Qt 5.6