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

Fix for tags on rows closes #133

pull/141/head
Zach Wise 12 years ago
parent
855134f9bf
commit
d058bfec55
3 changed files with 7 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      compiled/js/timeline-min.js
  2. 8
      compiled/js/timeline.js
  3. 8
      source/js/VMM.Timeline.TimeNav.js

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

File diff suppressed because one or more lines are too long

8
compiled/js/timeline.js
Unescape View File

@ -6726,7 +6726,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
/* ADD to Config
================================================== */
var config = VMM.Timeline.Config;
config.nav.rows = [config.nav.marker.height, config.nav.marker.height*2, 1];
config.nav.rows = [1, config.nav.marker.height, config.nav.marker.height*2];
if (content_width != null && content_width != "") {
config.nav.width = content_width;
@ -7310,10 +7310,8 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
if (tags.length > 0) {
for (var k = 0; k < tags.length; k++) {
trace("TAGS: " + tags[k])
if (k < config.nav.rows.length) {
if (markers[i].tag == tags[k]) {
trace("tag match " + k);
row = k;
}
}
@ -7329,8 +7327,8 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
row_depth ++;
}
} else {
row_depth = 0;
row = 0;
row_depth = 1;
row = 1;
}
}

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

@ -37,7 +37,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
/* ADD to Config
================================================== */
var config = VMM.Timeline.Config;
config.nav.rows = [config.nav.marker.height, config.nav.marker.height*2, 1];
config.nav.rows = [1, config.nav.marker.height, config.nav.marker.height*2];
if (content_width != null && content_width != "") {
config.nav.width = content_width;
@ -621,10 +621,8 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
if (tags.length > 0) {
for (var k = 0; k < tags.length; k++) {
trace("TAGS: " + tags[k])
if (k < config.nav.rows.length) {
if (markers[i].tag == tags[k]) {
trace("tag match " + k);
row = k;
}
}
@ -640,8 +638,8 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
row_depth ++;
}
} else {
row_depth = 0;
row = 0;
row_depth = 1;
row = 1;
}
}

Write Preview
Loading…
Cancel
Save