Attachment 347325 Details for Bug 188607 – Patch

[patch] Patch

bug-188607-20180816165854.patch (text/plain), 6.93 KB, created by Ross Kirsling on 2018-08-16 16:58:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Kirsling

Created: 2018-08-16 16:58:55 PDT

Size: 6.93 KB

patch

obsolete

>Subversion Revision: 234944
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index d9951a00faab8472a98928f4209d924d431516e0..4e1a696092fc044ccab0045c698ce8f6e302d7da 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-08-16  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        EWS bubbles are being hidden due to lack of space.
>+        https://bugs.webkit.org/show_bug.cgi?id=188607
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * QueueStatusServer/templates/statusbubble.html:
>+        Allow an element ID to be passed back and forth via the containerMetrics postMessage.
>+
> 2018-08-16  Alex Christensen  <achristensen@webkit.org>
> 
>         Re-introduce assertion removed in r234890
>diff --git a/Tools/QueueStatusServer/templates/statusbubble.html b/Tools/QueueStatusServer/templates/statusbubble.html
>index d90bb0848891f362d3e412e5d690ca3e32fabafd..988faa71f87ef48420958d211d1fc884878ac79b 100644
>--- a/Tools/QueueStatusServer/templates/statusbubble.html
>+++ b/Tools/QueueStatusServer/templates/statusbubble.html
>@@ -53,13 +53,13 @@ form {
> </style>
> <script>
> window.addEventListener("message", function(e) {
>-  if (e.data === 'containerMetrics') {
>+  if (e.data && e.data.type === 'containerMetrics') {
>     var parentContainer = bubbleContainer.parentElement;
>     var originalWidth = parentContainer.style.width;
>     parentContainer.style.width = "1000px";
>     var clientRect = bubbleContainer.getBoundingClientRect();
>     parentContainer.style.width = originalWidth;
>-    e.source.postMessage({'width': Math.ceil(clientRect.width), 'height': Math.ceil(clientRect.height)}, e.origin);
>+    e.source.postMessage({id: e.data.id, width: Math.ceil(clientRect.width), height: Math.ceil(clientRect.height)}, e.origin);
>   } else
>     console.log("Unknown postMessage: " + e.data);
> }, false);
>diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
>index 5aa77bc05c85121b9c5331147b9726edd5eb9dfb..a18360e412e9b09bb5ec3d2049bc38afad90d669 100644
>--- a/Websites/bugs.webkit.org/ChangeLog
>+++ b/Websites/bugs.webkit.org/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-08-16  Ross Kirsling  <ross.kirsling@sony.com>
>+
>+        EWS bubbles are being hidden due to lack of space.
>+        https://bugs.webkit.org/show_bug.cgi?id=188607
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * code-review.js:
>+        (handleStatusBubbleLoad):
>+        postMessage with an object, not just a string.
>+
>+        * template/en/default/attachment/edit.html.tmpl:
>+        * template/en/default/attachment/list.html.tmpl:
>+        Set the iframe dimensions via postMessage, like on the Review Patch screen.
>+
> 2018-06-22  Daniel Bates  <dabates@apple.com>
> 
>         EWS for security bugs
>diff --git a/Websites/bugs.webkit.org/code-review.js b/Websites/bugs.webkit.org/code-review.js
>index 877b3b399cf14a838bd0861a53fb505d4ea332bb..51151285da6dd73697722ac5da38436c6a7265fa 100644
>--- a/Websites/bugs.webkit.org/code-review.js
>+++ b/Websites/bugs.webkit.org/code-review.js
>@@ -546,7 +546,7 @@ var CODE_REVIEW_UNITTEST;
>   }, false);
> 
>   function handleStatusBubbleLoad(e) {
>-    e.target.contentWindow.postMessage('containerMetrics', 'https://webkit-queues.webkit.org');
>+    e.target.contentWindow.postMessage({type: 'containerMetrics'}, 'https://webkit-queues.webkit.org');
>   }
> 
>   function fetchHistory() {
>diff --git a/Websites/bugs.webkit.org/template/en/default/attachment/edit.html.tmpl b/Websites/bugs.webkit.org/template/en/default/attachment/edit.html.tmpl
>index 51533acfbf20ff2e6085918e5c88f65cd2f72fe8..e339b4d37466a5f119f6a880f3dda0be6c429b18 100644
>--- a/Websites/bugs.webkit.org/template/en/default/attachment/edit.html.tmpl
>+++ b/Websites/bugs.webkit.org/template/en/default/attachment/edit.html.tmpl
>@@ -34,6 +34,20 @@
> [% can_edit = attachment.validate_can_edit %]
> [% editable_or_hide = can_edit ? "" : " bz_hidden_option" %]
> 
>+<script>
>+window.addEventListener('message', function (e) {
>+    if (e.origin !== 'https://webkit-queues.webkit.org' || !e.data.height)
>+        return;
>+
>+    $(`.statusBubble`)[0].style.height = e.data.height;
>+    $(`.statusBubble`)[0].style.width = e.data.width;
>+}, false);
>+
>+function handleStatusBubbleLoad(iframe) {
>+    iframe.contentWindow.postMessage({type: 'containerMetrics'}, 'https://webkit-queues.webkit.org');
>+}
>+</script>
>+
> <form method="post" action="attachment.cgi" onsubmit="normalizeComments();">
>   <input type="hidden" name="id" value="[% attachment.id %]">
>   <input type="hidden" name="action" value="update">
>@@ -260,7 +274,7 @@
> 
>         <div class="statusBubble">
>           <iframe src="https://webkit-queues.webkit.org/status-bubble/[% attachment.id %]"
>-                  style="width: 600px; height: 20px; border: none;" scrolling="no">
>+                  style="width: 600px; height: 20px; border: none;" scrolling="no" onload="handleStatusBubbleLoad(this);">
>           </iframe>
>         </div>
>         <br>
>diff --git a/Websites/bugs.webkit.org/template/en/default/attachment/list.html.tmpl b/Websites/bugs.webkit.org/template/en/default/attachment/list.html.tmpl
>index eadbd201e8d7570696fdc5646a0e64ea46b5061d..8e190adf249488b7d66882c728ef8e4471174783 100644
>--- a/Websites/bugs.webkit.org/template/en/default/attachment/list.html.tmpl
>+++ b/Websites/bugs.webkit.org/template/en/default/attachment/list.html.tmpl
>@@ -38,6 +38,18 @@ function toggle_display(link) {
> 
>     return false;
> }
>+
>+window.addEventListener('message', function (e) {
>+    if (e.origin !== 'https://webkit-queues.webkit.org' || !e.data.height)
>+        return;
>+
>+    $(`#${e.data.id} .statusBubble`)[0].style.height = e.data.height;
>+    $(`#${e.data.id} .statusBubble`)[0].style.width = e.data.width;
>+}, false);
>+
>+function handleStatusBubbleLoad(iframe, id) {
>+    iframe.contentWindow.postMessage({type: 'containerMetrics', id}, 'https://webkit-queues.webkit.org');
>+}
> //-->
> </script>
> 
>@@ -55,11 +67,12 @@ function toggle_display(link) {
> 
>   [% FOREACH attachment = attachments %]
>     [% count = count + 1 %]
>+    [% tr_id = "a" _ count %]
>     [% IF !attachment.isprivate || user.is_insider || attachment.attacher.id == user.id %]
>       [% IF attachment.isobsolete %]
>         [% obsolete_attachments = obsolete_attachments + 1 %]
>       [% END %]
>-      <tr id="a[% count %]" class="[% "bz_contenttype_" _ attachment.contenttype
>+      <tr id="[% tr_id %]" class="[% "bz_contenttype_" _ attachment.contenttype
>                      FILTER css_class_quote %]
>                  [% " bz_patch" IF attachment.ispatch %]
>                  [% " bz_private" IF attachment.isprivate %]
>@@ -153,7 +166,7 @@ function toggle_display(link) {
>           [% IF attachment.ispatch %]
>           <div class="statusBubble">
>             <iframe src="https://webkit-queues.webkit.org/status-bubble/[% attachment.id %]"
>-                    style="width: 600px; height: 20px; border: none;" scrolling="no">
>+                    style="width: 600px; height: 20px; border: none;" scrolling="no" onload="handleStatusBubbleLoad(this, '[% tr_id %]');">
>             </iframe>
>           </div>
>           [% END %]

Actions: View | Formatted Diff | Diff

Attachments on bug 188607: 347175 | 347177 | 347195 | 347216 | 347325 | 347557 | 347559 | 347623 | 347964 | 347967 | 347969