allow for editing lat/lng/s/w/n/e via map
This commit is contained in:
parent
1eebdf3805
commit
7eb6f58312
4 changed files with 32 additions and 23 deletions
|
@ -392,26 +392,28 @@ Ox.TextList = function(options, self) {
|
|||
borderRightWidth: (self.options.columnsVisible ? 1 : 0) + 'px',
|
||||
textAlign: v.align
|
||||
})
|
||||
.html(v.id in data ? formatValue(data[v.id], v.format) : '')
|
||||
.html(v.id in data ? formatValue(v.id, data[v.id]) : '')
|
||||
.appendTo($item);
|
||||
});
|
||||
function formatValue(value, format) {
|
||||
if (value === null) {
|
||||
value = '';
|
||||
} else if (format) {
|
||||
value = Ox.isObject(format) ?
|
||||
Ox['format' + Ox.toTitleCase(format.type)]
|
||||
.apply(this, $.merge([value], format.args)) :
|
||||
format(value);
|
||||
} else if (Ox.isArray(value)) {
|
||||
value = value.join(', ');
|
||||
}
|
||||
return value;
|
||||
}
|
||||
//Math.random() < 0.01 && Ox.print('item', data, $item);
|
||||
return $item;
|
||||
}
|
||||
|
||||
function formatValue(key, value) {
|
||||
var format = self.format[key];
|
||||
if (value === null) {
|
||||
value = '';
|
||||
} else if (format) {
|
||||
value = Ox.isObject(format) ?
|
||||
Ox['format' + Ox.toTitleCase(format.type)]
|
||||
.apply(this, $.merge([value], format.args)) :
|
||||
format(value);
|
||||
} else if (Ox.isArray(value)) {
|
||||
value = value.join(', ');
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
function dragstartColumn(id, e) {
|
||||
self.drag = {
|
||||
startX: e.clientX,
|
||||
|
@ -846,7 +848,8 @@ Ox.TextList = function(options, self) {
|
|||
return that.$body.value(id, key);
|
||||
} else {
|
||||
that.$body.value(id, key, value);
|
||||
$cell && $cell.html(column.format ? column.format(value) : value);
|
||||
Ox.print('? ? ?', column, column.format)
|
||||
$cell && $cell.html(formatValue(key, value));
|
||||
if (key == self.options.sort[0].key) {
|
||||
that.$body.sort();
|
||||
}
|
||||
|
|
|
@ -283,14 +283,13 @@ Ox.ListMap = function(options, self) {
|
|||
that.triggerEvent('addplace', data);
|
||||
},
|
||||
*/
|
||||
changeplace: function(event, data) {
|
||||
// fixme: is there a changeplace event in Map???
|
||||
self.$placeForm.values(Ox.map(data, function(val, key) {
|
||||
// fixme: no size key anymore
|
||||
return key == 'size' ? Ox.formatArea(val) : val;
|
||||
})).show();
|
||||
changeplace: function(data) {
|
||||
self.$placeForm.values(data).show();
|
||||
},
|
||||
geocode: function(event, data) {
|
||||
changeplaceend: function(data) {
|
||||
editPlace(['lat', 'lng', 'south', 'west', 'north', 'east', 'area']);
|
||||
},
|
||||
geocode: function(data) {
|
||||
that.triggerEvent('geocode', data);
|
||||
},
|
||||
resize: function() {
|
||||
|
@ -581,6 +580,12 @@ Ox.ListMap = function(options, self) {
|
|||
self.options.editPlace(values, function() {
|
||||
if (keys.indexOf(self.$list.options('sort')[0].key) > -1) {
|
||||
self.$list.reloadList();
|
||||
} else {
|
||||
Ox.forEach(values, function(value, key) {
|
||||
if (key != 'id') {
|
||||
self.$list.value(values.id, key, value);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
@ -79,7 +79,7 @@ Ox.MapMarker = function(options) {
|
|||
}
|
||||
|
||||
function dragend(e) {
|
||||
|
||||
that.map.triggerEvent('changeplaceend', that.place);
|
||||
}
|
||||
|
||||
function getMarkerImage(options, callback) {
|
||||
|
|
|
@ -83,6 +83,7 @@ Ox.MapRectangleMarker = function(options, self) {
|
|||
that.place.marker.update();
|
||||
that.place.rectangle.update();
|
||||
}
|
||||
that.map.triggerEvent('changeplaceend', that.place);
|
||||
}
|
||||
|
||||
/*@
|
||||
|
|
Loading…
Reference in a new issue