You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2019/03/15 06:52:32 UTC

[wicket] branch wicket-7.x updated: WICKET-6645 Replace double quotes with single quotes

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch wicket-7.x
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/wicket-7.x by this push:
     new 17e8451  WICKET-6645 Replace double quotes with single quotes
17e8451 is described below

commit 17e8451b1440f16163dd3cf7a0a5ffefe89b9ff9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Fri Mar 15 08:51:06 2019 +0200

    WICKET-6645 Replace double quotes with single quotes
    
    To make their usage consistent in the file, and to make it easier to apply the next changes from the "patch" in WICKET-6645
---
 .../ws/api/res/js/wicket-websocket-jquery.js       | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js
index d8062c2..e905571 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js
@@ -23,16 +23,16 @@
 	'use strict';
 
 	if (typeof(Wicket) === 'undefined' || typeof(Wicket.Ajax) === 'undefined') {
-		throw "Wicket.WebSocket needs wicket-ajax.js as prerequisite.";
+		throw 'Wicket.WebSocket needs wicket-ajax.js as prerequisite.';
 	}
 
 	jQuery.extend(Wicket.Event.Topic, {
 		WebSocket: {
-			Opened:       "/websocket/open",
-			Message:      "/websocket/message",
-			Closed:       "/websocket/closed",
-			Error:        "/websocket/error",
-			NotSupported: "/websocket/notsupported"
+			Opened:       '/websocket/open',
+			Message:      '/websocket/message',
+			Closed:       '/websocket/closed',
+			Error:        '/websocket/error',
+			NotSupported: '/websocket/notsupported'
 		}
 	});
 
@@ -60,9 +60,9 @@
 					.replace('http:', 'ws:');
 
 				if ('wss:' === protocol) {
-					_port = securePort ? ":" + securePort : '';
+					_port = securePort ? ':' + securePort : '';
 				} else {
-					_port = port ? ":" + port : '';
+					_port = port ? ':' + port : '';
 				}
 				url = protocol + '//' + document.location.hostname + _port + WWS.contextPath + WWS.filterPrefix + '/wicket/websocket';
 
@@ -116,21 +116,21 @@
 
 		send: function (text) {
 			if (this.ws && text) {
-				Wicket.Log.info("[WebSocket.send] Sending: " + text);
+				Wicket.Log.info('[WebSocket.send] Sending: ' + text);
 				this.ws.send(text);
 			} else if (!text) {
-				Wicket.Log.error("[WebSocket.send] Cannot send an empty text message!");
+				Wicket.Log.error('[WebSocket.send] Cannot send an empty text message!');
 			} else {
-				Wicket.Log.error("[WebSocket.send] No open WebSocket connection! Cannot send text message: " + text);
+				Wicket.Log.error('[WebSocket.send] No open WebSocket connection! Cannot send text message: ' + text);
 			}
 		},
 
 		close: function () {
 			if (this.ws) {
 				this.ws.close();
-				Wicket.Log.info("[WebSocket.close] Connection closed.");
+				Wicket.Log.info('[WebSocket.close] Connection closed.');
 			} else {
-				Wicket.Log.info("[WebSocket.close] Connection already closed.");
+				Wicket.Log.info('[WebSocket.close] Connection already closed.');
 			}
 		}
 	};
@@ -145,7 +145,7 @@
 		if (Wicket.WebSocket.INSTANCE) {
 			Wicket.WebSocket.INSTANCE.send(text);
 		} else {
-			Wicket.Log.error("[WebSocket.send] No default connection available!");
+			Wicket.Log.error('[WebSocket.send] No default connection available!');
 		}
 	};
 
@@ -154,7 +154,7 @@
 			Wicket.WebSocket.INSTANCE.close();
 			delete Wicket.WebSocket.INSTANCE;
 		} else {
-			Wicket.Log.info("[WebSocket.close] No default connection to close.");
+			Wicket.Log.info('[WebSocket.close] No default connection to close.');
 		}
 	};