[Libreoffice-commits] .: bug/bug bug/bug.xhtml bug/README.txt
Loic Dachary
loic at kemper.freedesktop.org
Thu Oct 6 08:23:13 PDT 2011
bug/README.txt | 13 -----
bug/bug.xhtml | 75 +++++++++++++++++-------------
bug/bug/bug.css | 46 ++++++------------
bug/bug/bug.js | 91 ++++++++++++++----------------------
bug/bug/jquery.iframe-post-form.js | 92 -------------------------------------
bug/bug/skin.js | 2
bug/bug/test.html | 48 ++++++++++++-------
bug/bug/test.js | 72 ++++++++--------------------
dev/null |binary
9 files changed, 148 insertions(+), 291 deletions(-)
New commits:
commit 87b189e6715a0b1dd2f8b0ba3cf7097e9b211a59
Author: Loic Dachary <loic at dachary.org>
Date: Thu Oct 6 17:21:32 2011 +0200
Fixes https://freedesktop.dachary.org/show_bug.cgi?id=41300
The attachment is proposed before submitting the bug report instead of after submitting the form. There is only one submission instead of two, which is less confusing. Furthermore, the submission is protected against double click. The description field is added to the attachment so that it no longer claims to be limited to screenshots.
diff --git a/bug/README.txt b/bug/README.txt
index d3536b3..9cd1cc9 100644
--- a/bug/README.txt
+++ b/bug/README.txt
@@ -36,19 +36,6 @@ It contains parts:
* Date: Thu Jun 30 14:16:56 2011 -0400
*/
-/**
- * jQuery plugin for posting form including file inputs.
- *
- * Copyright (c) 2010 - 2011 Ewen Elder
- *
- * Licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- *
- * @author: Ewen Elder <ewen at jainaewen dot com> <glomainn at yahoo dot co dot uk>
- * @version: 1.1.1 (2011-07-29)
-**/
-
/*
* QUnit - A JavaScript Unit Testing Framework
*
diff --git a/bug/bug.xhtml b/bug/bug.xhtml
index fae7c4e..add05de 100644
--- a/bug/bug.xhtml
+++ b/bug/bug.xhtml
@@ -28,7 +28,6 @@
<title>Bug Submission Assistant</title>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8"/>
<script type="text/javascript" src="jquery-1.6.2.js"></script>
- <script type="text/javascript" src="jquery.iframe-post-form.js"></script>
<script type="text/javascript" src="bug.js"></script>
<script type="text/javascript" src="select.js"></script>
<link rel="stylesheet" href="select.css" type="text/css" media="screen"></link>
@@ -70,7 +69,6 @@
<div class="step step_version"><div class="count">4</div><div class="label">Version</div></div>
<div class="step step_description"><div class="count">5</div><div class="label">Description</div></div>
<div class="step step_submit"><div class="count">6</div><div class="label">Submit</div></div>
- <div class="step step_attach"><div class="count">7</div><div class="label">Attach</div></div>
</div>
<div class="copyright">
<a target="_blank" href="http://wiki.documentfoundation.org/Bug_Submission_Assistant">Bug Submission Assistant</a> is copyright (C) 2011 Loic Dachary published under <a target="_blank" href="http://www.gnu.org/licenses/gpl.txt">GNU GPLv3+</a>. Download the sources with git clone <a target="_blank" href="http://cgit.freedesktop.org/libreoffice/website">http://cgit.freedesktop.org/libreoffice/website</a>.
@@ -162,10 +160,49 @@ Expected behavior:
</div>
</div>
- <div class="state state_submit">
- <div class="go">Submit</div>
- <div class="bug"></div>
- </div>
+ <iframe id="submissionoutput" name="submissionoutput"></iframe>
+
+ <div class="submission_form">
+ <form action='/post_bug.cgi' target="submissionoutput" method='POST' enctype='multipart/form-data'>
+ <input type="hidden" name="product" value="LibreOffice"></input>
+ <input type="hidden" name="bug_status" value="UNCONFIRMED"></input>
+ <input type="hidden" name="rep_platform" value="Other"></input>
+ <input type="hidden" name="op_sys" value="All"></input>
+ <input type="hidden" name="bug_severity" value="normal"></input>
+ <input type="hidden" name="priority" value="medium"></input>
+ <input type="hidden" name="rep_platform" value="Other"></input>
+ <input type="hidden" name="status_whiteboard" value="BSA"></input>
+ <input type="hidden" name="assigned_to" value="libreoffice-bugs at lists.freedesktop.org"></input>
+ <input type="hidden" name="component" value=""></input>
+ <input type="hidden" name="version" value=""></input>
+ <input type="hidden" name="short_desc" value=""></input>
+ <input type="hidden" name="comment" value=""></input>
+ <div class="state state_attach">
+ <input type="hidden" name="contenttypemethod" value="autodetect"></input>
+ <div>
+ <div class="input-label">Optionally attach a document or a screenshot. </div>
+
+ <div class="attach-file">
+ <input type="file" name="data" size="150" />
+ <div class="attach-file-style">
+ <div><input type="text" name="ignored"></input></div>
+ <div class="attach-browse">Browse</div>
+ </div>
+ </div>
+ </div>
+ <div>
+ <div class="input-label">Explain what is attached:</div>
+ <input type="text" name="description" value=""></input>
+ </div>
+ </div>
+ <div class="state state_submit">
+ <input type="submit" value="Submit"></input>
+ </div>
+ </form>
+ <div class="state state_submit">
+ <div class="bug"></div>
+ </div>
+ </div>
<div class="state state_subcomponent state_duplicates">
Related bug reports
@@ -183,32 +220,6 @@ Expected behavior:
<p>You can edit it or add attachments using <a class="bug">the corresponding bugzilla page</a>.</p>
</div>
- <div class="state_attach">
- <div class="attach-invite">
- If you have a screenshot illustrating the problem, you can upload it here.
- </div>
- <form action='/attachment.cgi' method='post' enctype='multipart/form-data'>
- <input type="hidden" name="action" value="insert"></input>
- <input class="bug" type="hidden" name="bugid"></input>
- <input type="hidden" name="description" value="SCREENSHOT"></input>
- <input type="hidden" name="comment" value="SCREENSHOT COMMENT"></input>
- <input type="hidden" name="contenttypemethod" value="autodetect"></input>
- <div class="attach-file-and-submit">
- <div class="attach-file">
- <input type="file" name="data" size="150" />
- <div class="attach-file-style">
- <div><input type="text" name="ignored"></input></div>
- <div class="attach-browse">Browse</div>
- </div>
- </div>
- <div class="attach-submit">
- <input type="submit" value="Upload"></input>
- </div>
- </div>
- </form>
- <img title="screenshot" />
- </div>
-
</div>
</div>
</div>
diff --git a/bug/bug/bug.css b/bug/bug/bug.css
index 07304ff..7440fc6 100644
--- a/bug/bug/bug.css
+++ b/bug/bug/bug.css
@@ -405,11 +405,16 @@ body {
}
/* state_submit */
+#submissionoutput {
+ display: none;
+}
+
.state_submit {
display: none;
}
-.state_submit .go {
+.state_submit input[type='submit'] {
+ border: 0;
margin-left: auto;
margin-right: 40px;
background: url('images/submit.png') no-repeat;
@@ -463,7 +468,6 @@ body {
/* state_attach */
.state_attach {
display: none;
- text-align: center;
}
.state_attach .attach-invite {
@@ -471,42 +475,20 @@ body {
padding: 10px;
}
-.state_attach .attach-file-and-submit {
- text-align: right;
- vertical-align: top;
- width: 79%;
-}
-
.state_attach .attach-file-style > div {
display: inline-block;
}
-.state_attach .attach-submit input {
- background: url('images/upload.png') no-repeat;
- width: 94px;
- height: 38px;
- font-weight: bold;
- font-size: 14px;
- color: #fff;
- text-align: center;
- line-height: 38px;
- border: 0;
-}
-
-.state_attach .attach-submit input:hover {
- cursor: pointer;
- background: url('images/upload-hover.png') no-repeat;
-}
-
.state_attach .attach-file {
position: relative;
height: 38px;
+ margin-left: 5px;
}
.state_attach .attach-file .attach-file-style {
position: absolute;
top: 0;
- right: 0;
+ left: 0;
z-index: 1;
}
@@ -514,6 +496,14 @@ body {
vertical-align: top;
}
+.state_attach input[name='description'] {
+ background: url('images/subject.png') no-repeat;
+ height: 28px;
+ width: 528px;
+ border: 0;
+ padding: 5px 10px;
+}
+
.state_attach .attach-file input[type='file'] {
cursor: pointer;
position: relative;
@@ -548,10 +538,6 @@ body {
border: 0;
}
-.state_attach img {
- display: none;
-}
-
/* skin */
.skin {
display: none;
diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index 3429bcf..9df6daf 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -160,6 +160,7 @@
var validate = function() {
if($(".short", element).val().length > 3 &&
$(".long", element).val() != template) {
+ $.bug.state_attach();
$.bug.state_submit();
}
};
@@ -172,15 +173,34 @@
}
},
+ state_attach: function() {
+ var element = $('.state_attach');
+ if($.browser.msie) {
+ // ie allow the input field to get focus, presumably to
+ // type the filename. launch the browser instead.
+ $("input[type='file']", element).focus(function() {
+ $(this).click();
+ $(this).blur(); // loose focus so that no caret is shown even when in caret browsing
+ });
+ }
+ $("input[type='file']", element).change(function() {
+ $("input[name='ignored']", element).val($(this).val());
+ });
+ $.bug.current_step('attach');
+ element.show();
+ },
+
state_submit_error_regexps: ['class="throw_error">([^<]*)', 'font size="\\+2">([^<]*)'],
state_submit_success_regexp: 'title>Bug ([0-9]+)',
+ state_submit_element: 'html',
state_submit: function() {
var element = $('.state_submit');
if(!element.hasClass('initialized')) {
- $('.go', element).click(function() {
+ var form = $('.submission_form');
+ form.submit(function() {
if($(element).hasClass('inprogress')) {
- return;
+ return false;
} else {
$(element).addClass('inprogress');
}
@@ -190,30 +210,22 @@
var comment = $('.state_description .long').val();
$("body").css("cursor", "progress");
$('html, body').animate({scrollTop: '0px'}, 300);
- $.bug.ajax('POST', '/post_bug.cgi', {
- product: 'LibreOffice',
- bug_status: 'UNCONFIRMED',
- rep_platform: 'Other',
- op_sys: 'All',
- bug_severity: 'normal',
- priority: 'medium',
- assigned_to: 'libreoffice-bugs at lists.freedesktop.org',
- component: component,
- version: version,
- short_desc: short_desc,
- comment: comment,
- status_whiteboard: 'BSA'
- }).pipe(function(data) {
- $(element).removeClass('inprogress');
- $("body").css("cursor", "default");
- return $.bug.lookup_result(data,
+ $('input[name="component"]', form).val(component);
+ $('input[name="version"]', form).val(version);
+ $('input[name="short_desc"]', form).val(short_desc);
+ $('input[name="comment"]', form).val(comment);
+ return true;
+ });
+
+ $('#submissionoutput').load(function() {
+ $(element).removeClass('inprogress');
+ $("body").css("cursor", "default");
+ var output = $(this).contents().find($.bug.state_submit_element).html();
+ var data = $.bug.lookup_result(output,
$.bug.state_submit_error_regexps,
$.bug.state_submit_success_regexp);
- }).pipe(function(data) {
- $('.bug', element).text(data);
- $.bug.state_success();
- $.bug.state_attach();
- });
+ $('.bug', element).text(data);
+ $.bug.state_success();
});
element.addClass('initialized');
$.bug.current_step('submit');
@@ -221,37 +233,6 @@
}
},
- state_attach_error_regexps: ['class="throw_error">([^<]*)'],
- state_attach_success_regexp: 'Attachment #([0-9]+)',
-
- state_attach: function() {
- var element = $('.state_attach');
- var bug = $('.state_submit .bug').text();
- $('.bug', element).val(bug);
- $('form', element).iframePostForm({ complete: function(data) {
- var attachment = $.bug.lookup_result(data,
- $.bug.state_attach_error_regexps,
- $.bug.state_attach_success_regexp);
- $('img', element).
- attr('src', '/attachment.cgi?id=' + attachment).
- show();
-
- }});
- if($.browser.msie) {
- // ie allow the input field to get focus, presumably to
- // type the filename. launch the browser instead.
- $("input[type='file']", element).focus(function() {
- $(this).click();
- $(this).blur(); // loose focus so that no caret is shown even when in caret browsing
- });
- }
- $("input[type='file']", element).change(function() {
- $("input[type='text']", element).val($(this).val());
- });
- $.bug.current_step('attach');
- element.show();
- },
-
state_success: function() {
$('.submission').hide();
var element = $('.state_success');
diff --git a/bug/bug/images/upload-hover.png b/bug/bug/images/upload-hover.png
deleted file mode 100644
index 489785a..0000000
Binary files a/bug/bug/images/upload-hover.png and /dev/null differ
diff --git a/bug/bug/images/upload.png b/bug/bug/images/upload.png
deleted file mode 100644
index 489785a..0000000
Binary files a/bug/bug/images/upload.png and /dev/null differ
diff --git a/bug/bug/jquery.iframe-post-form.js b/bug/bug/jquery.iframe-post-form.js
deleted file mode 100644
index 3ce755c..0000000
--- a/bug/bug/jquery.iframe-post-form.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * jQuery plugin for posting form including file inputs.
- *
- * Copyright (c) 2010 - 2011 Ewen Elder
- *
- * Licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- *
- * @author: Ewen Elder <ewen at jainaewen dot com> <glomainn at yahoo dot co dot uk>
- * @version: 1.1.1 (2011-07-29)
-**/
-(function ($)
-{
- $.fn.iframePostForm = function (options)
- {
- var response,
- returnReponse,
- element,
- status = true,
- iframe;
-
- options = $.extend({}, $.fn.iframePostForm.defaults, options);
-
-
- // Add the iframe.
- if (!$('#' + options.iframeID).length)
- {
- $('body').append('<iframe id="' + options.iframeID + '" name="' + options.iframeID + '" style="display:none" />');
- }
-
-
- return $(this).each(function ()
- {
- element = $(this);
-
-
- // Target the iframe.
- element.attr('target', options.iframeID);
-
-
- // Submit listener.
- element.submit(function ()
- {
- // If status is false then abort.
- status = options.post.apply(this);
-
- if (status === false)
- {
- return status;
- }
-
-
- iframe = $('#' + options.iframeID).load(function ()
- {
- response = iframe.contents().find('body');
-
-
- if (options.json)
- {
- returnReponse = $.parseJSON(response.html());
- }
-
- else
- {
- returnReponse = response.html();
- }
-
-
- options.complete.apply(this, [returnReponse]);
-
- iframe.unbind('load');
-
-
- setTimeout(function ()
- {
- response.html('');
- }, 1);
- });
- });
- });
- };
-
-
- $.fn.iframePostForm.defaults =
- {
- iframeID : 'iframe-post-form', // Iframe ID.
- json : false, // Parse server response as a json object.
- post : function () {}, // Form onsubmit.
- complete : function (response) {} // After response from the server has been received.
- };
-})(jQuery);
\ No newline at end of file
diff --git a/bug/bug/skin.js b/bug/bug/skin.js
index 53407b8..8c41e2d 100644
--- a/bug/bug/skin.js
+++ b/bug/bug/skin.js
@@ -62,8 +62,6 @@
submit();
} else if(location.search.indexOf('skin=complete') >= 0) {
$.bug.state_success();
- $.bug.state_attach();
- $('.state_attach img').attr('src', 'icons/Database.png');
}
};
diff --git a/bug/bug/test.html b/bug/bug/test.html
index 9c08786..4ce3d62 100644
--- a/bug/bug/test.html
+++ b/bug/bug/test.html
@@ -21,7 +21,6 @@
<title>Bug Filing Form</title>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
<script type="text/javascript" src="jquery-1.6.2.js"></script>
- <script type="text/javascript" src="jquery.iframe-post-form.js"></script>
<script type="text/javascript" src="bug.js"></script>
<link rel="stylesheet" href="bug.css" type="text/css" media="screen"></link>
<script type="text/javascript" src="select.js"></script>
@@ -51,7 +50,7 @@
</div>
<div class="state_component">
- <div xmlns="" class="component select">
+ <div class="component select">
<div class="select-header">
<div class="chosen">(chose one)</div>
</div>
@@ -128,9 +127,36 @@
<textarea class="long"></textarea>
</div>
- <div class="state state_submit">
- <div class="go"></div>
- <div class="bug"></div>
+ <div id="submissionoutput" name="submissionoutput"></div>
+
+ <div class="submission_form">
+ <form action='/post_bug.cgi' target="submissionoutput" method='POST' enctype='multipart/form-data'>
+ <input type="hidden" name="product" value="LibreOffice"></input>
+ <input type="hidden" name="bug_status" value="UNCONFIRMED"></input>
+ <input type="hidden" name="rep_platform" value="Other"></input>
+ <input type="hidden" name="op_sys" value="All"></input>
+ <input type="hidden" name="bug_severity" value="normal"></input>
+ <input type="hidden" name="priority" value="medium"></input>
+ <input type="hidden" name="rep_platform" value="Other"></input>
+ <input type="hidden" name="status_whiteboard" value="BSA"></input>
+ <input type="hidden" name="assigned_to" value="libreoffice-bugs at lists.freedesktop.org"></input>
+ <input type="hidden" name="component" value=""></input>
+ <input type="hidden" name="version" value=""></input>
+ <input type="hidden" name="short_desc" value=""></input>
+ <input type="hidden" name="comment" value=""></input>
+ <div class="state_attach">
+ <input type="hidden" name="contenttypemethod" value="autodetect"></input>
+ <input type="text" name="ignored" value=""></input>
+ <input type="text" name="description" value=""></input>
+ <input type="file" name="data"></input>
+ </div>
+ <div class="state state_submit">
+ <input type="submit" value="Submit"></input>
+ </div>
+ </form>
+ <div class="state state_submit">
+ <div class="bug"></div>
+ </div>
</div>
<div class="submission">
@@ -140,18 +166,6 @@
<a class="bug"></a>
</div>
- <div class="state_attach">
- <form action='/attachment.cgi' method='POST' enctype='multipart/form-data'>
- <input type="hidden" name="action" value="insert"></input>
- <input class="bug" type="hidden" name="bugid"></input>
- <input type="hidden" name="comment" value="SCREENSHOT"></input>
- <input type="hidden" name="contenttypemethod" value="autodetect"></input>
- <input type="file" name="data"></input>
- <input type="submit" value="Upload"></input>
- </form>
- <img alt="SCREENSHOT" title="SCREENSHOT" />
- </div>
-
</div>
</body>
</html>
diff --git a/bug/bug/test.js b/bug/bug/test.js
index 56f0ddb..82b5f9d 100644
--- a/bug/bug/test.js
+++ b/bug/bug/test.js
@@ -200,7 +200,7 @@ test("state_description", function() {
});
test("state_submit", function() {
- expect(16);
+ expect(25);
var state_success = $.bug.state_success;
$.bug.state_success = function() { ok(true, 'state_success'); };
@@ -224,31 +224,36 @@ test("state_submit", function() {
$('.state_description .short').val(short_desc);
var comment = 'LONG';
$('.state_description .long').val(comment);
+
var bug = '40763';
- $.bug.ajax = function(type, url, data) {
+ var form = $('.submission_form');
+
+ form.submit(function() {
ok(element.hasClass('inprogress'), 'is in progress');
- $('.go', element).click(); // noop
- if(data.component == component_text &&
- data.version == version &&
- data.short_desc == subcomponent + ': ' + short_desc &&
- data.comment == comment) {
- return $.Deferred().resolve('<title>Bug ' + bug + ' Submitted');
- }
- };
- $('.go', element).click();
+ equal($('input[name="component"]', form).val(), component_text);
+ equal($('input[name="version"]', form).val(), version);
+ equal($('input[name="short_desc"]', form).val(), subcomponent + ': ' + short_desc);
+ equal($('input[name="comment"]', form).val(), comment);
+ return false; // prevent actual submission
+ });
+ form.submit();
+ form.submit(); // noop
+
+ $.bug.state_submit_element = 'div'; // because <html> can't be inserted in the dom
+
+ $('#submissionoutput').html('<div><div><title>Bug ' + bug + ' Submitted</title></div></div>');
+ $('#submissionoutput').load();
equal($('.bug', element).text(), bug, 'bug number');
ok(!element.hasClass('inprogress'), 'is no longer progress');
var error = ' ERROR ';
equal($('.error').text(), '', 'error is not set');
- $(['<table cellpadding="20"> <tr> <td bgcolor="#ff0000"> <font size="+2">' + error + '</font> </td> </tr> </table>', 'class="throw_error">' + error + '<']).each(function(index, str) {
- $.bug.ajax = function(type, url, data) {
- return $.Deferred().resolve(str);
- };
+ $(['<div><div><table cellpadding="20"> <tr> <td bgcolor="#ff0000"> <font size="+2">' + error + '</font> </td> </tr> </table></div></div>', '<div><div><div class="throw_error">' + error + '</div></div></div>']).each(function(index, str) {
+ $('#submissionoutput').html(str);
var caught = false;
try {
- $('.go', element).click();
+ $('#submissionoutput').load();
} catch(e) {
equal($('.error').text(), error, 'text ' + str);
equal(e[1], error, 'catch ' + str);
@@ -257,7 +262,6 @@ test("state_submit", function() {
ok(caught, 'caught', str);
});
equal($('.error').text(), error, 'error is set');
- $.bug.ajax = $.ajax;
$.bug.state_success = state_success;
});
@@ -277,45 +281,13 @@ test("state_success", function() {
});
test("state_attach", function() {
- expect(8);
+ expect(2);
- var bug = '4242';
- var data;
- var iframePostForm = $.fn.iframePostForm;
- $.fn.iframePostForm = function(options) {
- return $(this).each(function () {
- $(this).submit(function() {
- options.complete(data);
- return false;
- });
- });
- };
var element = $('.state_attach');
equal(element.css('display'), 'none');
- equal($('.submission').css('display'), 'block');
- $('.state_submit .bug').text(bug);
$.bug.state_attach();
equal(element.css('display'), 'block');
- equal($('.bug', element).val(), bug);
-
- var error = 'ERROR';
- data = ' ... class="throw_error">' + error + '<';
- var caught = false;
- try {
- $('form', element).submit();
- } catch(e) {
- equal($('.error').text(), error);
- equal(e[1], error);
- caught = true;
- }
- ok(caught, 'caught');
-
- var attachment = '888';
- data = 'Attachment #' + attachment;
- $('form', element).submit();
- ok($('img', element).attr('src').indexOf(attachment) > 0, 'found attachment ' + attachment);
- $.fn.iframePostForm = iframePostForm;
});
test("logged_in", function() {
More information about the Libreoffice-commits
mailing list