Skip to content

Commit

Permalink
More work merging with StoryJS Core
Browse files Browse the repository at this point in the history
  • Loading branch information
zachwise committed Jul 23, 2012
1 parent 4d5e3dc commit dc809e8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
6 changes: 3 additions & 3 deletions compiled/js/timeline-min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions compiled/js/timeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion source/js/Core
Submodule Core updated from a610cc to 45ea97
1 change: 1 addition & 0 deletions source/js/VMM.Timeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit dc809e8

Please sign in to comment.