[GitHub] wicket pull request #343: [WICKET-6617] headers are added to header-items if...
Github user solomax closed the pull request at: https://github.com/apache/wicket/pull/343 ---
[GitHub] wicket pull request #343: [WICKET-6617] headers are added to header-items if...
Github user solomax commented on a diff in the pull request: https://github.com/apache/wicket/pull/343#discussion_r238202582 --- Diff: wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js --- @@ -2116,10 +2116,15 @@ // Adds the element to page head addElement: function (element) { - var head = document.getElementsByTagName("head"); + var headItems = document.querySelector('head meta[name="wicket.header.items"]'); --- End diff -- According to this table [1] `querySelector` is being supported by all browsers ... [1] https://developer.mozilla.org/en-US/docs/Web/API/Document/querySelector#Browser_Compatibility ---
[GitHub] wicket pull request #343: [WICKET-6617] headers are added to header-items if...
Github user svenmeier commented on a diff in the pull request: https://github.com/apache/wicket/pull/343#discussion_r238201851 --- Diff: wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js --- @@ -2116,10 +2116,15 @@ // Adds the element to page head addElement: function (element) { - var head = document.getElementsByTagName("head"); + var headItems = document.querySelector('head meta[name="wicket.header.items"]'); --- End diff -- Seems we haven't used querySelector() before - are we increasing the minimum supported browser version with this? ---
[GitHub] wicket pull request #343: [WICKET-6617] headers are added to header-items if...
Github user svenmeier commented on a diff in the pull request: https://github.com/apache/wicket/pull/343#discussion_r238198570 --- Diff: wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java --- @@ -161,19 +161,19 @@ public final void onComponentTagBody(MarkupStream markupStream, ComponentTag ope final StringResponse response = new StringResponse(); getRequestCycle().setResponse(response); - IHeaderResponse headerResponse = getHeaderResponse(); - if (!response.equals(headerResponse.getResponse())) - { - getRequestCycle().setResponse(headerResponse.getResponse()); - } + try (IHeaderResponse headerResponse = getHeaderResponse()) { + if (!response.equals(headerResponse.getResponse())) + { + getRequestCycle().setResponse(headerResponse.getResponse()); + } - // Render the header sections of all components on the page - AbstractHeaderRenderStrategy.get().renderHeader(this, - new HeaderStreamState(markupStream, openTag), getPage()); + // Render the header sections of all components on the page + AbstractHeaderRenderStrategy.get().renderHeader(this, + new HeaderStreamState(markupStream, openTag), getPage()); - // Close the header response before rendering the header container itself - // See https://issues.apache.org/jira/browse/WICKET-3728 - headerResponse.close(); --- End diff -- Thanks understood :) ---
[GitHub] wicket pull request #343: [WICKET-6617] headers are added to header-items if...
Github user solomax commented on a diff in the pull request: https://github.com/apache/wicket/pull/343#discussion_r238121519 --- Diff: wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java --- @@ -161,19 +161,19 @@ public final void onComponentTagBody(MarkupStream markupStream, ComponentTag ope final StringResponse response = new StringResponse(); getRequestCycle().setResponse(response); - IHeaderResponse headerResponse = getHeaderResponse(); - if (!response.equals(headerResponse.getResponse())) - { - getRequestCycle().setResponse(headerResponse.getResponse()); - } + try (IHeaderResponse headerResponse = getHeaderResponse()) { + if (!response.equals(headerResponse.getResponse())) + { + getRequestCycle().setResponse(headerResponse.getResponse()); + } - // Render the header sections of all components on the page - AbstractHeaderRenderStrategy.get().renderHeader(this, - new HeaderStreamState(markupStream, openTag), getPage()); + // Render the header sections of all components on the page + AbstractHeaderRenderStrategy.get().renderHeader(this, + new HeaderStreamState(markupStream, openTag), getPage()); - // Close the header response before rendering the header container itself - // See https://issues.apache.org/jira/browse/WICKET-3728 - headerResponse.close(); --- End diff -- `close()` is being called automatically by `try with resource` statement I'll modify comment ---
[GitHub] wicket pull request #343: [WICKET-6617] headers are added to header-items if...
Github user svenmeier commented on a diff in the pull request: https://github.com/apache/wicket/pull/343#discussion_r238106752 --- Diff: wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java --- @@ -161,19 +161,19 @@ public final void onComponentTagBody(MarkupStream markupStream, ComponentTag ope final StringResponse response = new StringResponse(); getRequestCycle().setResponse(response); - IHeaderResponse headerResponse = getHeaderResponse(); - if (!response.equals(headerResponse.getResponse())) - { - getRequestCycle().setResponse(headerResponse.getResponse()); - } + try (IHeaderResponse headerResponse = getHeaderResponse()) { + if (!response.equals(headerResponse.getResponse())) + { + getRequestCycle().setResponse(headerResponse.getResponse()); + } - // Render the header sections of all components on the page - AbstractHeaderRenderStrategy.get().renderHeader(this, - new HeaderStreamState(markupStream, openTag), getPage()); + // Render the header sections of all components on the page + AbstractHeaderRenderStrategy.get().renderHeader(this, + new HeaderStreamState(markupStream, openTag), getPage()); - // Close the header response before rendering the header container itself - // See https://issues.apache.org/jira/browse/WICKET-3728 - headerResponse.close(); --- End diff -- Why no close() any longer? ---
[GitHub] wicket pull request #343: [WICKET-6617] headers are added to header-items if...
GitHub user solomax opened a pull request: https://github.com/apache/wicket/pull/343 [WICKET-6617] headers are added to header-items if specified You can merge this pull request into a Git repository by running: $ git pull https://github.com/apache/wicket WICKET-6617-header-placeholder Alternatively you can review and apply these changes as the patch at: https://github.com/apache/wicket/pull/343.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #343 commit a529aadafdaf7b32e909bbf90fe32822e841877f Author: Maxim Solodovnik Date: 2018-12-02T08:09:37Z [WICKET-6617] headers are added to header-items if specified ---