litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merging r886 r905 r914:918 r923 r933:937 r957 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-20 23:36:58 +00:00
parent 0b1a8394c4
commit 48f664525b
9 changed files with 67 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

5
productMods/edit/forms/js/addAuthorsToInformationResource.js
View file

@ -209,7 +209,6 @@ var addAuthorForm = {
},
setAcFilter: function() {
var existingAuthors = $('#authorships .authorName');
this.acFilter = [];
@ -391,9 +390,7 @@ var addAuthorForm = {
alert('Reordering of authors failed.');
} // What should we do if the reordering fails?
else {
}
}
}
});
},

23
productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
View file

@ -21,7 +21,7 @@ var customForm = {
// On page load, create references for easy access to form elements.
// NB These must be assigned after the elements have been loaded onto the page.
initObjects: function(){
this.form = $('#content form');
this.fullViewOnly = $('.fullViewOnly');
this.button = $('#submit');
@ -84,7 +84,7 @@ var customForm = {
},
initFormView: function() {
var typeVal = this.typeSelector.val();
if (this.findValidationErrors()) {
@ -104,7 +104,7 @@ var customForm = {
},
initFormTypeView: function() {
this.setType(); // empty any previous values (perhaps not needed)
this.hideFields(this.fullViewOnly);
this.button.hide();
@ -177,7 +177,7 @@ var customForm = {
// Bind event listeners that persist over the life of the page. Event listeners
// that depend on the view should be initialized in the view setup method.
bindEventListeners: function() {
this.typeSelector.change(function() {
var typeVal = $(this).val();
@ -197,7 +197,7 @@ var customForm = {
},
initAutocomplete: function() {
if (this.editMode === 'edit') {
return;
}
@ -220,7 +220,7 @@ var customForm = {
dataType: 'json',
data: {
term: request.term,
type: customForm.acType,
type: customForm.acType
},
complete: function(xhr, status) {
// Not sure why, but we need an explicit json parse here. jQuery
@ -233,15 +233,13 @@ var customForm = {
});
},
select: function(event, ui) {
customForm.showAutocompleteSelection(ui.item.label, ui.item.uri);
customForm.showAutocompleteSelection(ui.item.label, ui.item.uri);
}
});
},
getAcFilter: function() {
if (!this.sparqlForAcFilter) {
//console.log('autocomplete filtering turned off');
this.acFilter = null;
@ -249,7 +247,7 @@ var customForm = {
}
//console.log("sparql for autocomplete filter: " + this.sparqlForAcFilter);
// Define this.acFilter here, so in case the sparql query fails
// we don't get an error when referencing it later.
this.acFilter = [];
@ -268,6 +266,7 @@ var customForm = {
},
setAcFilter: function(data) {
var key = data.head.vars[0];
$.each(data.results.bindings, function() {
@ -418,7 +417,7 @@ var customForm = {
else {
this.button.val('Add ' + this.baseButtonText);
}
},
}
};