extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Use a et2_dialog over native prompt for editing comments

Browse Source 
- Use jsapi's egw.json() for ajax
This commit is contained in:
Nathan Gray 2013-09-10 17:57:41 +00:00
parent ca54de9e2c
commit 3ae18c9a78
1 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
etemplate/js/et2_widget_link.js
View File

@ -302,11 +302,14 @@ var et2_link_to = et2_inputWidget.extend(
} }
} }
var request = new egw_json_request("etemplate_widget_link::ajax_link::etemplate", var request = egw.json("etemplate_widget_link::ajax_link::etemplate",
[values.to_app, values.to_id, links], [values.to_app, values.to_id, links],
this self._link_result,
self,
true,
self
); );
request.sendRequest(true, self._link_result, self); request.sendRequest();
}, },
/** /**
@ -792,12 +795,13 @@ var et2_link_entry = et2_inputWidget.extend(
this.search.addClass("loading"); this.search.addClass("loading");
this.clear.show(); this.clear.show();
var request = new egw_json_request("etemplate_widget_link::ajax_link_search::etemplate", var request = egw.json("etemplate_widget_link::ajax_link_search::etemplate",
[this.app_select.val(), '', request.term, request.options], [this.app_select.val(), '', request.term, request.options],
this this._results,
this,true,this
); );
this.response = response; this.response = response;
request.sendRequest(true, this._results, this); request.sendRequest();
}, },
/** /**
@ -864,11 +868,13 @@ var et2_link_entry = et2_inputWidget.extend(
// If a link array was passed in, don't make the ajax call // If a link array was passed in, don't make the ajax call
if(typeof _links == 'undefined') if(typeof _links == 'undefined')
{ {
var request = new egw_json_request("etemplate_widget_link::ajax_link::etemplate", var request = egw.json("etemplate_widget_link::ajax_link::etemplate",
[values.to_app, values.to_id, links], [values.to_app, values.to_id, links],
this self._link_result,
this,
true
); );
request.sendRequest(true, self._link_result, self); request.sendRequest();
} }
}, },
@ -1232,22 +1238,29 @@ var et2_link_list = et2_link_string.extend(
this.context = new egwMenu(); this.context = new egwMenu();
this.context.addItem("comment", this.egw().lang("Comment"), "", function() { this.context.addItem("comment", this.egw().lang("Comment"), "", function() {
var link_id = self.context.data.link_id; var link_id = self.context.data.link_id;
var comment = prompt(self.egw().lang("Comment"));
if(comment !== null) et2_dialog.show_prompt(
{ function(button, comment) {
if(button != et2_dialog.OK_BUTTON) return;
var remark = jQuery('#link_'+link_id, self.list).children('.remark'); var remark = jQuery('#link_'+link_id, self.list).children('.remark');
remark.addClass("loading"); remark.addClass("loading");
var request = new egw_json_request("etemplate_widget_link::ajax_link_comment::etemplate", var request = egw.json("etemplate_widget_link::ajax_link_comment::etemplate",
[link_id, comment], [link_id, comment],
this function() {
);
request.sendRequest(true, function() {
if(remark) if(remark)
{ {
// Append "" to make sure it's a string, not undefined
remark.removeClass("loading").text(comment+""); remark.removeClass("loading").text(comment+"");
// Update internal data
self.context.data.remark = comment+"";
} }
}, self); },
} this,true
).sendRequest();
},
'',self.egw().lang("Comment"),self.context.data.remark||''
);
}); });
this.context.addItem("file_info", this.egw().lang("File information"), this.egw().image("edit"), function(menu_item) { this.context.addItem("file_info", this.egw().lang("File information"), this.egw().image("edit"), function(menu_item) {
var link_data = self.context.data; var link_data = self.context.data;
@ -1273,6 +1286,16 @@ var et2_link_list = et2_link_string.extend(
}); });
}, },
destroy: function() {
this._super.apply(this, arguments);
if(this.context)
{
this.context.clear();
delete this.context;
}
},
_add_link: function(_link_data) { _add_link: function(_link_data) {
var row = $j(document.createElement("tr")) var row = $j(document.createElement("tr"))
.attr("id", "link_"+_link_data.link_id) .attr("id", "link_"+_link_data.link_id)
@ -1346,8 +1369,9 @@ var et2_link_list = et2_link_string.extend(
delete_button.removeClass("delete").addClass("loading"); delete_button.removeClass("delete").addClass("loading");
if(link_id) if(link_id)
{ {
new egw_json_request("etemplate.etemplate_widget_link.ajax_delete", [link_id]) egw.json("etemplate.etemplate_widget_link.ajax_delete", [link_id],
.sendRequest(true, function(data) { if(data) {row.slideUp(row.remove);}}); function(data) { if(data) {row.slideUp(row.remove);}}
).sendRequest();
} }
} }
}); });