Allow # bookmarks to override both start_at_end and start_at_slide

12 years ago · 899565d4b1
3 changed files with 14 additions and 12 deletions
--- a/compiled/js/timeline-min.js
+++ b/compiled/js/timeline-min.js
--- a/compiled/js/timeline.js
+++ b/compiled/js/timeline.js
@ -6727,14 +6727,15 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
 		================================================== */
 		var build = function() {
 			
-			// START AT END?
+			// START AT SLIDE
+			if (parseInt(config.start_at_slide) > 0 && config.current_slide == 0) {
+				config.current_slide = parseInt(config.start_at_slide); 
+			}
+			// START AT END
 			if (config.start_at_end && config.current_slide == 0) {
 				config.current_slide = _dates.length - 1;
 			}
-			// START AT END?
-			if (parseInt(config.start_at_slide) > 0) {
-				config.current_slide = parseInt(config.start_at_slide); 
-			}
+			
 			
 			// IE7
 			if (ie7) {
--- a/source/js/VMM.Timeline.js
+++ b/source/js/VMM.Timeline.js
@ -410,14 +410,15 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
 		================================================== */
 		var build = function() {
 			
-			// START AT END?
+			// START AT SLIDE
+			if (parseInt(config.start_at_slide) > 0 && config.current_slide == 0) {
+				config.current_slide = parseInt(config.start_at_slide); 
+			}
+			// START AT END
 			if (config.start_at_end && config.current_slide == 0) {
 				config.current_slide = _dates.length - 1;
 			}
-			// START AT END?
-			if (parseInt(config.start_at_slide) > 0) {
-				config.current_slide = parseInt(config.start_at_slide); 
-			}
+			
 			
 			// IE7
 			if (ie7) {