[Libreoffice-commits] .: bug/bug bug/bug.xhtml

[Rob Snelders]

 bug/bug.xhtml  |    1 +
 bug/bug/bug.js |   14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit cd764b2fd0149e3075aa77aa365d3a2ef55730d4
Author: Rob Snelders <programming at ertai.nl>
Date:   Sun Nov 25 13:04:41 2012 +0100

    more minor bugfixes

diff --git a/bug/bug.xhtml b/bug/bug.xhtml
index 748377b..7521e1f 100644
--- a/bug/bug.xhtml
+++ b/bug/bug.xhtml
@@ -209,6 +209,7 @@ Expected behavior:
                 <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="keywords" value=""></input>
                 <input type="hidden" name="comment" value=""></input>
                 <div class="state state_attach">
                   <input type="hidden" name="contenttypemethod" value="autodetect"></input>
diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index 21df0c8..755b8d8 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -251,6 +251,11 @@
 
         state_submit: function() {
             var element = $('.state_submit');
+            if ($.bug.token == '') {
+                $.bug.ajax('GET', $.bug.url + '/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED').pipe(function(data){
+                    $.bug.token = data.match(/<input type="hidden" name="token" value="([A-Za-z0-9]{10})">/)[1];
+                });
+            }
             if(!element.hasClass('initialized')) {
 
                 var form = $('.submission_form form');
@@ -262,11 +267,6 @@
                     } else {
                         $(element).addClass('inprogress');
                     }
-                    if ($.bug.token == '') {
-                        $.bug.ajax('GET', $.bug.url + '/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED').pipe(function(data){
-                            $.bug.token = data.match(/<input type="hidden" name="token" value="([A-Za-z0-9]{10})">/)[1];
-                        });
-                    }
                     var component = $('.state_component .chosen').attr('data').replace('_',' ');
                     var short_desc = $.bug.subcomponent + ': ' + $('.state_description .short').val();
                     //Add Operating System
@@ -274,7 +274,7 @@
                     var comment = $('.state_description .long').val();
                     var regression = (($.bug.regression != "NONE" && $.bug.regression != "")?$.bug.regression:"");
                     comment = comment + "\nOperating System: " + $(".op_sys .chosen").text();
-                    comment = comment + (regression != "")?"\nLast worked in: " + regression:"";
+                    comment = comment + ((regression != "")?"\nLast worked in: " + regression:"");
                     $("body").css("cursor", "progress");
                     $('input[name="token"]', form).val($.bug.token);
                     $('input[name="component"]', form).val(component);
@@ -282,7 +282,7 @@
                     $('input[name="op_sys"]', form).val($.bug.op_sys);
                     $('input[name="short_desc"]', form).val(short_desc);
                     $('input[name="comment"]', form).val(comment);
-                    $('input[name="keywords"]', form).val((regression != "")?"regression":"");
+                    $('input[name="keywords"]', form).val(((regression != "")?"regression":""));
                     $.bug.token = '';
                     return true;
                 });