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

Fix for issue #2 Next button shows up on browser resize even on last slide closes #2

pull/23/merge
Zach Wise 13 years ago
parent
281c1fbeab
commit
d39b24dfb6
14 changed files with 51 additions and 95 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/it.js
  6. 6
      locale/kr.js
  7. 6
      locale/nl.js
  8. 6
      locale/pt-br.js
  9. 6
      locale/zh-ch.js
  10. 6
      locale/zh-tw.js
  11. 2
      source/js/VMM.Slider.js
  12. 38
      source/js/VMM.Timeline.js
  13. 6
      timeline-min.js
  14. 40
      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/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

2
source/js/VMM.Slider.js
Unescape View File

@ -434,7 +434,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
if (current_slide == 0) {
is_first = true;
}
if (current_slide +1 == slides.length) {
if (current_slide +1 >= slides.length) {
is_last = true
}

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

@ -49,34 +49,19 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
var version = "0.98";
trace("TIMELINE VERSION " + version);
var $timeline = VMM.getElement("#timeline"); // expecting name only for parent
var $feedback;
var $messege;
var html_string = VMM.getElement("#timeline");
/* CREATE DOM STRUCTURE
================================================== */
//VMM.attachElement($timeline, "");
var $timeline, $feedback, $messege, html_string;
$timeline = VMM.getElement("#timeline");
html_string = VMM.getElement("#timeline");
$feedback = VMM.appendAndGetElement($timeline, "<div>", "feedback", "");
$messege = VMM.appendAndGetElement($feedback, "<div>", "messege", "#Timeline");
//VMM.appendElement($timeline, "<div class='container main'><div class='feature'><div class='slider'></div></div><div class='navigation'></div></div>");
/* PRIVATE VARS
================================================== */
var _private_var = 'private';
var events = {}; // CUSTOM EVENT HOLDER
var data = {}; // HOLDS DATA
var _dates = []; // HOLDES PROCESSED DATES
var events = {}, data = {}, _dates = [];
/* CONFIG
================================================== */
var config = {
type: "timeline",
maptype: "toner",
@ -288,7 +273,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
var showMessege = function(e, msg) {
$messege = VMM.appendAndGetElement($feedback, "<div>", "messege", msg);
};
var hideMessege = function() {
@ -429,18 +413,12 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
================================================== */
if (config.width <= 480) {
// MOBILE
VMM.Element.hide("div.navigation");
VMM.Element.hide("div.nav-next");
VMM.Element.hide("div.nav-previous");
//VMM.Element.css(".slider-item .content", "max-width", "100%");
//VMM.Element.width(".slider-item .content", "90%");
VMM.Element.height(".slider-container-mask", config.height);
//VMM.Element.hide("div.navigation");
//VMM.Element.height(".slider-container-mask", config.height);
} else {
// DESKTOP OR TABLET
VMM.Element.show("div.navigation");
VMM.Element.show("div.nav-next");
VMM.Element.show("div.nav-previous");
VMM.Element.height(".slider-container-mask", config.feature.height);
//VMM.Element.show("div.navigation");
//VMM.Element.height(".slider-container-mask", config.feature.height);
}
};

6
timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

40
timeline.js
Unescape View File

@ -3596,7 +3596,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
if (current_slide == 0) {
is_first = true;
}
if (current_slide +1 == slides.length) {
if (current_slide +1 >= slides.length) {
is_last = true
}
@ -4741,34 +4741,19 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
var version = "0.98";
trace("TIMELINE VERSION " + version);
var $timeline = VMM.getElement("#timeline"); // expecting name only for parent
var $feedback;
var $messege;
var html_string = VMM.getElement("#timeline");
/* CREATE DOM STRUCTURE
================================================== */
//VMM.attachElement($timeline, "");
var $timeline, $feedback, $messege, html_string;
$timeline = VMM.getElement("#timeline");
html_string = VMM.getElement("#timeline");
$feedback = VMM.appendAndGetElement($timeline, "<div>", "feedback", "");
$messege = VMM.appendAndGetElement($feedback, "<div>", "messege", "#Timeline");
//VMM.appendElement($timeline, "<div class='container main'><div class='feature'><div class='slider'></div></div><div class='navigation'></div></div>");
/* PRIVATE VARS
================================================== */
var _private_var = 'private';
var events = {}; // CUSTOM EVENT HOLDER
var data = {}; // HOLDS DATA
var _dates = []; // HOLDES PROCESSED DATES
var events = {}, data = {}, _dates = [];
/* CONFIG
================================================== */
var config = {
type: "timeline",
maptype: "toner",
@ -4980,7 +4965,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
var showMessege = function(e, msg) {
$messege = VMM.appendAndGetElement($feedback, "<div>", "messege", msg);
};
var hideMessege = function() {
@ -5121,18 +5105,12 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
================================================== */
if (config.width <= 480) {
// MOBILE
VMM.Element.hide("div.navigation");
VMM.Element.hide("div.nav-next");
VMM.Element.hide("div.nav-previous");
//VMM.Element.css(".slider-item .content", "max-width", "100%");
//VMM.Element.width(".slider-item .content", "90%");
VMM.Element.height(".slider-container-mask", config.height);
//VMM.Element.hide("div.navigation");
//VMM.Element.height(".slider-container-mask", config.height);
} else {
// DESKTOP OR TABLET
VMM.Element.show("div.navigation");
VMM.Element.show("div.nav-next");
VMM.Element.show("div.nav-previous");
VMM.Element.height(".slider-container-mask", config.feature.height);
//VMM.Element.show("div.navigation");
//VMM.Element.height(".slider-container-mask", config.feature.height);
}
};

Write Preview
Loading…
Cancel
Save