Title: [174773] trunk/Websites/bugs.webkit.org
- Revision
- 174773
- Author
- [email protected]
- Date
- 2014-10-16 09:01:21 -0700 (Thu, 16 Oct 2014)
Log Message
Remove references to Rietveld from bugs.webkit.org
Rietveld was an experiment that was added by Google. It was
never enabled for everyone, so it's safe to remove the changes
that reference it.
* Bugzilla/Flag.pm: Remove code that prevented mail messages from
being sent for patches reviewed in Rietveld.
* attachment.cgi: Remove reference to the "rietveldreview"
template.
* template/en/custom/attachment/list.html.tmpl: Remove code
that handled the Rietveld review flag.
* template/en/custom/attachment/reviewform.html.tmpl: Remove code
that handled the "rietveldReview" CGI parameter.
* template/en/custom/attachment/rietveldreview.html.tmpl: Delete.
* template/en/custom/flag/list.html.tmpl: Delete. After
removing the code to handle Rietveld reviews, there were no more
local WebKit changes to the custom template file, so it could be
removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/Websites/bugs.webkit.org/Bugzilla/Flag.pm (174772 => 174773)
--- trunk/Websites/bugs.webkit.org/Bugzilla/Flag.pm 2014-10-16 16:01:19 UTC (rev 174772)
+++ trunk/Websites/bugs.webkit.org/Bugzilla/Flag.pm 2014-10-16 16:01:21 UTC (rev 174773)
@@ -937,12 +937,6 @@
}
}
- #if WEBKIT_CHANGES
- # Don't send a notification when the flag is in-rietveld,
- # since it isn't a user visible flag, and that mail is spammy.
- return if ($flag->type->name eq 'in-rietveld');
- #endif // WEBKIT_CHANGES
-
my $cc_list = $flag ? $flag->type->cc_list : $old_flag->type->cc_list;
# Is there someone to notify?
return unless ($addressee || $cc_list);
Modified: trunk/Websites/bugs.webkit.org/attachment.cgi (174772 => 174773)
--- trunk/Websites/bugs.webkit.org/attachment.cgi 2014-10-16 16:01:19 UTC (rev 174772)
+++ trunk/Websites/bugs.webkit.org/attachment.cgi 2014-10-16 16:01:21 UTC (rev 174773)
@@ -133,10 +133,6 @@
{
edit("reviewform");
}
-elsif ($action eq "rietveldreview")
-{
- edit("rietveldreview");
-}
#endif // WEBKIT_CHANGES
elsif ($action eq "update")
{
Modified: trunk/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl (174772 => 174773)
--- trunk/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl 2014-10-16 16:01:19 UTC (rev 174772)
+++ trunk/Websites/bugs.webkit.org/template/en/custom/attachment/list.html.tmpl 2014-10-16 16:01:21 UTC (rev 174773)
@@ -112,16 +112,10 @@
[% IF show_attachment_flags %]
<td class="bz_attach_flags" valign="top">
-[%# if WEBKIT_CHANGES %]
- [% IF attachment.flags.size == 0 ||
- (attachment.flags.size == 1 && attachment.flags.0.type.name == 'in-rietveld') %]
-[%# endif // WEBKIT_CHANGES %]
+ [% IF attachment.flags.size == 0 %]
<i>no flags</i>
[% ELSE %]
[% FOREACH flag = attachment.flags %]
-[%# if WEBKIT_CHANGES %]
- [% IF flag.type.name != 'in-rietveld' %]
-[%# endif // WEBKIT_CHANGES %]
[% IF user.id %]
<span title="[% flag.setter.identity FILTER html %]">[% flag.setter.nick FILTER html %]</span>:
[% ELSIF flag.setter.name %]
@@ -139,9 +133,6 @@
([% flag.requestee.nick FILTER html %])
[% END %]
[% END %]<br>
-[%# if WEBKIT_CHANGES %]
- [% END %]
-[%# endif // WEBKIT_CHANGES %]
[% END %]
[% END %]
</td>
@@ -165,11 +156,6 @@
[% Hook.process("action") %]
[%# if WEBKIT_CHANGES %]
[% IF attachment.ispatch %]
- [% FOREACH flag = attachment.flags %]
- [% IF flag.type.name == 'in-rietveld' && flag.status == "+" %]
- | <a href="" attachment.id %]&action=""
- [% END %]
- [% END %]
<div class="statusBubble">
<iframe src="" attachment.id %]"
style="width: 600px; height: 20px; border: none;" scrolling="no">
Modified: trunk/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl (174772 => 174773)
--- trunk/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl 2014-10-16 16:01:19 UTC (rev 174772)
+++ trunk/Websites/bugs.webkit.org/template/en/custom/attachment/reviewform.html.tmpl 2014-10-16 16:01:21 UTC (rev 174773)
@@ -20,12 +20,6 @@
[% PROCESS global/variables.none.tmpl %]
-[% USE CGI %]
-[%
- # We use a query string rietveldreview=true to indicate when in rietveld mode.
- rietveldReview = CGI.param('rietveldreview')
-%]
-
<style>
* { font-size: small; }
#comment { width: 100%; height: 100%; font-family: monospace; }
@@ -51,26 +45,12 @@
}
function onSubmitComments()
{
-[% IF rietveldReview %]
- var submitBtn = document.getElementById('submitBtn');
- submitBtn.innerHTML = 'Fetching comments from Rietveld...';
- submitBtn.disabled = true; // Disable since this is asynch.
- top.getComments();
- // Handle the error case of Rietveld not responding by giving
- // the user another chance.
- setTimeout(function() {
- submitBtn.innerHTML = 'Fetching comments timed out ... retry?';
- submitBtn.disabled = false;
- }, 30000);
- return false;
-[% ELSE %]
// If someone just left the entire comment alone, then upload the form
// with no comment at all.
var textarea = document.getElementById("comment");
if (textarea.defaultValue === textarea.value)
textarea.value = "";
return true;
-[% END %]
}
[% END %]
@@ -138,15 +118,9 @@
</tr>
<tr>
<td colspan="4">
-[% IF rietveldReview %]
-Enter high-level comments below. Make detailed comments above. Submit will submit both.<br>
-[% ELSE %]
Enter comments below:<br>
-[% END %]
<textarea id=comment name="comment" wrap="soft">
-[% IF !rietveldReview %]
[% quotedpatch FILTER html %]
-[% END %]
</textarea><br>
</tr>
Deleted: trunk/Websites/bugs.webkit.org/template/en/custom/attachment/rietveldreview.html.tmpl (174772 => 174773)
--- trunk/Websites/bugs.webkit.org/template/en/custom/attachment/rietveldreview.html.tmpl 2014-10-16 16:01:19 UTC (rev 174772)
+++ trunk/Websites/bugs.webkit.org/template/en/custom/attachment/rietveldreview.html.tmpl 2014-10-16 16:01:21 UTC (rev 174773)
@@ -1,77 +0,0 @@
-[%# The contents of this file are subject to the Mozilla Public
- # License Version 1.1 (the "License"); you may not use this file
- # except in compliance with the License. You may obtain a copy of
- # the License at http://www.mozilla.org/MPL/
- #
- # Software distributed under the License is distributed on an "AS
- # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- # implied. See the License for the specific language governing
- # rights and limitations under the License.
- #
- # The Original Code is the Bugzilla Bug Tracking System.
- #
- # The Initial Developer of the Original Code is Netscape Communications
- # Corporation. Portions created by Netscape are
- # Copyright (C) 1998 Netscape Communications Corporation. All
- # Rights Reserved.
- #
- # Contributor(s): Myk Melez <[email protected]>
- #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>Rietveld review patch #[% attachment.id %] for [% terms.Bug %] #[% attachment.bug_id %]: [% bugsummary FILTER html %]</title>
-<script type="text/_javascript_">
-<!--
-/**
- * Handle the postMessage response from Rietveld.
- * The response will be the comments to combine with those left in the
- * comments box.
- */
-function updateComments(e)
-{
- if (e.origin == 'http://wkrietveld.appspot.com') {
- var reviewFormDoc = document.getElementById('reviewFormFrame').
- contentDocument;
- // Add the Rietveld comments to the comments field.
- if (e.data) {
- var commentBox = reviewFormDoc.getElementById('comment');
-
- if (commentBox.value)
- commentBox.value += '\n---------------------------------\n';
- commentBox.value += e.data;
- }
- reviewFormDoc.forms[0].submit();
- }
-}
-
-/**
- * Fetch comments from Rietveld via postMessage.
- */
-function getComments()
-{
- document.getElementById('rietveldFrame').contentWindow.
- postMessage('publish', 'http://wkrietveld.appspot.com');
-}
-
-// Listen for messages from Rietveld.
-if (window.postMessage)
- window.addEventListener("message", updateComments, false);
-else
- alert('Error: Please load this page in a browser that supports postMessage');
-//-->
-</script>
-
-[% IF !user.login %]
-[%# We shouldn't ever hit this, since all links to this page use GoAheadAndLogIn.
- This is just here as a safeguard if anyone directly navigates to it. %]
-Please log in and refresh this page.
-[% ELSE %]
-<frameset rows="80%,20%">
-<frame id=rietveldFrame src="" attachment.bug_id %]?email=[% user.login %]">
-<frame id=reviewFormFrame src="" attachment.id %]&action=""
-</frameset>
-[% END %]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
