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

Fix undefined 'row' in positionEras() closes #345

pull/366/head
Zach Wise 12 years ago
parent
0e726f398b
commit
7871b69a35
4 changed files with 346 additions and 344 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. 686
      codekit-config.json
  2. 2
      compiled/js/timeline-min.js
  3. 1
      compiled/js/timeline.js
  4. 1
      source/js/VMM.Timeline.TimeNav.js

686
codekit-config.json
View File

File diff suppressed because it is too large Load Diff

2
compiled/js/timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

1
compiled/js/timeline.js
Unescape View File

@ -8335,6 +8335,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
var era = era_markers[i], var era = era_markers[i],
pos = positionOnTimeline(interval, era.relative_pos), pos = positionOnTimeline(interval, era.relative_pos),
row_pos = 0, row_pos = 0,
row = 0,
era_height = config.nav.marker.height * config.nav.rows.full.length, era_height = config.nav.marker.height * config.nav.rows.full.length,
era_length = pos.end - pos.begin; era_length = pos.end - pos.begin;

1
source/js/VMM.Timeline.TimeNav.js
Unescape View File

@ -859,6 +859,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
var era = era_markers[i], var era = era_markers[i],
pos = positionOnTimeline(interval, era.relative_pos), pos = positionOnTimeline(interval, era.relative_pos),
row_pos = 0, row_pos = 0,
row = 0,
era_height = config.nav.marker.height * config.nav.rows.full.length, era_height = config.nav.marker.height * config.nav.rows.full.length,
era_length = pos.end - pos.begin; era_length = pos.end - pos.begin;

Write Preview
Loading…
Cancel
Save