Merge branch 'master' into development

5 files changed, 27 insertions, 25 deletions

diff --git a/askbot/__init__.py b/askbot/__init__.py
index af5dac51..efaf2490 100644
--- a/askbot/__init__.py
+++ b/askbot/__init__.py
@@ -19,4 +19,4 @@ def get_version():
     """returns version of the askbot app
     this version is meaningful for pypi only
     """
-    return '0.6.37'
+    return '0.6.38'
diff --git a/askbot/skins/default/media/jquery-openid/jquery.openid.js b/askbot/skins/default/media/jquery-openid/jquery.openid.js
index 36937d1d..b3b06d40 100755
--- a/askbot/skins/default/media/jquery-openid/jquery.openid.js
+++ b/askbot/skins/default/media/jquery-openid/jquery.openid.js
@@ -46,14 +46,16 @@ $.fn.authenticator = function() {
         setup_enter_key_handler(elements);
     };
 
+    var get_provider_name = function(row_el){
+        var row = $(row_el);
+        var name_span = row.find('.ab-provider-name');
+        return provider_name = $.trim(name_span.html());
+    };
+
     var read_existing_login_methods = function(){
         $('.ab-provider-row').each(
             function(i, provider_row){
-                var provider_name = $(
-                                    provider_row
-                                ).find(
-                                    '.ab-provider-name'
-                                ).html().trim();
+                var provider_name = get_provider_name(provider_row);
                 existing_login_methods[provider_name] = true;
             }
         );
@@ -62,11 +64,7 @@ $.fn.authenticator = function() {
     var setup_login_method_deleters = function(){
         $('.ab-provider-row').each(
             function(i, provider_row){
-                var provider_name = $(
-                                    provider_row
-                                ).find(
-                                    '.ab-provider-name'
-                                ).html().trim();
+                var provider_name = get_provider_name(provider_row);
                 var remove_button = $(
                                     provider_row
                                 ).find('button');
@@ -102,8 +100,7 @@ $.fn.authenticator = function() {
                                         );
                                         existing_login_methods = null;
                                     }
-                                },
-
+                                }
                             });
                         }
                     }
diff --git a/askbot/skins/default/media/js/live_search.js b/askbot/skins/default/media/js/live_search.js
index 40bd09a7..f01cfebf 100644
--- a/askbot/skins/default/media/js/live_search.js
+++ b/askbot/skins/default/media/js/live_search.js
@@ -339,7 +339,7 @@ $(document).ready(function(){
             data: {query: query_text, sort: sort_method},
             dataType: 'json',
             success: render_result,
-            complete: try_again,
+            complete: try_again
         });
         prev_text = query_text;
     }
@@ -351,7 +351,7 @@ $(document).ready(function(){
             data: {reset_query: true, sort: sort_method},
             dataType: 'json',
             success: render_result,
-            complete: try_again,
+            complete: try_again
         });
         prev_text = '';
     }
diff --git a/askbot/skins/default/media/js/post.js b/askbot/skins/default/media/js/post.js
index d850968d..5b7185dd 100644
--- a/askbot/skins/default/media/js/post.js
+++ b/askbot/skins/default/media/js/post.js
@@ -64,7 +64,7 @@ function setupFormValidation(form, validationRules, validationMessages, onSubmit
         errorPlacement: function(error, element) {
             var span = element.next().find("span.form-error");
             if (span.length === 0) {
-                var span = element.parent().find("span.form-error");
+                span = element.parent().find("span.form-error");
                 if (span.length === 0){
                     //for resizable textarea
                     var element_id = element.attr('id');
@@ -112,7 +112,7 @@ var CPValidator = function(){
                     required: true,
                     maxlength: 105,
                     limit_tag_count: true,
-                    limit_tag_length: true,
+                    limit_tag_length: true
                 },  
                 text: {
                     required: true,
@@ -736,7 +736,7 @@ var questionRetagger = function(){
                     required: true,
                     maxlength: askbot['settings']['maxTagsPerPost'] * askbot['settings']['maxTagLength'],
                     limit_tag_count: true,
-                    limit_tag_length: true,
+                    limit_tag_length: true
                 }
             },
             messages: {
@@ -748,7 +748,7 @@ var questionRetagger = function(){
                 }
             },
             submitHandler: doRetag,
-            errorClass: "retag-error",
+            errorClass: "retag-error"
         });
 
         return div;
@@ -1082,7 +1082,7 @@ EditCommentForm.prototype.getSaveHandler = function(){
         var text = me._textarea.val();
         if (text.length <= 10){
             me.focus();
-            return;
+            return false;
         }
 
         var post_data = {
@@ -1124,6 +1124,7 @@ EditCommentForm.prototype.getSaveHandler = function(){
                 me.enableButtons();
             }
         });
+        return false;
     };
 };
 
@@ -1278,7 +1279,7 @@ Comment.prototype.loadText = function(on_load_handler){
         },
         error: function(xhr, textStatus, exception) {
             showMessage(me.getElement(), xhr.responseText, 'after');
-        },
+        }
     });
 };
 
@@ -1493,7 +1494,7 @@ var socialSharing = function(){
         }
     }
 
-    return{
+    return {
         init: function(page_url, text_to_share){
             URL = window.location.href;
             TEXT = escape($('div.headNormal > a').html());
@@ -1503,7 +1504,7 @@ var socialSharing = function(){
             copyAltToTitle(tw);
             setupButtonEventHandlers(fb, function(){share_page("facebook")});
             setupButtonEventHandlers(tw, function(){share_page("twitter")});
-        },
+        }
     }
 }(); 
 
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index a761716a..37b2bc8c 100755
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -2260,6 +2260,10 @@ p.space-above {
     color: darkred;
 }
 
+button::-moz-focus-inner {
+    padding:0;
+    border:none;
+}
 .submit {
     cursor: pointer; /*letter-spacing:1px;*/
     background-color: #D4D0C8;
@@ -2275,16 +2279,16 @@ p.space-above {
 }
 
 .submit.small {
+    margin-right:5px;
     height:20px;
     font-weight:normal;
     font-size:12px;
-    padding:0 5px;
+    padding:1px 5px;
 }
 .submit.small:hover {
     text-decoration:none;
 }
 
-
 .ask-body {
     padding-right: 10px;
 }