playground
/
TimelineJS
mirror of https://github.com/NUKnightLab/TimelineJS.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Merge branch 'master' of https://github.com/VeriteCo/TimelineJS

Canary
Zach Wise 12 years ago
parent
051a9e742a 3b16cf5ffe
commit
57753fb6fb
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      README.markdown

6
README.markdown
Unescape View File

@ -181,7 +181,7 @@ Due to recent changes to the Google Maps API, you need a [API Key](https://devel
*required in order to use maptype* *required in order to use maptype*
`maptype:` `maptype:`
* [Stamen Maps ](maps.stamen.com) * [Stamen Maps ](http://maps.stamen.com)
* `toner` * `toner`
* `toner-lines` * `toner-lines`
* `toner-labels` * `toner-labels`
@ -221,7 +221,7 @@ Due to recent changes to the Google Maps API, you need a [API Key](https://devel
JSON is the native data format for TimelineJS. JSON is the native data format for TimelineJS.
Remember, JSON is it is picky. A misplaced comma or quotation mark can Remember, JSON is picky. A misplaced comma or quotation mark can
prevent the timeline from loading properly. prevent the timeline from loading properly.
Here is the full model: Here is the full model:
@ -271,7 +271,7 @@ Here is the full model:
Timeline can use a variation of JSONP to allow you to easily load data across different domains. Timeline can use a variation of JSONP to allow you to easily load data across different domains.
To allow this to happen, the file must end with the extention `.jsonp` To allow this to happen, the file must end with the extension `.jsonp`
Here is the full model: Here is the full model:
```javascript ```javascript

Write Preview
Loading…
Cancel
Save