This commit is contained in:
Dominik Moritz
2012-09-01 22:07:44 +01:00
parent 6695b3d371
commit 8049f73f09
2 changed files with 8 additions and 10 deletions

View File

@@ -201,9 +201,6 @@ my.Map = Backbone.View.extend({
if (feature.properties && feature.properties.popupContent) { if (feature.properties && feature.properties.popupContent) {
self.features.bindPopup(feature.properties.popupContent); self.features.bindPopup(feature.properties.popupContent);
} }
if (feature.properties && feature.properties.cid){
self.features.cid = feature.properties.cid;
}
} catch (except) { } catch (except) {
wrongSoFar += 1; wrongSoFar += 1;
var msg = 'Wrong geometry value'; var msg = 'Wrong geometry value';

View File

@@ -143,28 +143,28 @@ my.MultiView = Backbone.View.extend({
view: new my.SlickGrid({ view: new my.SlickGrid({
model: this.model, model: this.model,
state: this.state.get('view-grid') state: this.state.get('view-grid')
}), })
}, { }, {
id: 'graph', id: 'graph',
label: 'Graph', label: 'Graph',
view: new my.Graph({ view: new my.Graph({
model: this.model, model: this.model,
state: this.state.get('view-graph') state: this.state.get('view-graph')
}), })
}, { }, {
id: 'map', id: 'map',
label: 'Map', label: 'Map',
view: new my.Map({ view: new my.Map({
model: this.model, model: this.model,
state: this.state.get('view-map') state: this.state.get('view-map')
}), })
}, { }, {
id: 'timeline', id: 'timeline',
label: 'Timeline', label: 'Timeline',
view: new my.Timeline({ view: new my.Timeline({
model: this.model, model: this.model,
state: this.state.get('view-timeline') state: this.state.get('view-timeline')
}), })
}, { }, {
id: 'transform', id: 'transform',
label: 'Transform', label: 'Transform',
@@ -397,14 +397,15 @@ my.MultiView = Backbone.View.extend({
}, },
flash flash
); );
var _template;
if (tmplData.loader) { if (tmplData.loader) {
var _template = ' \ _template = ' \
<div class="alert alert-info alert-loader"> \ <div class="alert alert-info alert-loader"> \
{{message}} \ {{message}} \
<span class="notification-loader">&nbsp;</span> \ <span class="notification-loader">&nbsp;</span> \
</div>'; </div>';
} else { } else {
var _template = ' \ _template = ' \
<div class="alert alert-{{category}} fade in" data-alert="alert"><a class="close" data-dismiss="alert" href="#">×</a> \ <div class="alert alert-{{category}} fade in" data-alert="alert"><a class="close" data-dismiss="alert" href="#">×</a> \
{{message}} \ {{message}} \
</div>'; </div>';