forked from 0x2620/oxjs
merging changes
This commit is contained in:
parent
4f81b9eaee
commit
7968a11116
5 changed files with 23 additions and 5 deletions
|
|
@ -33,6 +33,7 @@ Ox.Map <function> Basic map object
|
|||
selected <s|""> Id of the selected place
|
||||
showControls <b|false> If true, show controls
|
||||
showLabels <b|false> If true, show labels on the map
|
||||
showTypes <b|false> If true, color markers according to place type
|
||||
statusbar <b|false> If true, the map has a statusbar
|
||||
toolbar <b|false> If true, the map has a toolbar
|
||||
self <o|{}> Shared private variable
|
||||
|
|
@ -99,6 +100,7 @@ Ox.Map = function(options, self) {
|
|||
selected: null,
|
||||
showControls: false,
|
||||
showLabels: false,
|
||||
showTypes: false,
|
||||
statusbar: false,
|
||||
toolbar: false,
|
||||
zoombar: false
|
||||
|
|
@ -1009,8 +1011,7 @@ Ox.Map = function(options, self) {
|
|||
query: {
|
||||
conditions: [
|
||||
{key: 'id', value: id, operator: '='}
|
||||
],
|
||||
operator: '&'
|
||||
]
|
||||
}
|
||||
}, function(results) {
|
||||
place = new Ox.MapPlace(Ox.extend({
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue