Skip to content

Replace 'parseCueTime' with 'parseTimeStamp' #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replace 'parseCueTime' with 'parseTimeStamp' #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85e3f6a
Replaced 'parseCueTIme' with 'parseTimeStamp'
CharlieStras Jun 23, 2015
410cc7d
1. Added delay for 'keyup' events
CharlieStras Jun 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 48 additions & 10 deletions src/rangeslider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,21 @@
obj, objNew, objOld;
index = index || 0;

// Parse input as a time stamp.
function parseTimeStamp(input) {

function computeSeconds(h, m, s) {
return (h | 0) * 3600 + (m | 0) * 60 + (s | 0);
}

var m = input.match(/^(\d+):(\d+):(\d+)/);
if (!m) {
return null;
}

return computeSeconds(m[1], m[2], m[3]);
}

if (newHour != timeOld[0]) {
obj = h;
objNew = newHour;
Expand All @@ -349,6 +364,10 @@
}

var duration = this.player.duration() || 0,
oldTimeLeft = this.ctpl.el_.children,
oldTimeRight = this.ctpr.el_.children,
durationSelLeft = parseTimeStamp(oldTimeLeft[0].value + ":" + oldTimeLeft[1].value + ":" + oldTimeLeft[2].value),
durationSelRight = parseTimeStamp(oldTimeRight[0].value + ":" + oldTimeRight[1].value + ":" + oldTimeRight[2].value),
durationSel;

var intRegex = /^\d+$/;//check if the objNew is an integer
Expand All @@ -360,7 +379,7 @@
newMin = newMin == "" ? 0 : newMin;
newSec = newSec == "" ? 0 : newSec;

durationSel = videojs.TextTrack.prototype.parseCueTime(newHour + ":" + newMin + ":" + newSec);
durationSel = parseTimeStamp(newHour + ":" + newMin + ":" + newSec);
if (durationSel > duration) {
obj.value = objOld;
obj.style.border = "1px solid red";
Expand All @@ -373,18 +392,26 @@
this._triggerSliderChange();
}
if (index === 1) {
var oldTimeLeft = this.ctpl.el_.children,
durationSelLeft = videojs.TextTrack.prototype.parseCueTime(oldTimeLeft[0].value + ":" + oldTimeLeft[1].value + ":" + oldTimeLeft[2].value);
if (durationSel < durationSelLeft) {
obj.style.border = "1px solid red";
}
else {
oldTimeLeft[0].style.border = oldTimeLeft[1].style.border = oldTimeLeft[2].style.border = "1px solid transparent";
this.setValue(0, durationSelLeft, false);
this._triggerSliderChange();
}
} else {

var oldTimeRight = this.ctpr.el_.children,
durationSelRight = videojs.TextTrack.prototype.parseCueTime(oldTimeRight[0].value + ":" + oldTimeRight[1].value + ":" + oldTimeRight[2].value);
if (durationSel > durationSelRight) {
obj.style.border = "1px solid red";
}
else {
// Keep the value of 'ctpr' when it is equal to the duration of video
if(Math.floor(duration) !== durationSelRight) {
oldTimeRight[0].style.border = oldTimeRight[1].style.border = oldTimeRight[2].style.border = "1px solid transparent";
this.setValue(1, durationSelRight, false);
this._triggerSliderChange();
}
}
}
},
_triggerSliderChange: function () {
Expand Down Expand Up @@ -783,7 +810,7 @@
if (!this.fired) { //Do nothing if end has already been called
return;
}
this.fired = false; //Set fired flat to false
this.fired = false; //Set fired flag to false
this.player_.pause(); //Call end function
this.player_.currentTime(this.timeEnd);
this.suspendPlay();
Expand Down Expand Up @@ -1016,7 +1043,18 @@
this.rs.ctpr.el_.children[2].disabled = enable ? "" : "disabled";
};


// Set delay for keyup events
var keyUpDelay = function () {
var timer = 0;
return function (index, ms) {
var self = this;
clearTimeout(timer);
timer = setTimeout(function () {
self.rs._checkControlTime(index, self.el_.children, self.timeOld)
}, ms);
}
}();

/**
* This is the control left time panel
* @param {videojs.Player|Object} player
Expand Down Expand Up @@ -1051,7 +1089,7 @@
};

videojs.ControlTimePanelLeft.prototype.onKeyUp = function (event) {
this.rs._checkControlTime(0, this.el_.children, this.timeOld);
keyUpDelay.call(this, 0, 300);
};


Expand Down Expand Up @@ -1090,6 +1128,6 @@
};

videojs.ControlTimePanelRight.prototype.onKeyUp = function (event) {
this.rs._checkControlTime(1, this.el_.children, this.timeOld);
keyUpDelay.call(this, 1, 300);
};
})();