diff --git a/main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js b/main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js
index f31652f18..063a94ae3 100644
--- a/main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js
+++ b/main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js
@@ -55,7 +55,7 @@ function ExtendReconciledDataPreviewDialog(column, columnIndex, rowIndices, onDo
self._onDone(self._extension,
self._service,
self._serviceMetadata.identifierSpace,
- self._serviceMetadata.schemaSpace);
+ self._serviceMetadata.schemaSpace);
}
});
this._elmts.cancelButton.click(function() {
@@ -76,7 +76,7 @@ function ExtendReconciledDataPreviewDialog(column, columnIndex, rowIndices, onDo
if ("extend" in serviceMetadata) {
extend = serviceMetadata.extend;
if ("propose_properties" in extend) {
- var endpoint = extend.propose_properties;
+ var endpoint = extend.propose_properties;
this._proposePropertiesUrl = endpoint.service_url + endpoint.service_path;
}
}
@@ -101,32 +101,32 @@ ExtendReconciledDataPreviewDialog.getAllProperties = function(url, typeID, onDon
} else {
var done = false;
$.getJSON(
- url +"?type=" + typeID + "&callback=?",
- null,
- function(data) {
- if (done) return;
- done = true;
+ url +"?type=" + typeID + "&callback=?",
+ null,
+ function(data) {
+ if (done) return;
+ done = true;
- var allProperties = [];
- for (var i = 0; i < data.properties.length; i++) {
- var property = data.properties[i];
- var property2 = {
- id: property.id,
- name: property.name
- };
- allProperties.push(property2);
- }
- allProperties.sort(function(a, b) { return a.name.localeCompare(b.name); });
+ var allProperties = [];
+ for (var i = 0; i < data.properties.length; i++) {
+ var property = data.properties[i];
+ var property2 = {
+ id: property.id,
+ name: property.name
+ };
+ allProperties.push(property2);
+ }
+ allProperties.sort(function(a, b) { return a.name.localeCompare(b.name); });
- onDone(allProperties);
- }
+ onDone(allProperties);
+ }
);
window.setTimeout(function() {
- if (done) return;
+ if (done) return;
- done = true;
- onDone([]);
+ done = true;
+ onDone([]);
}, 7000); // time to give up?
}
};
@@ -172,7 +172,7 @@ ExtendReconciledDataPreviewDialog.prototype._show = function(properties) {
ExtendReconciledDataPreviewDialog.prototype._update = function() {
this._elmts.previewContainer.empty().html(
- '

');
+ '
');
var self = this;
var params = {
@@ -180,23 +180,23 @@ ExtendReconciledDataPreviewDialog.prototype._update = function() {
columnName: this._column.name
};
- if(this._extension.properties.length == 0) {
+ if(this._extension.properties.length === 0) {
// if the column selection is empty, reset the view
this._elmts.previewContainer.empty();
} else {
// otherwise, refresh the preview
$.post(
- "command/core/preview-extend-data?" + $.param(params),
- {
- rowIndices: JSON.stringify(this._rowIndices),
- extension: JSON.stringify(this._extension)
- },
- function(data) {
- self._renderPreview(data);
- },
- "json"
+ "command/core/preview-extend-data?" + $.param(params),
+ {
+ rowIndices: JSON.stringify(this._rowIndices),
+ extension: JSON.stringify(this._extension)
+ },
+ function(data) {
+ self._renderPreview(data);
+ },
+ "json"
).fail(function(data) {
- alert($.i18n._("core-views")["internal-err"]);
+ alert($.i18n._("core-views")["internal-err"]);
});
}
};
@@ -284,8 +284,8 @@ ExtendReconciledDataPreviewDialog.prototype._renderPreview = function(data) {
if (cell !== null) {
if ($.isPlainObject(cell)) {
$('').attr("href",
- this._serviceMetadata.identifierSpace + cell.id
- ).attr("target", "_blank").text(cell.name).appendTo(td);
+ this._serviceMetadata.identifierSpace + cell.id
+ ).attr("target", "_blank").text(cell.name).appendTo(td);
} else {
$('').text(cell).appendTo(td);
}
@@ -331,50 +331,50 @@ ExtendReconciledDataPreviewDialog.prototype._constrainProperty = function(id) {
var table = $('');
if (fields != null) {
for(var i = 0; i < fields.length; i++) {
- var field = fields[i];
+ var field = fields[i];
var fieldHTML = '';
- var currentValue = field.default;
+ var currentValue = field.default;
if (property.settings != null && property.settings[field.name] != null) {
currentValue = property.settings[field.name];
}
- var tr = $('
');
- var td = $(' | ').attr('title', field.help_text).appendTo(tr);
- if (field.type === 'select') {
- var fieldLabel = $('').text(field.label+':').appendTo(td);
- td.append($('
'));
- for(var j = 0; j < field.choices.length; j++) {
- var choice = field.choices[j];
- var labelElem = $('').attr('for', field.name+'_'+choice.value).appendTo(td);
- var inputElem = $('').attr(
- 'id', field.name+'_'+choice.value).attr(
- 'value', choice.value).attr(
- 'name', field.name).appendTo(labelElem);
+ var tr = $('
');
+ var td = $(' | ').attr('title', field.help_text).appendTo(tr);
+ if (field.type === 'select') {
+ var fieldLabel = $('').text(field.label+':').appendTo(td);
+ td.append($('
'));
+ for(var j = 0; j < field.choices.length; j++) {
+ var choice = field.choices[j];
+ var labelElem = $('').attr('for', field.name+'_'+choice.value).appendTo(td);
+ var inputElem = $('').attr(
+ 'id', field.name+'_'+choice.value).attr(
+ 'value', choice.value).attr(
+ 'name', field.name).appendTo(labelElem);
- if (choice.value === currentValue) {
- inputElem.attr('checked', 'checked');
- }
+ if (choice.value === currentValue) {
+ inputElem.attr('checked', 'checked');
+ }
labelElem.append(' '+choice.name);
td.append('
');
- }
- td.append(fieldHTML);
- } else if (field.type === 'checkbox') {
- var label = $('').attr('for', field.name).appendTo(td);
- var input = $('').attr('name', field.name).appendTo(label);
- if (currentValue === 'on') {
- input.attr('checked','checked');
- }
- label.append(' '+field.label);
+ }
+ td.append(fieldHTML);
+ } else if (field.type === 'checkbox') {
+ var label = $('').attr('for', field.name).appendTo(td);
+ var input = $('').attr('name', field.name).appendTo(label);
+ if (currentValue === 'on') {
+ input.attr('checked','checked');
+ }
+ label.append(' '+field.label);
} else if (field.type === 'number' || field.type == 'text') {
- var label = $('').attr('for', field.name).appendTo(td);
- label.append(field.label+': ');
- var input = $('').attr(
- 'name', field.name).attr(
- 'type', field.type).attr(
- 'value', currentValue).appendTo(label);
- }
- if (tr.children().length > 0) {
- table.append(tr);
- }
+ var label = $('').attr('for', field.name).appendTo(td);
+ label.append(field.label+': ');
+ var input = $('').attr(
+ 'name', field.name).attr(
+ 'type', field.type).attr(
+ 'value', currentValue).appendTo(label);
+ }
+ if (tr.children().length > 0) {
+ table.append(tr);
+ }
}
}
@@ -404,19 +404,19 @@ ExtendReconciledDataPreviewDialog.prototype._constrainProperty = function(id) {
try {
if (fields != null) {
var elem = $(bodyElmts.form[0]);
- var ar = elem.serializeArray();
- var settings = {};
+ var ar = elem.serializeArray();
+ var settings = {};
for(var i = 0; i < ar.length; i++) {
settings[ar[i].name] = ar[i].value;
- }
- property.settings = settings;
+ }
+ property.settings = settings;
}
dismiss();
self._update();
} catch (e) {
- alert($.i18n._("core-views")["internal-err"]);
+ alert($.i18n._("core-views")["internal-err"]);
}
});