cubicweb: comparison web/data/cubicweb.edition.js

Mercurial Mercurial > pub > hg > cubicweb / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

web/data/cubicweb.edition.js

changeset 1808	aa09e20dd8c0
parent 1798	cc86fe8efaaa
child 1864	4ceaf8f2709b

equal deleted inserted replaced

-:49075f57cf2c
+:aa09e20dd8c0
 /*
 *  :organization: Logilab
-*  :copyright: 2003-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+*  :copyright: 2003-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 *  :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 */
 CubicWeb.require('python.js');
 CubicWeb.require('htmlhelpers.js');
 *
 * @param varname the name of the variable as used in the original creation form
 * @param tabindex the tabindex that should be set on the widget
 */
 function setPropValueWidget(varname, tabindex) {
-var key = firstSelected(jQuery('#pkey:'+varname));
+var key = firstSelected(document.getElementById('pkey:'+varname));
 if (key) {
-	var args = _buildRemoteArgs('prop_widget', key, varname, tabindex);
+	var args = {fname: 'prop_widget', pageid: pageid,
-	jQuery('#div:value:'+varname).loadxhtml(JSON_BASE_URL, args, 'post');
+		    arg: map(jQuery.toJSON, [key, varname, tabindex])};
+	jqNode('div:value:'+varname).loadxhtml(JSON_BASE_URL, args, 'post');
 }
 }
 // *** EDITION FUNCTIONS ****************************************** //
 	}
 	return filter(isElementNode, elem.childNodes);
 });
 }
 function showMatchingSelect(selectedValue, eid) {
 if (selectedValue) {
 	divId = 'div' + selectedValue + '_' + eid;
 	var divNode = jQuery('#' + divId);
 	if (!divNode.length) {
 	    var args = {vid: 'unrelateddivs', relation: selectedValue,
-			rql: rql_for_eid(eid), pageid: pageid,
+			rql: rql_for_eid(eid), '__notemplate': 1,
-			'__notemplate': 1};
+			callback: function() {_showMatchingSelect(eid, jQuery('#' + divId))}};
-	    jQuery.get(JSON_BASE_URL, args, function(response) {
+	    jQuery('#unrelatedDivs_' + eid).loadxhtml(baseuri() + 'view', args, 'post', 'append');
-		// append generated HTML to the cell
-		jQuery('#unrelatedDivs_' + eid).append(getDomFromResponse(response));
-		_showMatchingSelect(eid, jQuery('#' + divId));
-	    });
-	    // deferred = doXHR(JSON_BASE_URL + queryString(args));
-	    // deferred.addCallback(_buildAndShowMatchingSelect, eid, divId);
 	} else {
 	    _showMatchingSelect(eid, divNode);
 	}
-}
+} else {
-else {
 	_showMatchingSelect(eid, null);
 }
 }
-// @param divStr a HTML string returned by the server
-// function _buildAndShowMatchingSelect(eid, divId, req) {
-//     var tdNode = jQuery('#unrelatedDivs_' + eid);
-//     // append generated HTML to the cell
-//     tdNode.appendChild(getDomFromRequest(req));
-//     _showMatchingSelect(eid, jQuery('#' + divId));
-// }
 // @param divNode is a jQuery selection
 function _showMatchingSelect(eid, divNode) {
 // hide all divs, and then show the matching one
 // (would actually be better to directly hide the displayed one)
 	return;
 }
 // add hidden parameter
 var entityForm = jQuery('#entityForm');
 var oid = optionNode.id.substring(2); // option id is prefixed by "id"
-remote_exec('add_pending_insert', oid.split(':'));
+remoteExec('add_pending_inserts', [oid.split(':')]);
 var selectNode = optionNode.parentNode;
 // remove option node
 selectNode.removeChild(optionNode);
 // add line in table
 if (cell) {
 var entityView = jqNode('a' + elementId).text();
 jqNode(element_name + elementId).remove();
 if (comboId) {
 	// re-insert option in combobox if it was taken from there
 	var selectNode = getNode(comboId);
+// XXX what on object relation
 	if (selectNode){
 	   var options = selectNode.options;
 	   var node_id = elementId.substring(0, elementId.indexOf(':'));
 	   options[options.length] = OPTION({'id' : elementId, 'value' : node_id}, entityView);
 	}
 }
-remote_exec('remove_pending_insert', elementId.split(':'));
+elementId = elementId.substring(2, elementId.length);
+remoteExec('remove_pending_insert', elementId.split(':'));
 }
 // this function builds a Handle to cancel pending insertion
 function buildPendingDeleteHandle(elementId, eid) {
 var jscall = "javascript: addPendingDelete('" + elementId + ', ' + eid + "');";
 'title' : _("delete this relation")}, '[x]');
 }
 // @param nodeId eid_from:r_type:eid_to
 function addPendingDelete(nodeId, eid) {
-var d = async_remote_exec('add_pending_delete', nodeId.split(':'));
+var d = asyncRemoteExec('add_pending_delete', nodeId.split(':'));
 d.addCallback(function () {
 	// and strike entity view
 	jqNode('span' + nodeId).addClass('pendingDelete');
 	// replace handle text
 	jqNode('handle' + nodeId).text('+');
 });
 }
 // @param nodeId eid_from:r_type:eid_to
 function cancelPendingDelete(nodeId, eid) {
-var d = async_remote_exec('remove_pending_delete', nodeId.split(':'));
+var d = asyncRemoteExec('remove_pending_delete', nodeId.split(':'));
 d.addCallback(function () {
 	// reset link's CSS class
 	jqNode('span' + nodeId).removeClass('pendingDelete');
 	// replace handle text
 	jqNode('handle' + nodeId).text('x');
 function selectForAssociation(tripletIdsString, originalEid) {
 var tripletlist = map(function (x) { return x.split(':'); },
 			  tripletIdsString.split('-'));
-var d = async_remote_exec('add_pending_inserts', tripletlist);
+var d = asyncRemoteExec('add_pending_inserts', tripletlist);
 d.addCallback(function () {
 	var args = {vid: 'edition', __mode: 'normal',
 		    rql: rql_for_eid(originalEid)};
-	document.location = 'view?' + as_url(args);
+	document.location = 'view?' + asURL(args);
 });
 }
 function updateInlinedEntitiesCounters(rtype) {
 jQuery('#inline' + rtype + 'slot span.icounter').each(function (i) {
 	this.innerHTML = i+1;
 });
-// var divnode = jQuery('#inline' + rtype + 'slot');
+}
-// var iforms = getElementsByTagAndClassName('span', 'icounter', divnode);
-// for (var i=0; i<iforms.length; i++) {
-//   iforms[i].innerHTML = i+1;
-// }
-}
 /*
 * makes an AJAX request to get an inline-creation view's content
 * @param peid : the parent entity eid
-* @param ptype : the parent entity type
 * @param ttype : the target (inlined) entity type
 * @param rtype : the relation type between both entities
 */
-function addInlineCreationForm(peid, ptype, ttype, rtype, role) {
+function addInlineCreationForm(peid, ttype, rtype, role) {
-var d = async_rawremote_exec('inline_creation_form', peid, ptype, ttype, rtype, role);
+var d = asyncRemoteExec('inline_creation_form', peid, ttype, rtype, role);
 d.addCallback(function (response) {
 	var linknode = getNode('add' + rtype + ':' + peid + 'link');
 var dom = getDomFromResponse(response);
 	var form = jQuery(dom);
 	form.css('display', 'none');
 	form.insertBefore(linknode.parentNode).slideDown('fast');
-	// setStyle(form, {display: 'none'});
-	// insertSiblingNodesBefore(linknode.parentNode, form);
 	updateInlinedEntitiesCounters(rtype);
-	// slideDown(form, {'duration':0.6});
 	reorderTabindex();
 	form.trigger('inlinedform-added');
 postAjaxLoad(dom);
-	// MochiKit.Signal.signal(CubicWeb, 'inlinedform-added', form);
 });
 d.addErrback(function (xxx) {
 	log('xxx =', xxx);
 });
 }
 * @param rtype : the relation type between both entities
 * @param eid : the inlined entity eid
 */
 function removeInlinedEntity(peid, rtype, eid) {
 var nodeid = ['rel', peid, rtype, eid].join('-');
-var divid = ['div', peid, rtype, eid].join('-');
-var noticeid = ['notice', peid, rtype, eid].join('-');
 var node = jqNode(nodeid);
 if (node && node.length) {
 	node.remove();
+	var divid = ['div', peid, rtype, eid].join('-');
 	jqNode(divid).fadeTo('fast', 0.5);
-	// setOpacity(divid, 0.4);
+	var noticeid = ['notice', peid, rtype, eid].join('-');
 	jqNode(noticeid).fadeIn('fast');
-	// appear(jQuery('#' + noticeid), {'duration': 0.5});
 }
 }
 function restoreInlinedEntity(peid, rtype, eid) {
 var nodeid = ['rel', peid, rtype, eid].join('-');
 var node = jqNode(nodeid);
 if (!(node && node.length)) {
 	node = INPUT({type: 'hidden', id: nodeid,
 		      name: rtype+':'+peid, value: eid});
 	jqNode(['fs', peid, rtype, eid].join('-')).append(node);
-	// appendChildNodes(fs, node);
 	jqNode(divid).fadeTo('fast', 1);
-	// setOpacity(divid, 1);
 	jqNode(noticeid).hide();
-	// jQuery('#' + noticeid).hide();
 }
 }
 function _clearPreviousErrors(formid) {
 jQuery('#' + formid + ' span.error').remove();
 jQuery('form.entityForm').each(function () {
 	var form = jQuery(this);
 	var target = form.attr('cubicweb:target');
 	if (target) {
 	    form.attr('target', target);
-	    /* do not use display: none because some browser ignore iframe
+	    /* do not use display: none because some browsers ignore iframe
-*     with no display */
+* with no display */
 	    form.append(IFRAME({name: target, id: target,
 				src: 'javascript: void(0)',
 				width: '0px', height: '0px'}));
 	}
 });
 }
 $(document).ready(setFormsTarget);
-function _sendForm(formid, action) {
-var zipped = formContents(formid);
-return async_remote_exec('validate_form', action, zipped[0], zipped[1]);
-}
 /*
 * called on traditionnal form submission : the idea is to try
 * to post the form. If the post is successful, `validateForm` redirects
 * to the appropriate URL. Otherwise, the validation errors are displayed
 * around the corresponding input fields.
 */
 function validateForm(formid, action, onsuccess) {
 try {
-	var d = _sendForm(formid, action);
+	var zipped = formContents(formid);
+	var d = asyncRemoteExec('validate_form', action, zipped[0], zipped[1]);
 } catch (ex) {
 	log('got exception', ex);
 	return false;
 }
 function _callback(result, req) {
 	handleFormValidationResponse(formid, onsuccess, result);
 }
-// d.addCallback(handleFormValidationResponse, formid, onsuccess);
 d.addCallback(_callback);
 return false;
 }
-/*
-* called by live-edit forms to submit changes
+/*
+* called by reledit forms to submit changes
 * @param formid : the dom id of the form used
 * @param rtype : the attribute being edited
 * @param eid : the eid of the entity being edited
 * @param reload: boolean to reload page if true (when changing URL dependant data)
 */
-function inlineValidateForm(formid, rtype, eid, divid, reload) {
+function inlineValidateAttributeForm(formid, rtype, eid, divid, reload, default_value) {
 try {
 	var form = getNode(formid);
 	if (typeof FCKeditorAPI != "undefined") {
 	    for ( var name in FCKeditorAPI.__Instances ) {
 		var oEditor = FCKeditorAPI.__Instances[name] ;
 		    oEditor.UpdateLinkedField();
 		}
 	    }
 	}
 	var zipped = formContents(form);
-	var d = async_remote_exec('edit_field', 'apply', zipped[0], zipped[1], rtype, eid);
+	var d = asyncRemoteExec('edit_field', 'apply', zipped[0], zipped[1],
+rtype, eid, default_value);
 } catch (ex) {
 	log('got exception', ex);
 	return false;
 }
 d.addCallback(function (result, req) {
 	return false;
 });
 return false;
 }
+function inlineValidateRelationForm(formid, rtype, role, eid, divid, vid, default_value) {
+try {
+	var form = getNode(formid);
+var relname = rtype + ':' + eid;
+var newtarget = jQuery('[name=' + relname + ']').val();
+	var zipped = formContents(form);
+	var d = asyncRemoteExec('edit_relation', 'apply', zipped[0], zipped[1], rtype, role,
+eid, vid, default_value);
+} catch (ex) {
+	log('got exception', ex);
+	return false;
+}
+d.addCallback(function (result, req) {
+handleFormValidationResponse(formid, noop, result);
+	var fieldview = getNode(divid);
+fieldview.innerHTML = result[2];
+	// switch inline form off only if no error
+	if (result[0]) {
+// hide global error messages
+	  jQuery('div.errorMessage').remove();
+	  jQuery('#appMsg').hide();
+var inputname = 'edit' + role[0] + '-' + relname;
+jQuery('input[name=' + inputname + ']').val(newtarget);
+	  cancelInlineEdit(eid, rtype, divid);
+	}
+return false;
+});
+return false;
+}
 /**** inline edition ****/
 function showInlineEditionForm(eid, rtype, divid) {
 jQuery('#' + divid).hide();
 jQuery('#' + divid + '-form').show();
 }

cubicweb