More work merging with StoryJS Core

12 years ago · dc809e8745
4 changed files with 6 additions and 4 deletions
--- a/compiled/js/timeline-min.js
+++ b/compiled/js/timeline-min.js
--- a/compiled/js/timeline.js
+++ b/compiled/js/timeline.js
@ -6215,6 +6215,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
 			// CREATE DOM STRUCTURE
 			$timeline	= VMM.getElement(timeline_id);
 			VMM.Lib.addClass($timeline, "vmm-timeline");
+			VMM.Lib.addClass($timeline, "vmm-storyjs");
 			
 			$container	= VMM.appendAndGetElement($timeline, "<div>", "container main");
 			$feature	= VMM.appendAndGetElement($container, "<div>", "feature");
--- a/source/js/Core
+++ b/source/js/Core
@ -1 +1 @@
-Subproject commit a610cc8f532caceeed6d2210b7ecf5c39ed976be
+Subproject commit 45ea973ed28b6168d0e5f66dce1c92af21d79282
--- a/source/js/VMM.Timeline.js
+++ b/source/js/VMM.Timeline.js
@ -240,6 +240,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
 			// CREATE DOM STRUCTURE
 			$timeline	= VMM.getElement(timeline_id);
 			VMM.Lib.addClass($timeline, "vmm-timeline");
+			VMM.Lib.addClass($timeline, "vmm-storyjs");
 			
 			$container	= VMM.appendAndGetElement($timeline, "<div>", "container main");
 			$feature	= VMM.appendAndGetElement($container, "<div>", "feature");