Merge branch 'master' of github.com:NUKnightLab/TimelineJS

10 years ago · cc6b9dceec
90 changed files with 107 additions and 99 deletions
--- a/4
+++ b/4
@ -1,7 +1,7 @@
-2.35.5 (pending)
+2.35.5 (2015-02-26)
 ------
 #672,679,681,683 a series of presentation/performance tweaks from @acdha
-
+Fix auto-linking regression

 2.35.4 (2015-02-17)
 ------
--- a/README.markdown
+++ b/README.markdown
@ -218,7 +218,7 @@ Languages available:



-Help us add more. Grab a copy of a language file and replace it with your language [Example language file](https://github.com/VeriteCo/StoryJS-Core/blob/master/Language/locale/en.js) and find your language's [two letter code here](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
+Help us add more. Grab a copy of a language file and replace it with your language [Example language file](https://github.com/NUKnightLab/TimelineJS/blob/master/source/js/Core/Language/locale/en.js) and find your language's [two letter code here](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)

 ###Start at End 
 `start_at_end`
@ -317,8 +317,8 @@ Here is the full model:
 		},
 		"date": [
 			{
-				"startDate":"2011,12,10",
-				"endDate":"2011,12,11",
+				"startDate":"2011,12,10,07,02,10",
+				"endDate":"2011,12,11,08,11",
 				"headline":"Headline Goes Here",
 				"text":"<p>Body text goes here, some HTML is OK</p>",
 				"tag":"This is Optional",
--- a/build/css/themes/dark.css
+++ b/build/css/themes/dark.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/AbrilFatface-Average.css
+++ b/build/css/themes/font/AbrilFatface-Average.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/Arvo-PTSans.css
+++ b/build/css/themes/font/Arvo-PTSans.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/Bevan-PotanoSans.css
+++ b/build/css/themes/font/Bevan-PotanoSans.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/BreeSerif-OpenSans.css
+++ b/build/css/themes/font/BreeSerif-OpenSans.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/DroidSerif-DroidSans.css
+++ b/build/css/themes/font/DroidSerif-DroidSans.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/Georgia-Helvetica.css
+++ b/build/css/themes/font/Georgia-Helvetica.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/Lekton-Molengo.css
+++ b/build/css/themes/font/Lekton-Molengo.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/Lora-Istok.css
+++ b/build/css/themes/font/Lora-Istok.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/Merriweather-NewsCycle.css
+++ b/build/css/themes/font/Merriweather-NewsCycle.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/NewsCycle-Merriweather.css
+++ b/build/css/themes/font/NewsCycle-Merriweather.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/NixieOne-Ledger.css
+++ b/build/css/themes/font/NixieOne-Ledger.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/PT.css
+++ b/build/css/themes/font/PT.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/PTSerif-PTSans.css
+++ b/build/css/themes/font/PTSerif-PTSans.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/Pacifico-Arimo.css
+++ b/build/css/themes/font/Pacifico-Arimo.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/PlayfairDisplay-Muli.css
+++ b/build/css/themes/font/PlayfairDisplay-Muli.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/PoiretOne-Molengo.css
+++ b/build/css/themes/font/PoiretOne-Molengo.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/Rancho-Gudea.css
+++ b/build/css/themes/font/Rancho-Gudea.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/themes/font/SansitaOne-Kameron.css
+++ b/build/css/themes/font/SansitaOne-Kameron.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/css/timeline.css
+++ b/build/css/timeline.css
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/af.js
+++ b/build/js/locale/af.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/ar.js
+++ b/build/js/locale/ar.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/be.js
+++ b/build/js/locale/be.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/bg.js
+++ b/build/js/locale/bg.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/ca.js
+++ b/build/js/locale/ca.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/cz.js
+++ b/build/js/locale/cz.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/da.js
+++ b/build/js/locale/da.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/de.js
+++ b/build/js/locale/de.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/el.js
+++ b/build/js/locale/el.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/en-24hr.js
+++ b/build/js/locale/en-24hr.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/en-week.js
+++ b/build/js/locale/en-week.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/en.js
+++ b/build/js/locale/en.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/eo.js
+++ b/build/js/locale/eo.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/es.js
+++ b/build/js/locale/es.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/et.js
+++ b/build/js/locale/et.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/eu.js
+++ b/build/js/locale/eu.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/fa.js
+++ b/build/js/locale/fa.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/fi.js
+++ b/build/js/locale/fi.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/fo.js
+++ b/build/js/locale/fo.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/fr.js
+++ b/build/js/locale/fr.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/fy.js
+++ b/build/js/locale/fy.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/ga.js
+++ b/build/js/locale/ga.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/gl.js
+++ b/build/js/locale/gl.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/he.js
+++ b/build/js/locale/he.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/hi.js
+++ b/build/js/locale/hi.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/hr.js
+++ b/build/js/locale/hr.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/hu.js
+++ b/build/js/locale/hu.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/hy.js
+++ b/build/js/locale/hy.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/id.js
+++ b/build/js/locale/id.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/is.js
+++ b/build/js/locale/is.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/it.js
+++ b/build/js/locale/it.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/iw.js
+++ b/build/js/locale/iw.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/ja.js
+++ b/build/js/locale/ja.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/ka.js
+++ b/build/js/locale/ka.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/ko.js
+++ b/build/js/locale/ko.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/lb.js
+++ b/build/js/locale/lb.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/lt.js
+++ b/build/js/locale/lt.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/lv.js
+++ b/build/js/locale/lv.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/ms.js
+++ b/build/js/locale/ms.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/ne.js
+++ b/build/js/locale/ne.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/nl.js
+++ b/build/js/locale/nl.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/no.js
+++ b/build/js/locale/no.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/pl.js
+++ b/build/js/locale/pl.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/pt-br.js
+++ b/build/js/locale/pt-br.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/pt.js
+++ b/build/js/locale/pt.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/rm.js
+++ b/build/js/locale/rm.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/ro.js
+++ b/build/js/locale/ro.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/ru.js
+++ b/build/js/locale/ru.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/si.js
+++ b/build/js/locale/si.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/sk.js
+++ b/build/js/locale/sk.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/sl.js
+++ b/build/js/locale/sl.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/sr-cy.js
+++ b/build/js/locale/sr-cy.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/sr.js
+++ b/build/js/locale/sr.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/sv.js
+++ b/build/js/locale/sv.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/ta.js
+++ b/build/js/locale/ta.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/te.js
+++ b/build/js/locale/te.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/th.js
+++ b/build/js/locale/th.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/tl.js
+++ b/build/js/locale/tl.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/tr.js
+++ b/build/js/locale/tr.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/uk.js
+++ b/build/js/locale/uk.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/zh-cn.js
+++ b/build/js/locale/zh-cn.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/locale/zh-tw.js
+++ b/build/js/locale/zh-tw.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/storyjs-embed-cdn.js
+++ b/build/js/storyjs-embed-cdn.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/storyjs-embed-generator.js
+++ b/build/js/storyjs-embed-generator.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/storyjs-embed.js
+++ b/build/js/storyjs-embed.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
--- a/build/js/timeline-min.js
+++ b/build/js/timeline-min.js
--- a/build/js/timeline.js
+++ b/build/js/timeline.js
@ -1,5 +1,5 @@
 /*
-    TimelineJS - ver. 2015-02-17-22-18-48 - 2015-02-17
+    TimelineJS - ver. 2.35.5 - 2015-02-26
    Copyright (c) 2012-2013 Northwestern University
    a project of the Northwestern University Knight Lab, originally created by Zach Wise
    https://github.com/NUKnightLab/TimelineJS
@ -2025,12 +2025,16 @@ if(typeof VMM != 'undefined' && typeof VMM.Util == 'undefined') {
 			    return text.replace(exp, "<a href='$1' target='_blank'>$3</a>");
 			}
 			// Email addresses
-			var emailAddressPattern = /([a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)/gim;
+			var emailAddressPattern = /([a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)/gim;
 			
+			//var twitterHandlePattern = /(@([\w]+))/g;
 			var twitterHandlePattern = /\B@([\w-]+)/gm;
 			var twitterSearchPattern = /(#([\w]+))/g;

 			return text
+				//.replace(urlPattern, "<a target='_blank' href='$&' onclick='void(0)'>$&</a>")
+				.replace(url_pattern, url_replace)
+				.replace(pseudoUrlPattern, "$1<a target='_blank' class='hyphenate' onclick='void(0)' href='http://$2'>$2</a>")
 				.replace(emailAddressPattern, "<a target='_blank' onclick='void(0)' href='mailto:$1'>$1</a>")
 				.replace(twitterHandlePattern, "<a href='http://twitter.com/$1' target='_blank' onclick='void(0)'>@$1</a>");
 				
--- a/source/js/Core/Core/VMM.Util.js
+++ b/source/js/Core/Core/VMM.Util.js
@ -236,12 +236,16 @@ if(typeof VMM != 'undefined' && typeof VMM.Util == 'undefined') {
 			    return text.replace(exp, "<a href='$1' target='_blank'>$3</a>");
 			}
 			// Email addresses
-			var emailAddressPattern = /([a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)/gim;
+			var emailAddressPattern = /([a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)/gim;
 			
+			//var twitterHandlePattern = /(@([\w]+))/g;
 			var twitterHandlePattern = /\B@([\w-]+)/gm;
 			var twitterSearchPattern = /(#([\w]+))/g;

 			return text
+				//.replace(urlPattern, "<a target='_blank' href='$&' onclick='void(0)'>$&</a>")
+				.replace(url_pattern, url_replace)
+				.replace(pseudoUrlPattern, "$1<a target='_blank' class='hyphenate' onclick='void(0)' href='http://$2'>$2</a>")
 				.replace(emailAddressPattern, "<a target='_blank' onclick='void(0)' href='mailto:$1'>$1</a>")
 				.replace(twitterHandlePattern, "<a href='http://twitter.com/$1' target='_blank' onclick='void(0)'>@$1</a>");