knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #452 from aliounedia/master

Browse Source 
TimeLineJs test fail , Fixed , all test pass now ,  - (http) not figured on recline.view.map initialization
This commit is contained in:
aliounedia
2014-10-15 20:16:10 +02:00
parent 6106606fea 3f4a30e054
commit dc919c2cfd
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/view.map.js
View File

@@ -461,8 +461,8 @@ my.Map = Backbone.View.extend({
var self = this; var self = this;
this.map = new L.Map(this.$map.get(0)); this.map = new L.Map(this.$map.get(0));
var mapUrl = "//otile{s}-s.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png"; var mapUrl = "http://otile{s}-s.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png";
var osmAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="//developer.mapquest.com/content/osm/mq_logo.png">'; var osmAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">';
var bg = new L.TileLayer(mapUrl, {maxZoom: 18, attribution: osmAttribution ,subdomains: '1234'}); var bg = new L.TileLayer(mapUrl, {maxZoom: 18, attribution: osmAttribution ,subdomains: '1234'});
this.map.addLayer(bg); this.map.addLayer(bg);

2
test/view.timeline.test.js
View File

@@ -20,6 +20,7 @@ test('extract dates and timelineJSON', function () {
'date': [ 'date': [
{ {
'startDate': '2012,03,20', 'startDate': '2012,03,20',
'tag': undefined,
'endDate': null, 'endDate': null,
'headline': '1', 'headline': '1',
'text': '<div class="recline-record-summary"><div class="Date"><strong>Date</strong>: 2012-03-20</div><div class="title"><strong>title</strong>: 1</div></div>' 'text': '<div class="recline-record-summary"><div class="Date"><strong>Date</strong>: 2012-03-20</div><div class="title"><strong>title</strong>: 1</div></div>'
@@ -28,6 +29,7 @@ test('extract dates and timelineJSON', function () {
'startDate': '2012,03,25', 'startDate': '2012,03,25',
'endDate': null, 'endDate': null,
'headline': '2', 'headline': '2',
'tag': undefined,
'text': '<div class="recline-record-summary"><div class="Date"><strong>Date</strong>: 2012-03-25</div><div class="title"><strong>title</strong>: 2</div></div>' 'text': '<div class="recline-record-summary"><div class="Date"><strong>Date</strong>: 2012-03-25</div><div class="title"><strong>title</strong>: 2</div></div>'
} }
] ]