kallithea Changeset - 287332039f57

Changeset - 287332039f57

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 11 years ago 2015-03-31 01:17:37
madski@unity3d.com

javascript: use jQuery $.post instead of YAHOO.util.Connect.asyncRequest

ajaxPOST will add the extra custom X-PARTIAL-XHR header ... but it does no harm
in these cases.

2 files changed with 31 insertions and 41 deletions:

kallithea/public/js/base.js

kallithea/templates/admin/settings/settings_hooks.html

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -381,34 +381,35 @@ function asynchtml(url, $target, success @@
 var ajaxGET = function(url,success) {
     return $.ajax({url: url, headers: {'X-PARTIAL-XHR': '1'}, cache: false})
         .done(success)
         .fail(function(jqXHR, textStatus, errorThrown) {
                 if (textStatus == "abort")
                     return;
                 alert("Ajax GET error: " + textStatus);
         })
+        ;
 };
 var ajaxPOST = function(url,postData,success) {
+var ajaxPOST = function(url, postData, success, failure) {
     var postData = _toQueryString(postData);
     if(failure === undefined) {
         failure = function(jqXHR, textStatus, errorThrown) {
                 if (textStatus != "abort")
                     alert("Error posting to server: " + textStatus);
             };
+    }
     return $.ajax({url: url, data: postData, type: 'POST', headers: {'X-PARTIAL-XHR': '1'}, cache: false})
         .done(success)
         .fail(function(jqXHR, textStatus, errorThrown) {
                 if (textStatus == "abort")
                     return;
                 alert("Ajax POST error: " + textStatus);
             })
+        ;
         .fail(failure);
 };
 /**
  * activate .show_more links
  * the .show_more must have an id that is the the id of an element to hide prefixed with _
  * the parentnode will be displayed
  */
 var show_more_event = function(){
     $('.show_more').click(function(e){
         var el = e.currentTarget;
         $('#' + el.id.substring(1)).hide();
@@ @@ -1065,55 +1066,49 @@ var getSelectionLink = function(e) { @@
             $hl_div.append($('<a>').html(_TM['Selection link']).attr('href', location.href.substring(0, location.href.indexOf('#')) + '#L' + ranges[0] + '-'+ranges[1]));
             var xy = $(till).offset();
             $hl_div.css('top', (xy.top + yoffset) + 'px').css('left', xy.left + 'px');
             $hl_div.show();
+        }
         else{
             $hl_div.hide();
+        }
+    }
 };
 var deleteNotification = function(url, notification_id, callbacks){
     var callback = {
         success:function(o){
     var success = function(o){
             $("#notification_"+notification_id).remove();
             _run_callbacks(callbacks);
         },
         failure:function(o){
         };
     var failure = function(o){
             alert("deleteNotification failure");
+        }
     };
     var postData = '_method=delete';
         };
     var postData = {'_method': 'delete'};
     var sUrl = url.replace('__NOTIFICATION_ID__',notification_id);
     var request = YAHOO.util.Connect.asyncRequest('POST', sUrl,
                                                   callback, postData);
     ajaxPOST(sUrl, postData, success, failure);
 };
 var readNotification = function(url, notification_id, callbacks){
     var callback = {
         success:function(o){
     var success = function(o){
             var $obj = $("#notification_"+notification_id);
             $obj.removeClass('unread');
             $obj.find('.read-notification').remove();
             _run_callbacks(callbacks);
         },
         failure:function(o){
         };
     var failure = function(o){
             alert("readNotification failure");
+        }
     };
     var postData = '_method=put';
         };
     var postData = {'_method': 'put'};
     var sUrl = url.replace('__NOTIFICATION_ID__',notification_id);
     var request = YAHOO.util.Connect.asyncRequest('POST', sUrl,
                                                   callback, postData);
     ajaxPOST(sUrl, postData, success, failure);
 };
 /** MEMBERS AUTOCOMPLETE WIDGET **/
 var _MembersAutoComplete = function (divid, cont, users_list, groups_list) {
     var myUsers = users_list;
     var myGroups = groups_list;
     // Define a custom search function for the DataSource of users
     var matchUsers = function (sQuery) {
             // Case insensitive matching
             var query = sQuery.toLowerCase();
@@ @@ -1720,53 +1715,50 @@ var dateSort = function(a, b, desc, fiel @@
     return YAHOO.util.Sort.compare(a_, b_, desc);
 };
 var addPermAction = function(_html, users_list, groups_list){
     var $last_node = $('.last_new_member').last(); // empty tr between last and add
     var next_id = $('.new_members').length;
     $last_node.before($('<tr class="new_members">').append(_html.format(next_id)));
     _MembersAutoComplete("perm_new_member_name_"+next_id,
             "perm_container_"+next_id, users_list, groups_list);
+}
 function ajaxActionRevokePermission(url, obj_id, obj_type, field_id, extra_data) {
     var callback = {
         success: function (o) {
     var success = function (o) {
             $('#' + field_id).remove();
         },
         failure: function (o) {
         };
     var failure = function (o) {
             alert(_TM['Failed to revoke permission'] + ": " + o.status);
+        }
     };
         };
     var query_params = {
         '_method': 'delete'
+    }
     // put extra data into POST
     if (extra_data !== undefined && (typeof extra_data === 'object')){
         for(var k in extra_data){
             query_params[k] = extra_data[k];
+        }
+    }
     if (obj_type=='user'){
         query_params['user_id'] = obj_id;
         query_params['obj_type'] = 'user';
+    }
     else if (obj_type=='user_group'){
         query_params['user_group_id'] = obj_id;
         query_params['obj_type'] = 'user_group';
+    }
     var request = YAHOO.util.Connect.asyncRequest('POST', url, callback,
             _toQueryString(query_params));
     ajaxPOST(url, query_params, success, failure);
 };
 /* Multi selectors */
 var MultiSelectWidget = function(selected_id, available_id, form_id){
     var $availableselect = $('#' + available_id);
     var $selectedselect = $('#' + selected_id);
     //fill available only with those not in selected
     var $selectedoptions = $selectedselect.children('option');
     $availableselect.children('option').filter(function(i, e){
             for(var j = 0, node; node = $selectedoptions[j]; j++){

kallithea/templates/admin/settings/settings_hooks.html

➞

Show inline comments

@@ @@ -51,25 +51,23 @@ ${h.form(url('admin_settings_hooks'), me @@
       </div>
       <div class="buttons" style="margin-left:280px">
          ${h.submit('save',_('Save'),class_="btn")}
       </div>
     </div>
 </div>
 ${h.end_form()}
 % endif
 <script type="text/javascript">
 function ajaxActionHook(hook_id,field_id) {
     var sUrl = "${h.url('admin_settings_hooks')}";
     var callback = {
         success: function (o) {
     var success = function (o) {
             var elem = YUD.get(""+field_id);
             elem.parentNode.removeChild(elem);
         },
         failure: function (o) {
         };
     var failure = function (o) {
             alert("${_('Failed to remove hook')}");
+        }
     };
     var postData = '_method=delete&hook_id=' + hook_id;
     var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData);
         };
     var postData = {'_method': 'delete', 'hook_id': hook_id};
     ajaxPOST(sUrl, postData, success, failure);
 };
 </script>

0 comments (0 inline, 0 general)