[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
ojan at chromium.org
ojan at chromium.org
Wed Dec 22 18:41:01 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9027699e7cbc09baa80a18177bf157b6e12aa5cb
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 15 19:33:05 2010 +0000
2010-12-08 Ojan Vafai <ojan at chromium.org>
Reviewed by Adam Barth.
[reviewtool] should always show overall comments text box
https://bugs.webkit.org/show_bug.cgi?id=45870
* PrettyPatch/PrettyPatch.rb:
* code-review.js:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74130 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/BugsSite/ChangeLog b/BugsSite/ChangeLog
index 3dc273d..6adfcd7 100644
--- a/BugsSite/ChangeLog
+++ b/BugsSite/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-08 Ojan Vafai <ojan at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ [reviewtool] should always show overall comments text box
+ https://bugs.webkit.org/show_bug.cgi?id=45870
+
+ * PrettyPatch/PrettyPatch.rb:
+ * code-review.js:
+
2010-12-04 Patrick Gansterer <paroga at webkit.org>
Reviewed by Adam Barth.
diff --git a/BugsSite/PrettyPatch/PrettyPatch.rb b/BugsSite/PrettyPatch/PrettyPatch.rb
index 2e04760..8c40f3d 100644
--- a/BugsSite/PrettyPatch/PrettyPatch.rb
+++ b/BugsSite/PrettyPatch/PrettyPatch.rb
@@ -197,8 +197,18 @@ h1 :hover {
}
.comment textarea, .overallComments textarea {
+ display: block;
width: 100%;
- height: 6em;
+ height: 2em;
+}
+
+.overallComments .open {
+ -webkit-transition: height .2s;
+ height: 4em;
+}
+
+#statusBubbleContainer.wrap {
+ display: block;
}
body {
@@ -206,8 +216,10 @@ body {
}
#toolbar {
+ display: -webkit-box;
+ display: -moz-box;
position: fixed;
- padding: 5px;
+ padding: 3px;
bottom: 0;
left: 0;
right: 0;
@@ -217,10 +229,6 @@ body {
}
#toolbar .actions {
- float: left;
-}
-
-#toolbar .links {
float: right;
}
@@ -277,16 +285,14 @@ body {
font-style: italic;
}
-.description {
- font-style: italic;
-}
-
-.comment, .overallComments, .previousComment, .frozenComment {
+.comment, .previousComment, .frozenComment {
background-color: #ffd;
}
.overallComments {
- padding: 5px;
+ -webkit-box-flex: 1;
+ -moz-box-flex: 1;
+ margin-right: 3px;
}
.previousComment, .frozenComment {
@@ -304,8 +310,9 @@ body {
}
.statusBubble {
- margin-left: 5px;
- width: 450px;
+ margin-top: 2px;
+ /* FIXME: Size the statusBubble via postMessage so it sizes to it's content. */
+ width: 300px;
height: 20px;
border: none;
vertical-align: middle;
diff --git a/BugsSite/code-review.js b/BugsSite/code-review.js
index ed82a8f..cfaecfa 100644
--- a/BugsSite/code-review.js
+++ b/BugsSite/code-review.js
@@ -213,7 +213,7 @@
function addFlagsForAttachment(details) {
var flag_control = "<select><option></option><option>?</option><option>+</option><option>-</option></select>";
- $('#toolbar .actions').append(
+ $('#flagContainer').append(
$('<span class="review"> r: ' + flag_control + '</span>')).append(
$('<span class="commitQueue"> cq: ' + flag_control + '</span>'));
@@ -247,7 +247,7 @@
var details = $(data);
addFlagsForAttachment(details);
- $('#toolbar .actions').append($('<iframe class="statusBubble" src="https://webkit-commit-queue.appspot.com/status-bubble/' + attachment_id + '" scrolling="no"></iframe>'));
+ $('#statusBubbleContainer').append($('<iframe style="margin-top:2px;" class="statusBubble" src="https://webkit-commit-queue.appspot.com/status-bubble/' + attachment_id + '" scrolling="no"></iframe>'));
$('#toolbar .bugLink').html('<a href="/show_bug.cgi?id=' + bug_id + '" target="_blank">Bug ' + bug_id + '</a>');
});
}
@@ -260,13 +260,33 @@
});
}
+ function openOverallComments(e) {
+ $('.overallComments textarea').addClass('open');
+ $('#statusBubbleContainer').addClass('wrap');
+ }
+
$(document).ready(function() {
crawlDiff();
fetchHistory();
$(document.body).prepend('<div id="message"><div class="help">Select line numbers to add a comment.</div><div class="commentStatus"></div></div>');
- $(document.body).prepend('<div id="toolbar"><div class="actions"><button id="preview_comments">Preview</button><button id="post_comments">Publish</button></div><div class="links"><span class="bugLink"></span></div>');
+ $(document.body).prepend('<div id="toolbar">' +
+ '<div class="overallComments">' +
+ '<textarea placeholder="Overall comments"></textarea>' +
+ '</div>' +
+ '<div>' +
+ '<span id="statusBubbleContainer"></span>' +
+ '<span class="actions">' +
+ '<span class="links"><span class="bugLink"></span></span>' +
+ '<span id="flagContainer"></span>' +
+ '<button id="preview_comments">Preview</button>' +
+ '<button id="post_comments">Publish</button> ' +
+ '</span></div>' +
+ '</div>' +
+ '</div>');
+
+ $('.overallComments textarea').bind('click', openOverallComments);
+
$(document.body).prepend('<div id="comment_form" class="inactive"><div class="winter"></div><div class="lightbox"><iframe id="reviewform" src="attachment.cgi?id=' + attachment_id + '&action=reviewform"></iframe></div></div>');
- $(document.body).append('<div class="overallComments"><div class="description">Overall comments:</div><textarea></textarea></div>');
});
function discardComment() {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list