Remove status-bubble iframe from old EWS
authoraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Mar 2020 15:31:18 +0000 (15:31 +0000)
committeraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Mar 2020 15:31:18 +0000 (15:31 +0000)
https://bugs.webkit.org/show_bug.cgi?id=209215

Reviewed by Jonathan Bedard.

* code-review.js:
* js/status-bubble.js:
(handleStatusBubbleLoadNewEWS): Deleted.
* template/en/default/attachment/edit.html.tmpl: Removed old EWS iframe.
* template/en/default/attachment/list.html.tmpl: Ditto.
* template/en/default/attachment/reviewform.html.tmpl: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258636 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Websites/bugs.webkit.org/ChangeLog
Websites/bugs.webkit.org/code-review.js
Websites/bugs.webkit.org/js/status-bubble.js
Websites/bugs.webkit.org/template/en/default/attachment/edit.html.tmpl
Websites/bugs.webkit.org/template/en/default/attachment/list.html.tmpl
Websites/bugs.webkit.org/template/en/default/attachment/reviewform.html.tmpl

index f4885cf..a1bfba9 100644 (file)
@@ -1,3 +1,17 @@
+2020-03-17  Aakash Jain  <aakash_jain@apple.com>
+
+        Remove status-bubble iframe from old EWS
+        https://bugs.webkit.org/show_bug.cgi?id=209215
+
+        Reviewed by Jonathan Bedard.
+
+        * code-review.js:
+        * js/status-bubble.js:
+        (handleStatusBubbleLoadNewEWS): Deleted.
+        * template/en/default/attachment/edit.html.tmpl: Removed old EWS iframe. 
+        * template/en/default/attachment/list.html.tmpl: Ditto.
+        * template/en/default/attachment/reviewform.html.tmpl: Ditto.
+
 2019-11-06  James Savage  <james.savage@apple.com>
 
         Support CSS Dark Mode for PrettyDiff.rb.
index baeb1d1..b9bcf60 100644 (file)
@@ -568,19 +568,12 @@ var CODE_REVIEW_UNITTEST;
       addFlagsForAttachment(details);
 
       var statusBubble = document.createElement('iframe');
-      statusBubble.src  = 'https://webkit-queues.webkit.org/status-bubble/' + attachment_id;
+      statusBubble.src  = 'https://ews.webkit.org/status-bubble/' + attachment_id + '?hide_icons=True';
       statusBubble.scrolling = 'no';
       // Can't append the HTML because we need to set the onload handler before appending the iframe to the DOM.
       statusBubble.onload = function () { handleStatusBubbleLoad(this); };
       $('.statusBubble').append(statusBubble);
 
-      var statusBubbleNewEWS = document.createElement('iframe');
-      statusBubbleNewEWS.src  = 'https://ews.webkit.org/status-bubble/' + attachment_id + '?hide_icons=True';
-      // Can't append the HTML because we need to set the onload handler before appending the iframe to the DOM.
-      statusBubbleNewEWS.scrolling = "no";
-      statusBubbleNewEWS.onload = function () { handleStatusBubbleLoadNewEWS(this); };
-      $('.statusBubble').append(statusBubbleNewEWS);
-
       $('#toolbar .bugLink').html('<a href="/show_bug.cgi?id=' + bug_id + '" target="_blank">Bug ' + bug_id + '</a>');
     });
   }
index 8e1c0ae..60620f7 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 function handleStatusBubbleMessage(event) {
-    if ((event.origin !== 'https://webkit-queues.webkit.org' && event.origin !== 'https://ews.webkit.org') || !event.data.height)
+    if (event.origin !== 'https://ews.webkit.org' || !event.data.height)
         return;
 
     for (const iframe of document.querySelectorAll('.statusBubble > iframe')) {
@@ -38,9 +38,5 @@ function handleStatusBubbleMessage(event) {
 }
 
 function handleStatusBubbleLoad(iframe) {
-    iframe.contentWindow.postMessage('containerMetrics', 'https://webkit-queues.webkit.org');
-}
-
-function handleStatusBubbleLoadNewEWS(iframe) {
     iframe.contentWindow.postMessage('containerMetrics', 'https://ews.webkit.org');
 }
index bad25f1..664531a 100644 (file)
         Bot Status:
 
         <div class="statusBubble">
-          <iframe src="https://webkit-queues.webkit.org/status-bubble/[% attachment.id %]"
-                  style="width: 0px; height: 20px; border: none;" scrolling="no" onload="handleStatusBubbleLoad(this)">
-          </iframe>
           <iframe src="https://ews.webkit.org/status-bubble/[% attachment.id %]?hide_icons=True"
-                  style="width: 0px; height: 20px; border: none;" scrolling="no" onload="handleStatusBubbleLoadNewEWS(this)">
+                  style="width: 0px; height: 20px; border: none;" scrolling="no" onload="handleStatusBubbleLoad(this)">
           </iframe>
         </div>
         <br>
index a9bc375..37a3c3f 100644 (file)
@@ -155,11 +155,8 @@ function toggle_display(link) {
 [%# if WEBKIT_CHANGES %]
           [% IF attachment.ispatch %]
           <div class="statusBubble">
-            <iframe src="https://webkit-queues.webkit.org/status-bubble/[% attachment.id %]"
-                    style="width: 0px; height: 20px; border: none;" scrolling="no" onload="handleStatusBubbleLoad(this)">
-            </iframe>
             <iframe src="https://ews.webkit.org/status-bubble/[% attachment.id %]/"
-                    style="width: 0px; height: 20px; border: none;" scrolling="no" onload="handleStatusBubbleLoadNewEWS(this)">
+                    style="width: 0px; height: 20px; border: none;" scrolling="no" onload="handleStatusBubbleLoad(this)">
             </iframe>
           </div>
           [% END %]
index 7a66858..f4debc5 100644 (file)
     <tr>
     <td>
       <div class="statusBubble" style="margin-left: 30px;">
-        <iframe src="https://webkit-queues.webkit.org/status-bubble/[% attachment.id %]"
-                style="width: 400px; height: 20px; border: none;" scrolling="no">
-        </iframe>
         <iframe src="https://ews.webkit.org/status-bubble/[% attachment.id %]?hide_icons=True"
                 style="width: 700px; height: 20px; border: none;" scrolling="no">
         </iframe>