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

Latest version 

Fixes for links in slider content on touch devices and tweaks to
responsive content
pull/75/head
Zach Wise 13 years ago
parent
0c16ca49a3
commit
b204c24e2c
14 changed files with 66 additions and 64 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. 6
      locale/de.js
  2. 6
      locale/en.js
  3. 6
      locale/es.js
  4. 6
      locale/fr.js
  5. 6
      locale/is.js
  6. 6
      locale/it.js
  7. 6
      locale/kr.js
  8. 6
      locale/nl.js
  9. 6
      locale/pt-br.js
  10. 6
      locale/zh-ch.js
  11. 6
      locale/zh-tw.js
  12. 4
      source/js/VMM.Timeline.js
  13. 6
      timeline-min.js
  14. 32
      timeline.js

6
locale/de.js
View File

File diff suppressed because one or more lines are too long

6
locale/en.js
View File

File diff suppressed because one or more lines are too long

6
locale/es.js
View File

File diff suppressed because one or more lines are too long

6
locale/fr.js
View File

File diff suppressed because one or more lines are too long

6
locale/is.js
View File

File diff suppressed because one or more lines are too long

6
locale/it.js
View File

File diff suppressed because one or more lines are too long

6
locale/kr.js
View File

File diff suppressed because one or more lines are too long

6
locale/nl.js
View File

File diff suppressed because one or more lines are too long

6
locale/pt-br.js
View File

File diff suppressed because one or more lines are too long

6
locale/zh-ch.js
View File

File diff suppressed because one or more lines are too long

6
locale/zh-tw.js
View File

File diff suppressed because one or more lines are too long

4
source/js/VMM.Timeline.js
Unescape View File

@ -1,5 +1,5 @@
/*!
Timeline 0.98
Timeline
Designed and built by Zach Wise at VeriteCo
This program is free software: you can redistribute it and/or modify
@ -58,7 +58,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
timeline_id = "#timeline";
}
version = "0.98.1";
version = "0.98.2";
trace("TIMELINE VERSION " + version);

6
timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

32
timeline.js
Unescape View File

@ -2847,12 +2847,10 @@ if(typeof VMM != 'undefined' && typeof VMM.TouchSlider == 'undefined') {
},
onTouchStart: function(e) {
VMM.TouchSlider.touchStart(e.data.element, e);
e.preventDefault();
e.stopPropagation();
return true;
},
onTouchEnd: function(e) {
e.preventDefault();
e.stopPropagation();
if (VMM.TouchSlider.sliding) {
@ -3450,7 +3448,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
/* RESIZE IFRAME MEDIA ELEMENTS
================================================== */
var _iframe_height_full = Math.round(config.slider.height) - 160;
var _iframe_width_full = Math.round((_iframe_height_full / 9) * 16);
var _iframe_width_full = Math.round(config.slider.content.width);
var _iframe_height_full_video = Math.round((_iframe_width_full / 16) * 9) + 25;
var _iframe_width = (config.slider.content.width/100)*60 ;
var _iframe_height = Math.round((_iframe_width / 16) * 9) + 25;
@ -3475,7 +3474,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
if (is_skinny) {
_media_height = ((config.slider.height/100) * 80 ) - 40;
_iframe_width = config.slider.content.width;
_iframe_height_full = Math.round((_iframe_width / 16) * 9);
_iframe_height = Math.round((_iframe_width / 16) * 9) + 25;
_iframe_height_full = Math.round((_iframe_width / 16) * 9) + 25;
_media_width_with_text = config.slider.content.width;
@ -3496,6 +3496,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
} else {
_media_height = config.slider.height - 40;
_iframe_width = (config.slider.content.width/100)*60 ;
_iframe_height = Math.round((_iframe_width / 16) * 9) + 25;
_media_width_with_text = ((config.slider.content.width/100) * 60);
VMM.Element.css(".slider-item .layout-text-media .text", "width", "40%" );
@ -3513,6 +3514,11 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
VMM.Element.css(".slider-item", "overflow-y", "auto" );
}
// MEDIA FRAME
VMM.Element.css(".slider-item .layout-text-media .media .media-container .media-frame", "max-width", config.slider.content.width );
//VMM.Element.width(".slider-item .layout-text-media .media .media-container .media-frame", _iframe_width);
//VMM.Element.css(".slider-item .layout-text-media .media .media-container .media-frame", "max-height", _iframe_height );
// IMAGES
VMM.Element.css(".slider-item .layout-text-media .media .media-container img", "max-height", _media_height );
VMM.Element.css(".slider-item .layout-media .media .media-container img", "max-height", _media_height - 60 );
@ -3529,7 +3535,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
VMM.Element.width(".slider-item .media .media-container .media-frame", _iframe_width);
// IFRAME FULL SIZE VIDEO
VMM.Element.height(".slider-item .layout-media .media .media-container .media-frame", _iframe_height_full);
VMM.Element.height(".slider-item .layout-media .media .media-container .media-frame", _iframe_height_full_video);
VMM.Element.width(".slider-item .layout-media .media .media-container .media-frame", _iframe_width_full);
// SOUNDCLOUD
@ -3539,18 +3545,14 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
VMM.Element.css(".slider-item .media .media-container .soundcloud", "max-height", 168 );
// MAPS
VMM.Element.height(".slider-item .layout-text-media .media .media-container .map", _media_height);
VMM.Element.height(".slider-item .layout-media .media .media-container .map", _iframe_height_full+60);
VMM.Element.width(".slider-item .layout-media .media .media-container .map", _iframe_width);
VMM.Element.height(".slider-item .layout-text-media .media .media-container .map", _iframe_height);
VMM.Element.height(".slider-item .layout-media .media .media-container .map", _iframe_height_full_video);
VMM.Element.width(".slider-item .layout-media .media .media-container .map", _iframe_width_full);
// DOCS
VMM.Element.height(".slider-item .layout-text-media .media .media-container .doc", _media_height);
VMM.Element.height(".slider-item .layout-text-media .media .media-container .doc", _iframe_height);
VMM.Element.height(".slider-item .layout-media .media .media-container .doc", _iframe_height_full+60);
// MAX WIDTH
VMM.Element.css(".slider-item .layout-text-media .media .media-container .media-frame", "max-width", config.slider.content.width );
//VMM.Element.width(".slider-item .layout-text-media .media .media-container .media-frame", _iframe_width);
//VMM.Element.css(".slider-item .layout-text-media .media .media-container .media-frame", "max-height", _iframe_height );
}
@ -4705,7 +4707,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Language == 'undefined') {
***********************************************/
/*!
Timeline 0.98
Timeline
Designed and built by Zach Wise at VeriteCo
This program is free software: you can redistribute it and/or modify
@ -4764,7 +4766,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
timeline_id = "#timeline";
}
version = "0.98.1";
version = "0.98.2";
trace("TIMELINE VERSION " + version);

Write Preview
Loading…
Cancel
Save