Browse Source

Added custom thumbnail option. See json model for implementation closes #160

pull/185/head
Zach Wise 12 years ago
parent
commit
38c06714de
  1. 14
      compiled/css/themes/dark.css
  2. 14
      compiled/css/timeline.css
  3. 2
      compiled/js/timeline-embed.js
  4. 11
      compiled/js/timeline-min.js
  5. 409
      compiled/js/timeline.js
  6. 10
      source/js/Media/VMM.MediaElement.js
  7. 12
      source/js/VMM.Timeline.DataObj.js

14
compiled/css/themes/dark.css

@ -27,8 +27,8 @@
.vmm-timeline .feature h1,.vmm-timeline .feature h2,.vmm-timeline .feature h3,.vmm-timeline .feature h4,.vmm-timeline .feature h5,.vmm-timeline .feature h6{font-family:"Georgia",Times New Roman,Times,serif;}
.tooltip{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;}
#timeline-embed{background-color:#1a1a1a;margin-bottom:20px;border:1px solid #333333;padding-top:20px;padding-bottom:20px;clear:both;-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px;-webkit-box-shadow:1px 1px 3px rgba(0, 0, 0, 0.35);-moz-box-shadow:1px 1px 3px rgba(0, 0, 0, 0.35);box-shadow:1px 1px 3px rgba(0, 0, 0, 0.35);}
#timeline-embed.full-embed{overflow:hidden;border:0 !important;padding:0 !important;margin:0 !important;clear:both;-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important;-webkit-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;-moz-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;box-shadow:0px 0px 0px rgba(0, 0, 0, 0.25) !important;}
#timeline-embed.sized-embed{overflow:hidden;border:1px solid #333333;padding-top:7px;padding-bottom:7px;margin:0 !important;clear:both;-webkit-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;-moz-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;box-shadow:0px 0px 0px rgba(0, 0, 0, 0.25) !important;}
#timeline-embed.full-embed{overflow:hidden;border:0 !important;padding:0 !important;margin:0 !important;clear:both;-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important;-webkit-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;-moz-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;}
#timeline-embed.sized-embed{overflow:hidden;border:1px solid #333333;padding-top:7px;padding-bottom:7px;margin:0 !important;clear:both;-webkit-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;-moz-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;}
.vmm-timeline{width:100%;height:100%;padding:0px;margin:0px;background-color:#1a1a1a;position:absolute;z-index:100;clear:both;overflow:hidden;}.vmm-timeline .vmm-clear:before,.vmm-timeline .vmm-clear:after{content:"";display:table;}
.vmm-timeline .vmm-clear:after{clear:both;}
.vmm-timeline .vmm-clear{*zoom:1;}
@ -122,9 +122,7 @@
.slider .slider-item .content .googleplus .googleplus-content{font-size:13px;line-height:19px;margin-bottom:6px;padding-top:10px;background-color:#1a1a1a;color:#aaaaaa;}.slider .slider-item .content .googleplus .googleplus-content p{font-size:13px;line-height:19px;}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-title{font-size:28px;line-height:36px;margin-bottom:6px;padding-top:10px;background-color:#1a1a1a;color:#ffffff;}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-annotation{font-size:15px;line-height:20px;color:#ffffff;border-bottom:1px solid #e3e3e3;padding-bottom:7.5px;margin-bottom:7.5px;}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments{border-top:1px solid #e3e3e3;padding-top:15px;margin-top:15px;border-bottom:1px solid #e3e3e3;padding-bottom:15px;margin-bottom:15px;*zoom:1;zoom:1;}.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:before,.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:after{display:table;content:"";}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:after{clear:both;}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:before,.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:after{display:table;content:"";zoom:1;}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments{border-top:1px solid #e3e3e3;padding-top:15px;margin-top:15px;border-bottom:1px solid #e3e3e3;padding-bottom:15px;margin-bottom:15px;*zoom:1;}.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:before,.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:after{display:table;content:"";}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:after{clear:both;}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments h5{margin-bottom:5px;}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments div{width:50%;padding-left:15px;display:inline-block;}
@ -146,7 +144,7 @@
.vmm-notouch .navigation .timenav .content .marker:hover .line{z-index:24;background:#999999;}
.vmm-notouch .navigation .timenav .content .marker .flag:hover,.vmm-notouch .navigation .timenav .content .marker .flag-small:hover{cursor:pointer;}.vmm-notouch .navigation .timenav .content .marker .flag:hover .flag-content h3,.vmm-notouch .navigation .timenav .content .marker .flag-small:hover .flag-content h3{color:#aaaaaa;}
.vmm-notouch .navigation .timenav .content .marker .flag:hover .flag-content h4,.vmm-notouch .navigation .timenav .content .marker .flag-small:hover .flag-content h4{color:#aaaaaa;}
.vmm-notouch .navigation .timenav .content .marker .flag:hover .flag-content .thumbnail,.vmm-notouch .navigation .timenav .content .marker .flag-small:hover .flag-content .thumbnail{opacity:1;-moz-opacity:1;filter:alpha(opacity=100);}
.vmm-notouch .navigation .timenav .content .marker .flag:hover .flag-content .thumbnail,.vmm-notouch .navigation .timenav .content .marker .flag-small:hover .flag-content .thumbnail{filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}
.vmm-notouch .navigation .timenav .content .marker .flag:hover{background-image:url(themes/timeline-dark.png?v3.4);background-repeat:no-repeat;background-position:0 -53px;width:153px;height:53px;}
.vmm-notouch .navigation .timenav .content .marker .flag-small:hover{height:56px;background-image:url(themes/timeline-dark.png?v3.4);background-repeat:no-repeat;background-position:0 -53px;width:153px;height:53px;}.vmm-notouch .navigation .timenav .content .marker .flag-small:hover .flag-content{height:36px;}.vmm-notouch .navigation .timenav .content .marker .flag-small:hover .flag-content h3{margin-top:5px;}
.vmm-notouch .navigation .timenav .content .marker .flag-small.flag-small-last:hover{background-image:url(themes/timeline-dark.png?v3.4);background-repeat:no-repeat;background-position:0 -109px;width:153px;height:26px;height:26px;}.vmm-notouch .navigation .timenav .content .marker .flag-small.flag-small-last:hover .flag-content{height:14px;}.vmm-notouch .navigation .timenav .content .marker .flag-small.flag-small-last:hover .flag-content h3{margin-top:4px;}
@ -166,7 +164,7 @@
.vmm-timeline .navigation .timenav .content .marker.active .dot{background:#0bd4e3;z-index:200;}
.vmm-timeline .navigation .timenav .content .marker.active .line{z-index:199;background:#0bd4e3;width:1px;}.vmm-timeline .navigation .timenav .content .marker.active .line .event-line{background:#0bd4e3;filter:alpha(opacity=75);-khtml-opacity:0.75;-moz-opacity:0.75;opacity:0.75;}
.vmm-timeline .navigation .timenav .content .marker.active .flag,.vmm-timeline .navigation .timenav .content .marker.active .flag-small{z-index:200;}.vmm-timeline .navigation .timenav .content .marker.active .flag .flag-content,.vmm-timeline .navigation .timenav .content .marker.active .flag-small .flag-content{height:36px;}.vmm-timeline .navigation .timenav .content .marker.active .flag .flag-content h3,.vmm-timeline .navigation .timenav .content .marker.active .flag-small .flag-content h3{color:#0bd4e3;margin-top:5px;}
.vmm-timeline .navigation .timenav .content .marker.active .flag .flag-content .thumbnail,.vmm-timeline .navigation .timenav .content .marker.active .flag-small .flag-content .thumbnail{opacity:1;-moz-opacity:1;filter:alpha(opacity=100);}
.vmm-timeline .navigation .timenav .content .marker.active .flag .flag-content .thumbnail,.vmm-timeline .navigation .timenav .content .marker.active .flag-small .flag-content .thumbnail{filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}
.vmm-timeline .navigation .timenav .content .marker.active .flag.row1,.vmm-timeline .navigation .timenav .content .marker.active .flag.row2,.vmm-timeline .navigation .timenav .content .marker.active .flag.row3,.vmm-timeline .navigation .timenav .content .marker.active .flag-small.row1,.vmm-timeline .navigation .timenav .content .marker.active .flag-small.row2,.vmm-timeline .navigation .timenav .content .marker.active .flag-small.row3{z-index:200;}
.vmm-timeline .navigation .timenav .content .marker.active .flag{background-image:url(themes/timeline-dark.png?v3.4);background-repeat:no-repeat;background-position:0 -53px;width:153px;height:53px;}
.vmm-timeline .navigation .timenav .content .marker.active .flag-small{background-image:url(themes/timeline-dark.png?v3.4);background-repeat:no-repeat;background-position:0 -109px;width:153px;height:26px;height:26px;}.vmm-timeline .navigation .timenav .content .marker.active .flag-small .flag-content{height:14px;}.vmm-timeline .navigation .timenav .content .marker.active .flag-small .flag-content h3{margin-top:4px;}
@ -174,7 +172,7 @@
.vmm-timeline .navigation .timenav .content .marker .line{position:absolute;top:0px;left:3px;width:1px;height:150px;background-color:#333333;background-color:rgba(51, 51, 51, 0.5);-webkit-box-shadow:1px 0 0 rgba(26, 26, 26, 0.5);-moz-box-shadow:1px 0 0 rgba(26, 26, 26, 0.5);box-shadow:1px 0 0 rgba(26, 26, 26, 0.5);z-index:22;}.vmm-timeline .navigation .timenav .content .marker .line .event-line{position:absolute;z-index:22;left:0px;height:1px;width:1px;background:#0bd4e3;filter:alpha(opacity=15);-khtml-opacity:0.15;-moz-opacity:0.15;opacity:0.15;}
.vmm-timeline .navigation .timenav .content .marker .flag,.vmm-timeline .navigation .timenav .content .marker .flag-small{position:absolute;top:15px;left:3px;padding:0px;display:block;z-index:23;width:153px;}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content{padding:0px 7px 2px 6px;overflow:hidden;}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content h3,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content h3{font-weight:bold;font-size:15px;line-height:20px;font-size:11px;line-height:11px;color:#999999;margin-bottom:2px;}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content h3 small,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content h3 small{display:none;}
.vmm-timeline .navigation .timenav .content .marker .flag .flag-content h4,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content h4{display:none;font-weight:normal;font-size:15px;line-height:20px;margin-top:5px;font-size:10px;line-height:10px;color:#aaaaaa;}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content h4 small,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content h4 small{display:none;}
.vmm-timeline .navigation .timenav .content .marker .flag .flag-content .thumbnail,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content .thumbnail{margin-bottom:15px;margin-right:3px;opacity:0.5;-moz-opacity:0.5;filter:alpha(opacity=50);}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content .thumbnail img,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content .thumbnail img{width:22px;height:22px;max-height:none;max-width:none;border:0;border:1px solid #999999;padding:0;margin:0;}
.vmm-timeline .navigation .timenav .content .marker .flag .flag-content .thumbnail,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content .thumbnail{margin-bottom:15px;margin-right:3px;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content .thumbnail img,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content .thumbnail img{width:22px;height:22px;max-height:none;max-width:none;border:0;border:1px solid #999999;padding:0;margin:0;}
.vmm-timeline .navigation .timenav .content .marker .flag{height:56px;background-image:url(themes/timeline-dark.png?v3.4);background-repeat:no-repeat;background-position:0 0;width:153px;height:53px;}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content{height:36px;}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content h3{margin-top:5px;}
.vmm-timeline .navigation .timenav .content .marker .flag-small{height:26px;background-image:url(themes/timeline-dark.png?v3.4);background-repeat:no-repeat;background-position:0 -135px;width:153px;height:26px;}.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content{height:14px;}.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content h3{margin-top:4px;}
.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content .thumbnail{width:16px;height:10px;margin-right:1px;margin-top:6px;}

14
compiled/css/timeline.css

@ -27,8 +27,8 @@
.vmm-timeline .feature h1,.vmm-timeline .feature h2,.vmm-timeline .feature h3,.vmm-timeline .feature h4,.vmm-timeline .feature h5,.vmm-timeline .feature h6{font-family:"Georgia",Times New Roman,Times,serif;}
.tooltip{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;}
#timeline-embed{background-color:#ffffff;margin-bottom:20px;border:1px solid #cccccc;padding-top:20px;padding-bottom:20px;clear:both;-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px;-webkit-box-shadow:1px 1px 3px rgba(0, 0, 0, 0.35);-moz-box-shadow:1px 1px 3px rgba(0, 0, 0, 0.35);box-shadow:1px 1px 3px rgba(0, 0, 0, 0.35);}
#timeline-embed.full-embed{overflow:hidden;border:0 !important;padding:0 !important;margin:0 !important;clear:both;-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important;-webkit-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;-moz-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;box-shadow:0px 0px 0px rgba(0, 0, 0, 0.25) !important;}
#timeline-embed.sized-embed{overflow:hidden;border:1px solid #cccccc;padding-top:7px;padding-bottom:7px;margin:0 !important;clear:both;-webkit-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;-moz-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;box-shadow:0px 0px 0px rgba(0, 0, 0, 0.25) !important;}
#timeline-embed.full-embed{overflow:hidden;border:0 !important;padding:0 !important;margin:0 !important;clear:both;-webkit-border-radius:0 !important;-moz-border-radius:0 !important;border-radius:0 !important;-webkit-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;-moz-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;}
#timeline-embed.sized-embed{overflow:hidden;border:1px solid #cccccc;padding-top:7px;padding-bottom:7px;margin:0 !important;clear:both;-webkit-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;-moz-box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;box-shadow:0 0px 0px rgba(0, 0, 0, 0.25) !important;}
.vmm-timeline{width:100%;height:100%;padding:0px;margin:0px;background-color:#ffffff;position:absolute;z-index:100;clear:both;overflow:hidden;}.vmm-timeline .vmm-clear:before,.vmm-timeline .vmm-clear:after{content:"";display:table;}
.vmm-timeline .vmm-clear:after{clear:both;}
.vmm-timeline .vmm-clear{*zoom:1;}
@ -122,9 +122,7 @@
.slider .slider-item .content .googleplus .googleplus-content{font-size:13px;line-height:19px;margin-bottom:6px;padding-top:10px;background-color:#ffffff;color:#666666;}.slider .slider-item .content .googleplus .googleplus-content p{font-size:13px;line-height:19px;}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-title{font-size:28px;line-height:36px;margin-bottom:6px;padding-top:10px;background-color:#ffffff;color:#000000;}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-annotation{font-size:15px;line-height:20px;color:#000000;border-bottom:1px solid #e3e3e3;padding-bottom:7.5px;margin-bottom:7.5px;}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments{border-top:1px solid #e3e3e3;padding-top:15px;margin-top:15px;border-bottom:1px solid #e3e3e3;padding-bottom:15px;margin-bottom:15px;*zoom:1;zoom:1;}.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:before,.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:after{display:table;content:"";}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:after{clear:both;}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:before,.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:after{display:table;content:"";zoom:1;}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments{border-top:1px solid #e3e3e3;padding-top:15px;margin-top:15px;border-bottom:1px solid #e3e3e3;padding-bottom:15px;margin-bottom:15px;*zoom:1;}.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:before,.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:after{display:table;content:"";}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments:after{clear:both;}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments h5{margin-bottom:5px;}
.slider .slider-item .content .googleplus .googleplus-content .googleplus-attachments div{width:50%;padding-left:15px;display:inline-block;}
@ -146,7 +144,7 @@
.vmm-notouch .navigation .timenav .content .marker:hover .line{z-index:24;background:#999999;}
.vmm-notouch .navigation .timenav .content .marker .flag:hover,.vmm-notouch .navigation .timenav .content .marker .flag-small:hover{cursor:pointer;}.vmm-notouch .navigation .timenav .content .marker .flag:hover .flag-content h3,.vmm-notouch .navigation .timenav .content .marker .flag-small:hover .flag-content h3{color:#333333;}
.vmm-notouch .navigation .timenav .content .marker .flag:hover .flag-content h4,.vmm-notouch .navigation .timenav .content .marker .flag-small:hover .flag-content h4{color:#aaaaaa;}
.vmm-notouch .navigation .timenav .content .marker .flag:hover .flag-content .thumbnail,.vmm-notouch .navigation .timenav .content .marker .flag-small:hover .flag-content .thumbnail{opacity:1;-moz-opacity:1;filter:alpha(opacity=100);}
.vmm-notouch .navigation .timenav .content .marker .flag:hover .flag-content .thumbnail,.vmm-notouch .navigation .timenav .content .marker .flag-small:hover .flag-content .thumbnail{filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}
.vmm-notouch .navigation .timenav .content .marker .flag:hover{background-image:url(timeline.png?v3.4);background-repeat:no-repeat;background-position:0 -53px;width:153px;height:53px;}
.vmm-notouch .navigation .timenav .content .marker .flag-small:hover{height:56px;background-image:url(timeline.png?v3.4);background-repeat:no-repeat;background-position:0 -53px;width:153px;height:53px;}.vmm-notouch .navigation .timenav .content .marker .flag-small:hover .flag-content{height:36px;}.vmm-notouch .navigation .timenav .content .marker .flag-small:hover .flag-content h3{margin-top:5px;}
.vmm-notouch .navigation .timenav .content .marker .flag-small.flag-small-last:hover{background-image:url(timeline.png?v3.4);background-repeat:no-repeat;background-position:0 -109px;width:153px;height:26px;height:26px;}.vmm-notouch .navigation .timenav .content .marker .flag-small.flag-small-last:hover .flag-content{height:14px;}.vmm-notouch .navigation .timenav .content .marker .flag-small.flag-small-last:hover .flag-content h3{margin-top:4px;}
@ -166,7 +164,7 @@
.vmm-timeline .navigation .timenav .content .marker.active .dot{background:#0088cc;z-index:200;}
.vmm-timeline .navigation .timenav .content .marker.active .line{z-index:199;background:#0088cc;width:1px;}.vmm-timeline .navigation .timenav .content .marker.active .line .event-line{background:#0088cc;filter:alpha(opacity=75);-khtml-opacity:0.75;-moz-opacity:0.75;opacity:0.75;}
.vmm-timeline .navigation .timenav .content .marker.active .flag,.vmm-timeline .navigation .timenav .content .marker.active .flag-small{z-index:200;}.vmm-timeline .navigation .timenav .content .marker.active .flag .flag-content,.vmm-timeline .navigation .timenav .content .marker.active .flag-small .flag-content{height:36px;}.vmm-timeline .navigation .timenav .content .marker.active .flag .flag-content h3,.vmm-timeline .navigation .timenav .content .marker.active .flag-small .flag-content h3{color:#0088cc;margin-top:5px;}
.vmm-timeline .navigation .timenav .content .marker.active .flag .flag-content .thumbnail,.vmm-timeline .navigation .timenav .content .marker.active .flag-small .flag-content .thumbnail{opacity:1;-moz-opacity:1;filter:alpha(opacity=100);}
.vmm-timeline .navigation .timenav .content .marker.active .flag .flag-content .thumbnail,.vmm-timeline .navigation .timenav .content .marker.active .flag-small .flag-content .thumbnail{filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}
.vmm-timeline .navigation .timenav .content .marker.active .flag.row1,.vmm-timeline .navigation .timenav .content .marker.active .flag.row2,.vmm-timeline .navigation .timenav .content .marker.active .flag.row3,.vmm-timeline .navigation .timenav .content .marker.active .flag-small.row1,.vmm-timeline .navigation .timenav .content .marker.active .flag-small.row2,.vmm-timeline .navigation .timenav .content .marker.active .flag-small.row3{z-index:200;}
.vmm-timeline .navigation .timenav .content .marker.active .flag{background-image:url(timeline.png?v3.4);background-repeat:no-repeat;background-position:0 -53px;width:153px;height:53px;}
.vmm-timeline .navigation .timenav .content .marker.active .flag-small{background-image:url(timeline.png?v3.4);background-repeat:no-repeat;background-position:0 -109px;width:153px;height:26px;height:26px;}.vmm-timeline .navigation .timenav .content .marker.active .flag-small .flag-content{height:14px;}.vmm-timeline .navigation .timenav .content .marker.active .flag-small .flag-content h3{margin-top:4px;}
@ -174,7 +172,7 @@
.vmm-timeline .navigation .timenav .content .marker .line{position:absolute;top:0px;left:3px;width:1px;height:150px;background-color:#cccccc;background-color:rgba(204, 204, 204, 0.5);-webkit-box-shadow:1px 0 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:1px 0 0 rgba(255, 255, 255, 0.5);box-shadow:1px 0 0 rgba(255, 255, 255, 0.5);z-index:22;}.vmm-timeline .navigation .timenav .content .marker .line .event-line{position:absolute;z-index:22;left:0px;height:1px;width:1px;background:#0088cc;filter:alpha(opacity=15);-khtml-opacity:0.15;-moz-opacity:0.15;opacity:0.15;}
.vmm-timeline .navigation .timenav .content .marker .flag,.vmm-timeline .navigation .timenav .content .marker .flag-small{position:absolute;top:15px;left:3px;padding:0px;display:block;z-index:23;width:153px;}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content{padding:0px 7px 2px 6px;overflow:hidden;}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content h3,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content h3{font-weight:bold;font-size:15px;line-height:20px;font-size:11px;line-height:11px;color:#999999;margin-bottom:2px;}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content h3 small,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content h3 small{display:none;}
.vmm-timeline .navigation .timenav .content .marker .flag .flag-content h4,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content h4{display:none;font-weight:normal;font-size:15px;line-height:20px;margin-top:5px;font-size:10px;line-height:10px;color:#aaaaaa;}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content h4 small,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content h4 small{display:none;}
.vmm-timeline .navigation .timenav .content .marker .flag .flag-content .thumbnail,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content .thumbnail{margin-bottom:15px;margin-right:3px;opacity:0.5;-moz-opacity:0.5;filter:alpha(opacity=50);}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content .thumbnail img,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content .thumbnail img{width:22px;height:22px;max-height:none;max-width:none;border:0;border:1px solid #999999;padding:0;margin:0;}
.vmm-timeline .navigation .timenav .content .marker .flag .flag-content .thumbnail,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content .thumbnail{margin-bottom:15px;margin-right:3px;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content .thumbnail img,.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content .thumbnail img{width:22px;height:22px;max-height:none;max-width:none;border:0;border:1px solid #999999;padding:0;margin:0;}
.vmm-timeline .navigation .timenav .content .marker .flag{height:56px;background-image:url(timeline.png?v3.4);background-repeat:no-repeat;background-position:0 0;width:153px;height:53px;}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content{height:36px;}.vmm-timeline .navigation .timenav .content .marker .flag .flag-content h3{margin-top:5px;}
.vmm-timeline .navigation .timenav .content .marker .flag-small{height:26px;background-image:url(timeline.png?v3.4);background-repeat:no-repeat;background-position:0 -135px;width:153px;height:26px;}.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content{height:14px;}.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content h3{margin-top:4px;}
.vmm-timeline .navigation .timenav .content .marker .flag-small .flag-content .thumbnail{width:16px;height:10px;margin-right:1px;margin-top:6px;}

2
compiled/js/timeline-embed.js

File diff suppressed because one or more lines are too long

11
compiled/js/timeline-min.js vendored

File diff suppressed because one or more lines are too long

409
compiled/js/timeline.js

@ -1,5 +1,6 @@
/*!
TimelineJS
Version 1.65
Designed and built by Zach Wise at VéritéCo
This program is free software: you can redistribute it and/or modify
@ -395,6 +396,32 @@ var type={
================================================== */
if(typeof VMM != 'undefined') {
VMM.smoothScrollTo = function(elem, duration, ease) {
if( typeof( jQuery ) != 'undefined' ){
var _ease = "easein",
_duration = 1000;
if (duration != null) {
if (duration < 1) {
_duration = 1;
} else {
_duration = Math.round(duration);
}
}
if (ease != null && ease != "") {
_ease = ease;
}
if (jQuery(window).scrollTop() != VMM.Lib.offset(elem).top) {
VMM.Lib.animate('html,body', _duration, _ease, {scrollTop: VMM.Lib.offset(elem).top})
}
}
};
VMM.attachElement = function(element, content) {
if( typeof( jQuery ) != 'undefined' ){
jQuery(element).html(content);
@ -1549,6 +1576,18 @@ if(typeof VMM != 'undefined' && typeof VMM.Util == 'undefined') {
},
/* * MERGE CONFIG
================================================== */
mergeConfig: function(config_main, config_to_merge) {
var x;
for (x in config_to_merge) {
if (Object.prototype.hasOwnProperty.call(config_to_merge, x)) {
config_main[x] = config_to_merge[x];
}
}
return config_main;
},
/* * GET OBJECT ATTRIBUTE BY INDEX
================================================== */
getObjectAttributeByIndex: function(obj, index) {
@ -1566,6 +1605,13 @@ if(typeof VMM != 'undefined' && typeof VMM.Util == 'undefined') {
}
},
/* * ORDINAL
================================================== */
ordinal: function(n) {
return ["th","st","nd","rd"][(!( ((n%10) >3) || (Math.floor(n%100/10)==1)) ) * (n%10)];
},
/* * RANDOM BETWEEN
================================================== */
//VMM.Util.randomBetween(1, 3)
@ -1887,34 +1933,19 @@ if(typeof VMM != 'undefined' && typeof VMM.Util == 'undefined') {
properQuotes: function(str) {
return str.replace(/\"([^\"]*)\"/gi,"&#8220;$1&#8221;");
},
/* * Given an int or decimal, return a string with pretty commas in the correct spot.
/* * Add Commas to numbers
================================================== */
niceNumber: function(n){
var amount = String( Math.abs(Number(n) ) );
var leftOfDecimal = amount.split(/\./g)[0];
var rightOfDecimal = amount.split(/\./g)[1];
var formatted_text = '';
var num_a = leftOfDecimal.toArray();
num_a.reverse();
for (var i=1; i <= num_a.length; i++) {
if ( (i%3 == 0) && (i < num_a.length ) ) {
formatted_text = "," + num_a[i-1] + formatted_text;
} else {
formatted_text = num_a[i-1] + formatted_text;
}
}
if (rightOfDecimal != null && rightOfDecimal != '' && rightOfDecimal != undefined) {
return formatted_text + "." + rightOfDecimal;
} else {
return formatted_text;
}
niceNumber: function(nStr){
nStr += '';
x = nStr.split('.');
x1 = x[0];
x2 = x.length > 1 ? '.' + x[1] : '';
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, '$1' + ',' + '$2');
}
return x1 + x2;
},
/* * Transform text to Title Case
================================================== */
toTitleCase: function(t){
@ -3421,9 +3452,13 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
var _valid = true,
mediaElem = "",
m = VMM.MediaType(data.media); //returns an object with .type and .id
// CREATE MEDIA CODE
if (m.type == "image") {
// DETERMINE THUMBNAIL OR ICON
if (data.thumbnail != null && data.thumbnail != "") {
trace("CUSTOM THUMB");
mediaElem = "<div class='thumbnail thumb-custom' id='" + uid + "_custom_thumb'><img src='" + data.thumbnail + "'></div>";
return mediaElem;
} else if (m.type == "image") {
mediaElem = "<div class='thumbnail thumb-photo'></div>";
return mediaElem;
} else if (m.type == "flickr") {
@ -5891,281 +5926,6 @@ Utf8.decode = function(strUtf) {
}( window.jQuery );
/***********************************************
Begin bootstrap-tooltip.js
***********************************************/
/* ===========================================================
* bootstrap-tooltip.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================== */
!function( $ ) {
"use strict"
/* TOOLTIP PUBLIC CLASS DEFINITION
* =============================== */
var Tooltip = function ( element, options ) {
this.init('tooltip', element, options)
}
Tooltip.prototype = {
constructor: Tooltip
, init: function ( type, element, options ) {
var eventIn
, eventOut
this.type = type
this.$element = $(element)
this.options = this.getOptions(options)
this.enabled = true
if (this.options.trigger != 'manual') {
eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this))
this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this))
}
this.options.selector ?
(this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
this.fixTitle()
}
, getOptions: function ( options ) {
options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
if (options.delay && typeof options.delay == 'number') {
options.delay = {
show: options.delay
, hide: options.delay
}
}
return options
}
, enter: function ( e ) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
if (!self.options.delay || !self.options.delay.show) {
self.show()
} else {
self.hoverState = 'in'
setTimeout(function() {
if (self.hoverState == 'in') {
self.show()
}
}, self.options.delay.show)
}
}
, leave: function ( e ) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
if (!self.options.delay || !self.options.delay.hide) {
self.hide()
} else {
self.hoverState = 'out'
setTimeout(function() {
if (self.hoverState == 'out') {
self.hide()
}
}, self.options.delay.hide)
}
}
, show: function () {
var $tip
, inside
, pos
, actualWidth
, actualHeight
, placement
, tp
if (this.hasContent() && this.enabled) {
$tip = this.tip()
this.setContent()
if (this.options.animation) {
$tip.addClass('fade')
}
placement = typeof this.options.placement == 'function' ?
this.options.placement.call(this, $tip[0], this.$element[0]) :
this.options.placement
inside = /in/.test(placement)
$tip
.remove()
.css({ top: 0, left: 0, display: 'block' })
.appendTo(inside ? this.$element : document.body)
pos = this.getPosition(inside)
actualWidth = $tip[0].offsetWidth
actualHeight = $tip[0].offsetHeight
switch (inside ? placement.split(' ')[1] : placement) {
case 'bottom':
tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
break
case 'top':
tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
break
case 'left':
tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
break
case 'right':
tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
break
}
$tip
.css(tp)
.addClass(placement)
.addClass('in')
}
}
, setContent: function () {
var $tip = this.tip()
$tip.find('.tooltip-inner').html(this.getTitle())
$tip.removeClass('fade in top bottom left right')
}
, hide: function () {
var that = this
, $tip = this.tip()
$tip.removeClass('in')
function removeWithAnimation() {
var timeout = setTimeout(function () {
$tip.off($.support.transition.end).remove()
}, 500)
$tip.one($.support.transition.end, function () {
clearTimeout(timeout)
$tip.remove()
})
}
$.support.transition && this.$tip.hasClass('fade') ?
removeWithAnimation() :
$tip.remove()
}
, fixTitle: function () {
var $e = this.$element
if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
$e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
}
}
, hasContent: function () {
return this.getTitle()
}
, getPosition: function (inside) {
return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
width: this.$element[0].offsetWidth
, height: this.$element[0].offsetHeight
})
}
, getTitle: function () {
var title
, $e = this.$element
, o = this.options
title = $e.attr('data-original-title')
|| (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
title = title.toString().replace(/(^\s*|\s*$)/, "")
return title
}
, tip: function () {
return this.$tip = this.$tip || $(this.options.template)
}
, validate: function () {
if (!this.$element[0].parentNode) {
this.hide()
this.$element = null
this.options = null
}
}
, enable: function () {
this.enabled = true
}
, disable: function () {
this.enabled = false
}
, toggleEnabled: function () {
this.enabled = !this.enabled
}
, toggle: function () {
this[this.tip().hasClass('in') ? 'hide' : 'show']()
}
}
/* TOOLTIP PLUGIN DEFINITION
* ========================= */
$.fn.tooltip = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('tooltip')
, options = typeof option == 'object' && option
if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
if (typeof option == 'string') data[option]()
})
}
$.fn.tooltip.Constructor = Tooltip
$.fn.tooltip.defaults = {
animation: true
, delay: 0
, selector: false
, placement: 'top'
, trigger: 'hover'
, title: ''
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
}
}( window.jQuery );
/***********************************************
Begin VMM.Timeline.js
***********************************************/
@ -6234,10 +5994,10 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
if (type.of(_timeline_id) == "string") {
timeline_id = _timeline_id;
} else {
timeline_id = "#timeline";
timeline_id = "#timelinejs";
}
version = "1.65";
version = "1.68";
trace("TIMELINE VERSION " + version);
@ -6248,7 +6008,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
events: {
data_ready: "DATAREADY",
messege: "MESSEGE",
headline: "TIMELINE_HEADLINE",
headline: "HEADLINE",
slide_change: "SLIDE_CHANGE",
resize: "resize"
},
@ -6363,21 +6123,14 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
var createConfig = function(conf) {
// APPLY SUPPLIED CONFIG TO TIMELINE CONFIG
if (typeof embed_config == 'object') {
timeline_config = embed_config;
}
if (typeof timeline_config == 'object') {
trace("HAS TIMELINE CONFIG");
var x;
for (x in timeline_config) {
if (Object.prototype.hasOwnProperty.call(timeline_config, x)) {
config[x] = timeline_config[x];
}
}
config = VMM.Util.mergeConfig(config, timeline_config);
} else if (typeof conf == 'object') {
var x;
for (x in conf) {
if (Object.prototype.hasOwnProperty.call(conf, x)) {
config[x] = conf[x];
}
}
config = VMM.Util.mergeConfig(config, conf);
}
if (VMM.Browser.device == "mobile" || VMM.Browser.device == "tablet") {
@ -6519,10 +6272,12 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
$feedback = VMM.appendAndGetElement($timeline, "<div>", "feedback", "");
// EVENTS
VMM.bindEvent(global, onDataReady, config.events.data_ready);
VMM.bindEvent(global, showMessege, config.events.messege);
VMM.fireEvent(global, config.events.messege, VMM.master_config.language.messages.loading_timeline);
/* GET DATA
================================================== */
if (VMM.Browser.browser == "Explorer" || VMM.Browser.browser == "MSIE") {
@ -8089,8 +7844,8 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.TimeNav == 'undefin
$dragslide.createPanel(layout, $timenav, config.nav.constraint, config.touch);
// ZOOM EVENTS
VMM.bindEvent(".zoom-in", onZoomIn, "click");
VMM.bindEvent(".zoom-out", onZoomOut, "click");
VMM.bindEvent($zoomin, onZoomIn, "click");
VMM.bindEvent($zoomout, onZoomOut, "click");
if (!config.touch) {
@ -8617,15 +8372,19 @@ if (typeof VMM.Timeline !== 'undefined' && typeof VMM.Timeline.DataObj == 'undef
"headline": dd.gsx$headline.$t,
"text": dd.gsx$text.$t,
"asset": {
"media": dd.gsx$media.$t,
"credit": dd.gsx$mediacredit.$t,
"caption": dd.gsx$mediacaption.$t
"media": dd.gsx$media.$t,
"credit": dd.gsx$mediacredit.$t,
"caption": dd.gsx$mediacaption.$t
},
"tag": ""
};
if (typeof dd.gsx$tag != 'undefined') {
_date.tag = dd.gsx$tag.$t;
_date.tag = dd.gsx$tag.$t;
}
if (typeof dd.gsx$tag != 'undefined') {
_date.asset.thumbnail = dd.gsx$mediathumbnail.$t;
}
_data_obj.timeline.date.push(_date);
}
};

10
source/js/Media/VMM.MediaElement.js

@ -25,9 +25,13 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
var _valid = true,
mediaElem = "",
m = VMM.MediaType(data.media); //returns an object with .type and .id
// CREATE MEDIA CODE
if (m.type == "image") {
// DETERMINE THUMBNAIL OR ICON
if (data.thumbnail != null && data.thumbnail != "") {
trace("CUSTOM THUMB");
mediaElem = "<div class='thumbnail thumb-custom' id='" + uid + "_custom_thumb'><img src='" + data.thumbnail + "'></div>";
return mediaElem;
} else if (m.type == "image") {
mediaElem = "<div class='thumbnail thumb-photo'></div>";
return mediaElem;
} else if (m.type == "flickr") {

12
source/js/VMM.Timeline.DataObj.js

@ -206,15 +206,19 @@ if (typeof VMM.Timeline !== 'undefined' && typeof VMM.Timeline.DataObj == 'undef
"headline": dd.gsx$headline.$t,
"text": dd.gsx$text.$t,
"asset": {
"media": dd.gsx$media.$t,
"credit": dd.gsx$mediacredit.$t,
"caption": dd.gsx$mediacaption.$t
"media": dd.gsx$media.$t,
"credit": dd.gsx$mediacredit.$t,
"caption": dd.gsx$mediacaption.$t
},
"tag": ""
};
if (typeof dd.gsx$tag != 'undefined') {
_date.tag = dd.gsx$tag.$t;
_date.tag = dd.gsx$tag.$t;
}
if (typeof dd.gsx$tag != 'undefined') {
_date.asset.thumbnail = dd.gsx$mediathumbnail.$t;
}
_data_obj.timeline.date.push(_date);
}
};

Loading…
Cancel
Save