From 4a09d2a64c62946517bafbdf37349375bfe4a5aa Mon Sep 17 00:00:00 2001 From: Peter Henderson Date: Fri, 12 Feb 2016 09:12:24 +0000 Subject: [PATCH 1/2] Removed conflict marker from comment. --- .../java/org/apache/wicket/protocol/ws/WebSocketSettings.java | 1 - 1 file changed, 1 deletion(-) diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java index 68e4b7cfae2..c3fd8adb833 100644 --- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java +++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java @@ -206,7 +206,6 @@ public WebResponse newWebSocketResponse(IWebSocketConnection connection) } /** -<<<<<<< HEAD * A factory method for creating instances of {@link org.apache.wicket.protocol.ws.api.WebSocketRequestHandler} * for processing a web socket request * From 29a0d0927ba738bd0ccc6bc807a7ff07220bb31a Mon Sep 17 00:00:00 2001 From: Peter Henderson Date: Fri, 8 Jul 2016 10:59:40 +0100 Subject: [PATCH 2/2] BugFix: Ajax add header style sheet link mangles it. --- .../apache/wicket/ajax/res/js/wicket-ajax-jquery.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js index 55e6e61828c..e1f90ac6ae7 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js @@ -2117,11 +2117,11 @@ // create link element var css = Wicket.Head.createElement("link"); - // copy required attributes - css.id = node.getAttribute("id"); - css.rel = node.getAttribute("rel"); - css.href = node.getAttribute("href"); - css.type = node.getAttribute("type"); + // copy supplied attributes only. + for (var attrIdx = 0; attrIdx < node.attributes.length; attrIdx++) { + var attr = node.attributes[attrIdx]; + css.setAttribute(attr.name, attr.value) + } // add element to head Wicket.Head.addElement(css);