Skip to content

Commit

Permalink
new settings.cursor.popup
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanocudini committed Dec 2, 2018
1 parent 4700ccd commit 2bee3b4
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Complete list of releases [here](https://github.com/Keplerjs/Kepler/releases)
- double click on marker open panel place
- new method plugin admin updatePlaceAuthor
- plugin categories, search places by category
- plugin photos added photo viewr in fullscreen

## v1.5.4
- new plugin photos
Expand Down
2 changes: 0 additions & 2 deletions packages/categories/client/views/panels/place.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@

<template name="panelPlace_cats">
{{#if getCats.length}}
<br />
<br />
<div class="row">
<div class="col-sm-12">
<label>{{i18n 'label_cats_place'}}</label>
Expand Down
2 changes: 1 addition & 1 deletion packages/core/client/Map_layers.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ _.extend(Kepler.Map, {
$(layers.cursor.icon.nodeHtml).empty();
Blaze.renderWithData(Template.markerCursor, cursorData, layers.cursor.icon.nodeHtml);

if(opts.popups.enabled) {
if(opts.popups.enabled || opts.cursor.popup) {
Blaze.renderWithData(Template.popupCursor, cursorData, div);
this.bindPopup(div.firstChild, opts.popups);
}
Expand Down
3 changes: 2 additions & 1 deletion packages/core/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ Kepler.settings = {
}
},
"cursor": {
"enabled": true
"enabled": true,
"popup": true
},
//TODO split options for places and users
"popups": {
Expand Down
4 changes: 1 addition & 3 deletions packages/photos/client/views/panels.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ Template.panelPlace_photos.onRendered(function() {

var img$ = self.$('.place-photo');

console.log(img$)

self.vjs = new Viewer(img$[0], {
self.photoViewer = new Viewer(img$[0], {
navbar: false,
toolbar: false,
fullscreen: true,
Expand Down

0 comments on commit 2bee3b4

Please sign in to comment.